meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Centering updates

Browse source
This commit is contained in:
Garth Vander Houwen 2023-05-09 07:48:02 -07:00
parent f3d38d729f
commit e0c5c0aa98
1 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
View file

@ -105,6 +105,8 @@ struct MapViewSwiftUI: UIViewRepresentable {
if !UserDefaults.enableOfflineMapsMBTiles {
let overlay = TileOverlay()
overlay.canReplaceMapContent = false
//overlay.minimumZ = 0
//overlay.maximumZ = 17
mapView.addOverlay(overlay, level: UserDefaults.mapTilesAboveLabels ? .aboveLabels : .aboveRoads)
}
case .satellite:
@ -197,28 +199,14 @@ struct MapViewSwiftUI: UIViewRepresentable {
print("Annotation Count: \(annotationCount) Map Annotations: \(mapView.annotations.count)")
mapView.removeAnnotations(mapView.annotations)
mapView.addAnnotations(waypoints)
mapView.addAnnotations(showNodeHistory ? positions : latest)
}
if userTrackingMode == MKUserTrackingMode.none {
mapView.showsUserLocation = false
if UserDefaults.enableMapRecentering {
if annotationCount != mapView.annotations.count {
mapView.addAnnotations(showNodeHistory ? positions : latest)
}
if latest.count > 1 {
mapView.fitAllAnnotations()
} else {
mapView.fit(annotations:showNodeHistory ? positions : latest, andShow: false)
}
}
} else {
// Centering Done by tracking mode
if annotationCount != mapView.annotations.count {
mapView.addAnnotations(showNodeHistory ? positions : latest)
}
mapView.showsUserLocation = true
}
mapView.fitAllAnnotations()
mapView.setUserTrackingMode(userTrackingMode, animated: true)
}