Merge pull request #957 from meshtastic/2.5.8

Fix map zoom level
meshtastic · Oct 6, 2024 · b3735d3 · b3735d3
2 parents 63e33cb + cba23fe
commit b3735d3
Show file tree

Hide file tree

Showing 3 changed files with 235 additions and 260 deletions.
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -1274,9 +1274,6 @@
           }
         }
       }
-    },
-    "Attribution:" : {
-
     },
     "automatic.detection" : {
       "extractionState" : "migrated",
@@ -6819,9 +6816,6 @@
     },
     "Enable Notifications" : {
 
-    },
-    "Enable Offline Maps" : {
-
     },
     "enabled" : {
       "localizations" : {
@@ -11542,6 +11536,7 @@
       }
     },
     "map.recentering" : {
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -15870,9 +15865,6 @@
           }
         }
       }
-    },
-    "Offline Maps" : {
-
     },
     "OK" : {
 
@@ -16712,9 +16704,6 @@
     },
     "PWD" : {
 
-    },
-    "Radar" : {
-
     },
     "radio.configuration" : {
       "localizations" : {
@@ -19855,9 +19844,6 @@
     },
     "Show Alerts" : {
 
-    },
-    "Show Node History" : {
-
     },
     "Show nodes" : {
 
@@ -19867,15 +19853,9 @@
     },
     "Show on the mesh map." : {
 
-    },
-    "Show Route Lines" : {
-
     },
     "Show Waypoints " : {
 
-    },
-    "Show Weather" : {
-
     },
     "Shut Down" : {
 
@@ -21129,12 +21109,6 @@
     },
     "This will send a current position from your phone and enable fixed position." : {
 
-    },
-    "Tile Server" : {
-
-    },
-    "Tiles above Labels" : {
-
     },
     "Time" : {
 

diff --git a/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift b/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
@@ -24,6 +24,7 @@ struct NodeMapSwiftUI: View {
 	@Namespace var mapScope
 	@State var mapStyle: MapStyle = MapStyle.hybrid(elevation: .flat, pointsOfInterest: .all, showsTraffic: true)
 	@State var position = MapCameraPosition.automatic
+	@State var distance = 0.0
 	@State var scene: MKLookAroundScene?
 	@State var isLookingAround = false
 	@State var isShowingAltitude = false
@@ -44,7 +45,7 @@ struct NodeMapSwiftUI: View {
 		if node.hasPositions {
 			ZStack {
 				MapReader { _ in
-					Map(position: $position, bounds: MapCameraBounds(minimumDistance: 3000, maximumDistance: .infinity), scope: mapScope) {
+					Map(position: $position, bounds: MapCameraBounds(minimumDistance: 0, maximumDistance: .infinity), scope: mapScope) {
 						NodeMapContent(node: node)
 					}
 					.mapScope(mapScope)
@@ -103,7 +104,7 @@ struct NodeMapSwiftUI: View {
 						if node.positions?.count ?? 0 > 1 {
 							position = .automatic
 						} else {
-							position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 8000, heading: 0, pitch: 60))
+							position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: distance, heading: 0, pitch: 0))
 						}
 						if let mostRecent {
 							Task {
@@ -128,7 +129,7 @@ struct NodeMapSwiftUI: View {
 							position = .automatic
 						} else {
 							if let mrCoord = mostRecent?.coordinate {
-								position = .camera(MapCamera(centerCoordinate: mrCoord, distance: 8000, heading: 0, pitch: 60))
+								position = .camera(MapCamera(centerCoordinate: mrCoord, distance: distance, heading: 0, pitch: 0))
 							}
 						}
 						if self.scene == nil {