Show error Dialog and Don't allow user to draw mis-shapen polygons #3056
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
As per the issue description, the button's text in the dialog should be |
shobhitagarwal1612
requested changes
Feb 20, 2025
.../main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskFragment.kt
Outdated
Show resolved
Hide resolved
...main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt
Outdated
Show resolved
Hide resolved
...main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt
Outdated
Show resolved
Hide resolved
...main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt
Outdated
Show resolved
Hide resolved
.../main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskFragment.kt
Show resolved
Hide resolved
Comment on lines
+113
to
+114
| val showDialog = remember { mutableStateOf(true) } | ||
| if (showDialog.value) { |
There was a problem hiding this comment.
We don't need this. ConfirmationDialog already maintains an internal state for visiblity
| @@ -167,13 +184,21 @@ internal constructor( | |||
| } | |||
|
|
|||
| fun completePolygon() { | |||
| check(LineString(vertices).isClosed()) { "Polygon is not complete" } | |||
There was a problem hiding this comment.
Why have we removed this check?
Comment on lines
+22
to
+34
| fun orientation(a: Coordinates, b: Coordinates, c: Coordinates): Int { | ||
| val value = (b.lat - a.lat) * (c.lng - b.lng) - (b.lng - a.lng) * (c.lat - b.lat) | ||
| return when { | ||
| value > 0 -> 1 // Clockwise | ||
| value < 0 -> -1 // Counter-clockwise | ||
| else -> 0 // Collinear | ||
| } | ||
| } | ||
|
|
||
| fun onSegment(a: Coordinates, b: Coordinates, c: Coordinates): Boolean { | ||
| return c.lat in minOf(a.lat, b.lat)..maxOf(a.lat, b.lat) && | ||
| c.lng in minOf(a.lng, b.lng)..maxOf(a.lng, b.lng) | ||
| } |
There was a problem hiding this comment.
These can be pulled out and made private.
| import com.google.android.ground.model.geometry.Coordinates | ||
|
|
||
| /** Checks if two line segments intersect. */ | ||
| fun segmentsIntersect(p1: Coordinates, p2: Coordinates, q1: Coordinates, q2: Coordinates): Boolean { |
There was a problem hiding this comment.
Please use a better function name
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2604
@shobhitagarwal1612 PTAL?
Screen.Recording.2025-02-19.at.6.40.32.PM.mov