From 5e188cfdaaea08056a9653c124ba23ff76f28c9e Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Mon, 30 Mar 2020 13:06:41 -0700
Subject: [PATCH] zooming to user position works

---
 app/src/main/java/com/geeksville/mesh/ui/Map.kt | 11 +++++++++++
 app/src/main/res/layout/map_view.xml            |  5 +----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/Map.kt b/app/src/main/java/com/geeksville/mesh/ui/Map.kt
index 6420892cc..6bef3b9c8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Map.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Map.kt
@@ -16,6 +16,9 @@ import com.geeksville.mesh.model.UIState
 import com.mapbox.geojson.Feature
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
+import com.mapbox.mapboxsdk.camera.CameraPosition
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
+import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.maps.MapView
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.style.layers.Property
@@ -126,6 +129,14 @@ fun MapContent() {
                 style.addSource(nodePositions)
                 style.addLayer(nodeLayer)
             }
+
+            // Center on the user's position (if we have it)
+            NodeDB.ourNodeInfo?.position?.let {
+                val cameraPos = CameraPosition.Builder().target(
+                    LatLng(it.latitude, it.longitude)
+                ).zoom(8.0).build()
+                map.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPos), 1000)
+            }
         }
     }
     //}
diff --git a/app/src/main/res/layout/map_view.xml b/app/src/main/res/layout/map_view.xml
index f9bc993e0..554c64b3a 100644
--- a/app/src/main/res/layout/map_view.xml
+++ b/app/src/main/res/layout/map_view.xml
@@ -6,7 +6,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     mapbox:mapbox_uiZoomGestures="true"
-    mapbox:mapbox_uiScrollGestures="true"
-    mapbox:mapbox_cameraTargetLat="-32.557013"
-    mapbox:mapbox_cameraTargetLng="-56.149056"
-    mapbox:mapbox_cameraZoom="5.526846"></com.mapbox.mapboxsdk.maps.MapView>
+    mapbox:mapbox_uiScrollGestures="true"></com.mapbox.mapboxsdk.maps.MapView>