Skip to content

Fix issue 3541, Can't complete polygon after getting an interception error popup #3606

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

Open
hassan-nsubuga wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issue 3541, Can't complete polygon after getting an interception error popup #3606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9556c93
Fix isse 3541, reset hasSelfIntersection to false in updateVertices a…
hassan-nsubuga Mar 11, 2026
5cb0e85
Add tests to DrawAreaTaskViewModelTest to convert resetting of hasSel…
hassan-nsubuga Mar 12, 2026
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
3 changes: 2 additions & 1 deletion .../java/org/groundplatform/android/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ internal constructor(
private fun checkVertexIntersection(): Boolean {
hasSelfIntersection = isSelfIntersecting(vertices)
if (hasSelfIntersection) {
vertices = vertices.dropLast(1)
updateVertices(vertices.dropLast(1))
onSelfIntersectionDetected()
}
return hasSelfIntersection
Expand Down Expand Up @@ -349,6 +349,7 @@ internal constructor(

private fun updateVertices(newVertices: List<Coordinates>) {
this.vertices = newVertices
hasSelfIntersection = false
refreshMap()
}

Expand Down
41 changes: 41 additions & 0 deletions ...a/org/groundplatform/android/ui/datacollection/tasks/polygon/DrawAreaTaskViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,45 @@ class DrawAreaTaskViewModelTest : BaseHiltTest() {
assertThat(viewModel.isMarkedComplete()).isTrue()
}

@Test
fun `onButtonClick ADD_POINT removes last vertex and resets hasSelfIntersection if it causes self-intersection`() =
runWithTestDispatcher {
setupViewModel()
// Create a non-intersecting path: (0,0) -> (10,10) -> (0,10)
updateLastVertexAndAdd(COORDINATE_1)
updateLastVertexAndAdd(COORDINATE_2)
updateLastVertexAndAdd(COORDINATE_6)

// Move cursor to a point that crosses the first segment: (10,0)
updateLastVertex(COORDINATE_5)

viewModel.onButtonClick(ButtonAction.ADD_POINT)
advanceUntilIdle()

// The intersecting vertex (10,0) should be dropped.
// Result: 3 fixed vertices + 1 temp cursor vertex = 4 total in geometry
assertGeometry(4, isLineString = true)
assertThat(viewModel.hasSelfIntersection).isFalse()
}

@Test
fun `onButtonClick COMPLETE does not mark complete if it causes self-intersection`() =
runWithTestDispatcher {
setupViewModel()
// Create a path that will intersect when closed: (0,0) -> (10,0) -> (0,10) -> (10,10)
updateLastVertexAndAdd(COORDINATE_1)
updateLastVertexAndAdd(COORDINATE_5)
updateLastVertexAndAdd(COORDINATE_6)
updateLastVertex(COORDINATE_2)

viewModel.onButtonClick(ButtonAction.COMPLETE)
advanceUntilIdle()

// Completion should fail and flag should be true
assertThat(viewModel.isMarkedComplete()).isFalse()
assertThat(viewModel.hasSelfIntersection).isTrue()
}

private fun assertGeometry(
expectedVerticesCount: Int,
isLineString: Boolean = false,
Expand Down Expand Up @@ -679,6 +718,8 @@ class DrawAreaTaskViewModelTest : BaseHiltTest() {
private val COORDINATE_2 = Coordinates(10.0, 10.0)
private val COORDINATE_3 = Coordinates(20.0, 20.0)
private val COORDINATE_4 = Coordinates(30.0, 30.0)
private val COORDINATE_5 = Coordinates(10.0, 0.0)
private val COORDINATE_6 = Coordinates(0.0, 10.0)

private val TASK =
Task(
Expand Down
Loading