Unify the two GeoShape activities further.

getodk · Aug 18, 2018 · 0ff1f39 · 0ff1f39
1 parent 76cd7f8
commit 0ff1f39
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 34 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GeoShapeGoogleMapActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GeoShapeGoogleMapActivity.java
@@ -55,7 +55,7 @@ public class GeoShapeGoogleMapActivity extends CollectAbstractActivity {
     private Button zoomLocationButton;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (!checkIfLocationPermissionsGranted(this)) {
@@ -149,13 +149,6 @@ private void setupMap(MapFragment newMapFragment) {
             zoomDialog.dismiss();
         });
 
-        // If there is a last know location go there
-        if (hasWindowFocus() && map.getGpsLocation() != null) {
-            // foundFirstLocation = true;
-            gpsButton.setEnabled(true);
-            showZoomDialog();
-        }
-
         helper.setBasemap();
     }
 
@@ -187,6 +180,24 @@ private void showClearDialog() {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        if (!map.getPointsOfShape(shapeId).isEmpty()) {
+            showBackDialog();
+        } else {
+            finish();
+        }
+    }
+
+    private void showBackDialog() {
+        new AlertDialog.Builder(this)
+            .setMessage(getString(R.string.geo_exit_warning))
+            .setPositiveButton(R.string.discard, (dialog, id) -> finish())
+            .setNegativeButton(R.string.cancel, null)
+            .show();
+
+    }
+
     private void finishWithResult() {
         List<MapPoint> points = map.getPointsOfShape(shapeId);
         if (points.size() < 3) {

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/GeoShapeOsmMapActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/GeoShapeOsmMapActivity.java
@@ -26,6 +26,7 @@
 import android.widget.TextView;
 
 import org.odk.collect.android.R;
+import org.odk.collect.android.application.Collect;
 import org.odk.collect.android.map.MapFragment;
 import org.odk.collect.android.map.MapPoint;
 import org.odk.collect.android.map.OsmMapFragment;
@@ -50,8 +51,8 @@
 public class GeoShapeOsmMapActivity extends CollectAbstractActivity implements IRegisterReceiver {
     private MapFragment map;
     private int shapeId = -1;  // will be a positive featureId once map is ready
-    private ImageButton clearButton;
     private ImageButton gpsButton;
+    private ImageButton clearButton;
 
     private MapHelper helper;
     private AlertDialog zoomDialog;
@@ -83,7 +84,26 @@ public static MapFragment createMapFragment() {
         return new OsmMapFragment();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        Collect.getInstance().getActivityLogger().logOnStart(this);
+        if (map != null) map.setGpsLocationEnabled(true);
+    }
+
+    @Override
+    protected void onStop() {
+        map.setGpsLocationEnabled(false);
+        Collect.getInstance().getActivityLogger().logOnStop(this);
+        super.onStop();
+    }
+
     private void setupMap(MapFragment newMapFragment) {
+        if (newMapFragment == null) {
+            finish();
+            return;
+        }
+
         map = newMapFragment;
         map.setGpsLocationEnabled(true);
         map.setLongPressListener(this::addVertex);
@@ -134,27 +154,8 @@ private void setupMap(MapFragment newMapFragment) {
             map.zoomToBoundingBox(map.getPointsOfShape(shapeId), 0.8);
             zoomDialog.dismiss();
         });
-    }
 
-    @Override
-    public void onBackPressed() {
-        if (!map.getPointsOfShape(shapeId).isEmpty()) {
-            showBackDialog();
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        if (map != null) map.setGpsLocationEnabled(true);
-    }
-
-    @Override
-    protected void onStop() {
-        map.setGpsLocationEnabled(false);
-        super.onStop();
+        helper.setBasemap();
     }
 
     private void onGpsLocationReady(MapFragment map) {
@@ -185,6 +186,15 @@ private void showClearDialog() {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        if (!map.getPointsOfShape(shapeId).isEmpty()) {
+            showBackDialog();
+        } else {
+            finish();
+        }
+    }
+
     private void showBackDialog() {
         new AlertDialog.Builder(this)
             .setMessage(getString(R.string.geo_exit_warning))
@@ -294,9 +304,4 @@ public void onCancel(DialogInterface dialog) {
         }
         zoomDialog.show();
     }
-
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/map/OsmMapFragment.java b/collect_app/src/main/java/org/odk/collect/android/map/OsmMapFragment.java
@@ -266,6 +266,7 @@ public void update() {
             for (Marker marker : markers) {
                 geoPoints.add(marker.getPosition());
             }
+            geoPoints.add(markers.get(0).getPosition());  // close the polygon
             polyline.setPoints(geoPoints);
             map.invalidate();
         }