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 on update

Browse source
This commit is contained in:
Garth Vander Houwen 2023-02-22 08:09:38 -08:00
parent 07ceaed23a
commit 2df0654a8f
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ struct MapViewSwiftUI: UIViewRepresentable {
mapView.fit(annotations: positions, andShow: true)
case .clientGps:
let span = MKCoordinateSpan(latitudeDelta: 0.001, longitudeDelta: 0.001)
let span = MKCoordinateSpan(latitudeDelta: 0.003, longitudeDelta: 0.003)
let center = CLLocationCoordinate2D(latitude: LocationHelper.currentLocation.latitude, longitude: LocationHelper.currentLocation.longitude)
let region = MKCoordinateRegion(center: center, span: span)
mapView.setRegion(region, animated: true)
@ -68,8 +68,6 @@ struct MapViewSwiftUI: UIViewRepresentable {
#if targetEnvironment(macCatalyst)
mapView.showsZoomControls = true
mapView.showsPitchControl = true
#else
mapView.showsPointsOfInterest = true
#endif
mapView.delegate = context.coordinator
return mapView
@ -102,14 +100,20 @@ struct MapViewSwiftUI: UIViewRepresentable {
}
DispatchQueue.main.async {
if centeringMode == CenteringMode.clientGps {
let span = MKCoordinateSpan(latitudeDelta: 0.001, longitudeDelta: 0.001)
mapView.removeAnnotations(mapView.annotations)
mapView.addAnnotations(waypoints)
switch centeringMode {
case .allAnnotations:
mapView.addAnnotations(positions)
mapView.fitAllAnnotations()
case .allPositions:
mapView.fit(annotations: positions, andShow: true)
case .clientGps:
mapView.addAnnotations(positions)
let span = MKCoordinateSpan(latitudeDelta: 0.003, longitudeDelta: 0.003)
let region = MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: LocationHelper.currentLocation.latitude, longitude: LocationHelper.currentLocation.longitude), span: span)
mapView.setRegion(region, animated: true)
}
mapView.removeAnnotations(mapView.annotations)
mapView.addAnnotations(positions)
mapView.addAnnotations(waypoints)
}
}