diff --git a/scwx-qt/source/scwx/qt/util/maplibre.cpp b/scwx-qt/source/scwx/qt/util/maplibre.cpp index 3414af41..63f5112e 100644 --- a/scwx-qt/source/scwx/qt/util/maplibre.cpp +++ b/scwx-qt/source/scwx/qt/util/maplibre.cpp @@ -46,7 +46,10 @@ glm::vec2 GetMapScale(const QMapLibre::CustomLayerRenderParameters& params) bool IsPointInPolygon(const std::vector& vertices, const glm::vec2& point) { + // All members of these unions are floats, so no type safety violation + // NOLINTBEGIN(cppcoreguidelines-pro-type-union-access) bool inPolygon = true; + bool allSame = true; // For each vertex, assume counterclockwise order for (std::size_t i = 0; i < vertices.size(); ++i) @@ -55,6 +58,8 @@ bool IsPointInPolygon(const std::vector& vertices, const auto& p2 = (i == vertices.size() - 1) ? vertices[0] : vertices[i + 1]; + allSame = allSame && p1.x == p2.x && p1.y == p2.y; + // Test which side of edge point lies on const float a = -(p2.y - p1.y); const float b = p2.x - p1.x; @@ -70,7 +75,14 @@ bool IsPointInPolygon(const std::vector& vertices, } } + if (allSame) + { + inPolygon = vertices.size() > 0 && vertices[0].x == point.x && + vertices[0].y == point.y; + } + return inPolygon; + // NOLINTEND(cppcoreguidelines-pro-type-union-access) } glm::vec2 LatLongToScreenCoordinate(const QMapLibre::Coordinate& coordinate)