GeoPoly: Fix #2868.

getodk · Mar 4, 2019 · 0f60ca5 · 0f60ca5
1 parent ba25e07
commit 0f60ca5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GeoPolyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GeoPolyActivity.java
@@ -357,7 +357,11 @@ private void saveAsPolygon() {
         polygonOrPolylineDialog.dismiss();
         if (map.getPolyPoints(featureId).size() > 2) {
             // Close the polygon.
-            map.appendPointToPoly(featureId, map.getPolyPoints(featureId).get(0));
+            List<MapPoint> points = map.getPolyPoints(featureId);
+            int count = points.size();
+            if (count > 1 && !points.get(0).equals(points.get(count - 1))) {
+                map.appendPointToPoly(featureId, points.get(0));
+            }
             finishWithResult();
         } else {
             ToastUtils.showShortToastInMiddle(getString(R.string.polygon_validator));
@@ -404,7 +408,7 @@ private String formatAccuracyThreshold(int meters) {
 
     /**
      * Parses a form result string, as previously formatted by formatPoints,
-     * into a list of polyline vertices.
+     * into a list of vertices.
      */
     private List<MapPoint> parsePoints(String coords) {
         List<MapPoint> points = new ArrayList<>();
@@ -439,7 +443,7 @@ private List<MapPoint> parsePoints(String coords) {
     }
 
     /**
-     * Serializes a list of polyline vertices into a string, in the format
+     * Serializes a list of vertices into a string, in the format
      * appropriate for storing as the result of this form question.
      */
     private String formatPoints(List<MapPoint> points) {