GeoShapeActivity: Fix zooming to a polygon that has only one vertex.

yaroing · Oct 3, 2018 · 40d3b8f · 40d3b8f
1 parent 4b55e6c
commit 40d3b8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/map/GoogleMapFragment.java b/collect_app/src/main/java/org/odk/collect/android/map/GoogleMapFragment.java
@@ -121,11 +121,15 @@ public GoogleMap getGoogleMap() {
         if (points != null) {
             int count = 0;
             LatLngBounds.Builder builder = new LatLngBounds.Builder();
+            LatLng latLng = null;
             for (MapPoint point : points) {
-                builder.include(toLatLng(point));
+                latLng = toLatLng(point);
+                builder.include(latLng);
                 count++;
             }
-            if (count > 0) {
+            if (count == 1) {
+                map.animateCamera(CameraUpdateFactory.newLatLngZoom(latLng, 16));
+            } else if (count > 1) {
                 final LatLngBounds bounds = expandBounds(builder.build(), 1 / scaleFactor);
                 new Handler().postDelayed(() -> {
                     map.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0));

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
@@ -126,9 +126,10 @@ public MapView getMapView() {
                 geoPoints.add(toGeoPoint(point));
                 count++;
             }
-            if (count > 0) {
-                map.getController().setZoom(4);
-                map.invalidate();
+            if (count == 1) {
+                map.getController().setCenter(geoPoints.get(0));
+                map.getController().setZoom(16);
+            } else if (count > 1) {
                 map.zoomToBoundingBox(BoundingBox.fromGeoPoints(
                     geoPoints).increaseByScale((float) (1 / scaleFactor)), true);
             }