Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: added polygon validity check before hit testing #1964

Merged
merged 2 commits into from
Sep 12, 2024
Merged

fix: added polygon validity check before hit testing #1964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fd4ba
Added polygon validity (has more than 2 points) check before hit testing
JaffaKetchup Sep 12, 2024
b15c074
Minor improvement to remove anonymous function instant invocation pat…
JaffaKetchup Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions lib/src/layer/polygon_layer/painter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading