From cb47762b1416aca9161500294e71857adc30b34f Mon Sep 17 00:00:00 2001
From: Ka-Ping Yee <zestyping@gmail.com>
Date: Tue, 2 Oct 2018 00:27:37 -0700
Subject: [PATCH] Fix zoom-to-point in OsmMapFragment (setZoom() does not
 preserve setCenter()).

---
 .../main/java/org/odk/collect/android/map/OsmMapFragment.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index b6a475e8ea2..bb3b5c474a3 100644
--- 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
@@ -109,8 +109,9 @@ public MapView getMapView() {
 
     @Override public void zoomToPoint(@Nullable MapPoint center, double zoom) {
         if (center != null) {
-            map.getController().setCenter(toGeoPoint(center));
+            // setCenter() must be done last; setZoom() does not preserve the center.
             map.getController().setZoom((int) Math.round(zoom));
+            map.getController().setCenter(toGeoPoint(center));
         }
     }