fix: added polygon validity check before hit testing (#1964)

fleaflet · Sep 12, 2024 · cb6d6a0 · cb6d6a0
1 parent 182c4fc
commit cb6d6a0
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/lib/src/layer/polygon_layer/painter.dart b/lib/src/layer/polygon_layer/painter.dart
@@ -64,32 +64,30 @@ base class _PolygonPainter<R extends Object>
       origin: hitTestCameraOrigin,
       points: projectedPolygon.points,
     );
-
     if (projectedCoords.first != projectedCoords.last) {
       projectedCoords.add(projectedCoords.first);
     }
-    final isInPolygon = isPointInPolygon(point, projectedCoords);
-
-    final hasHoles = projectedPolygon.holePoints.isNotEmpty;
-    final isInHole = hasHoles &&
-        () {
-          for (final points in projectedPolygon.holePoints) {
-            final projectedHoleCoords = getOffsetsXY(
-              camera: camera,
-              origin: hitTestCameraOrigin,
-              points: points,
-            );
-
-            if (projectedHoleCoords.first != projectedHoleCoords.last) {
-              projectedHoleCoords.add(projectedHoleCoords.first);
-            }
 
-            if (isPointInPolygon(point, projectedHoleCoords)) {
-              return true;
-            }
-          }
-          return false;
-        }();
+    final isValidPolygon = projectedCoords.length >= 3;
+    final isInPolygon =
+        isValidPolygon && isPointInPolygon(point, projectedCoords);
+
+    final isInHole = projectedPolygon.holePoints.any(
+      (points) {
+        final projectedHoleCoords = getOffsetsXY(
+          camera: camera,
+          origin: hitTestCameraOrigin,
+          points: points,
+        );
+        if (projectedHoleCoords.first != projectedHoleCoords.last) {
+          projectedHoleCoords.add(projectedHoleCoords.first);
+        }
+
+        final isValidHolePolygon = projectedHoleCoords.length >= 3;
+        return isValidHolePolygon &&
+            isPointInPolygon(point, projectedHoleCoords);
+      },
+    );
 
     // Second check handles case where polygon outline intersects a hole,
     // ensuring that the hit matches with the visual representation