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

Make user tracking mode a map control setting so it is not entirely pulled from UserSettings

Browse source
This commit is contained in:
Garth Vander Houwen 2023-03-03 19:41:02 -08:00
parent 7f14d0db02
commit a64677d8bb
4 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,11 @@ struct MapViewSwiftUI: UIViewRepresentable {
let positions: [PositionEntity]
let waypoints: [WaypointEntity]
let mapViewType: MKMapType
let userTrackingMode: MKUserTrackingMode
let centeringMode: CenteringMode
let centerOnPositionsOnly: Bool
@AppStorage("meshMapRecentering") private var recenter: Bool = false
@AppStorage("meshMapUserTrackingMode") private var userTrackingModeId: Int = 0
// Offline Maps
//make this view dependent on the UserDefault that is updated when importing a new map file
@ -38,12 +38,12 @@ struct MapViewSwiftUI: UIViewRepresentable {
// Map View Parameters
mapView.mapType = mapViewType
mapView.addAnnotations(waypoints)
mapView.setUserTrackingMode(UserTrackingModes(rawValue: userTrackingModeId )?.MKUserTrackingModeValue() ?? MKUserTrackingMode.none, animated: true)
if UserTrackingModes(rawValue: userTrackingModeId) != UserTrackingModes.none {
let span = MKCoordinateSpan(latitudeDelta: 0.003, longitudeDelta: 0.003)
let center = LocationHelper.currentLocation
let region = MKCoordinateRegion(center: center, span: span)
mapView.setRegion(region, animated: true)
mapView.setUserTrackingMode(userTrackingMode, animated: true)
let span = MKCoordinateSpan(latitudeDelta: 0.003, longitudeDelta: 0.003)
let center = LocationHelper.currentLocation
let region = MKCoordinateRegion(center: center, span: span)
mapView.setRegion(region, animated: true)
if userTrackingMode != MKUserTrackingMode.none {
mapView.showsUserLocation = true
} else {
mapView.showsUserLocation = false
@ -51,11 +51,11 @@ struct MapViewSwiftUI: UIViewRepresentable {
switch centeringMode {
case .allAnnotations:
mapView.addAnnotations(positions)
if UserTrackingModes(rawValue: userTrackingModeId) == UserTrackingModes.none {
if userTrackingMode == MKUserTrackingMode.none {
mapView.fitAllAnnotations()
}
case .allPositions:
if UserTrackingModes(rawValue: userTrackingModeId) == UserTrackingModes.none {
if userTrackingMode != MKUserTrackingMode.none {
mapView.fit(annotations: positions, andShow: true)
} else {
mapView.addAnnotations(positions)
@ -72,14 +72,14 @@ struct MapViewSwiftUI: UIViewRepresentable {
mapView.showsScale = true
mapView.showsTraffic = true
#if targetEnvironment(macCatalyst)
#if targetEnvironment(macCatalyst)
// Show the default always visible compass and the mac only controls
mapView.showsCompass = true
mapView.showsZoomControls = true
mapView.showsPitchControl = true
#else
#else
#if os(iOS)
#if os(iOS)
// Hide the default compass that only appears when you are not going north and instead always show the compass in the bottom right corner of the map
mapView.showsCompass = false
let compassButton = MKCompassButton(mapView: mapView) // Make a new compass
@ -88,9 +88,9 @@ struct MapViewSwiftUI: UIViewRepresentable {
compassButton.translatesAutoresizingMaskIntoConstraints = false
compassButton.trailingAnchor.constraint(equalTo: mapView.trailingAnchor, constant: -5).isActive = true
compassButton.bottomAnchor.constraint(equalTo: mapView.bottomAnchor, constant: -25).isActive = true
#endif
#endif
#endif
#endif
mapView.delegate = context.coordinator
return mapView
}
@ -127,8 +127,8 @@ struct MapViewSwiftUI: UIViewRepresentable {
if annotationCount != mapView.annotations.count {
mapView.removeAnnotations(mapView.annotations)
mapView.addAnnotations(waypoints)
mapView.setUserTrackingMode(UserTrackingModes(rawValue: userTrackingModeId )?.MKUserTrackingModeValue() ?? MKUserTrackingMode.none, animated: true)
if UserTrackingModes(rawValue: userTrackingModeId) != UserTrackingModes.none {
mapView.setUserTrackingMode(userTrackingMode, animated: true)
if userTrackingMode != MKUserTrackingMode.none {
mapView.showsUserLocation = true
} else {
mapView.showsUserLocation = false
@ -136,11 +136,11 @@ struct MapViewSwiftUI: UIViewRepresentable {
switch centeringMode {
case .allAnnotations:
mapView.addAnnotations(positions)
if recenter && UserTrackingModes(rawValue: userTrackingModeId) == UserTrackingModes.none {
if recenter && userTrackingMode == MKUserTrackingMode.none {
mapView.fitAllAnnotations()
}
case .allPositions:
if recenter && UserTrackingModes(rawValue: userTrackingModeId) == UserTrackingModes.none {
if recenter && userTrackingMode == MKUserTrackingMode.none {
mapView.fit(annotations: positions, andShow: true)
} else {
mapView.addAnnotations(positions)
@ -232,7 +232,7 @@ struct MapViewSwiftUI: UIViewRepresentable {
}
if pf.contains(.Heading){
if parent.userTrackingModeId != 2 {
if parent.userTrackingMode != MKUserTrackingMode.followWithHeading {
annotationView.glyphImage = UIImage(systemName: "location.north.fill")?.rotate(radians: Float(degreesToRadians(Double(positionAnnotation.heading))))
subtitle.text! += "Heading: \(String(positionAnnotation.heading)) \n"
} else {

8
Meshtastic/Views/Messages/Contacts.swift
View file

@ -254,25 +254,19 @@ struct Contacts: View {
.onAppear {
self.bleManager.userSettings = userSettings
self.bleManager.context = context
if userSettings.preferredPeripheralId.count > 0 {
let fetchNodeInfoRequest: NSFetchRequest<NSFetchRequestResult> = NSFetchRequest.init(entityName: "NodeInfoEntity")
fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(bleManager.connectedPeripheral.num))
fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(bleManager.connectedPeripheral?.num ?? -1))
do {
let fetchedNode = try context.fetch(fetchNodeInfoRequest) as! [NodeInfoEntity]
// Found a node, check it for a region
if !fetchedNode.isEmpty {
node = fetchedNode[0]
}
} catch {
}
}
}
}
detail: {

1
Meshtastic/Views/Nodes/NodeDetail.swift
View file

@ -70,6 +70,7 @@ struct NodeDetail: View {
}
}, positions: annotations, waypoints: Array(waypoints),
mapViewType: mapType,
userTrackingMode: MKUserTrackingMode.none,
centeringMode: .allPositions,
centerOnPositionsOnly: true,
customMapOverlay: self.customMapOverlay,

4
Meshtastic/Views/Nodes/NodeMap.swift
View file

@ -30,6 +30,7 @@ struct NodeMap: View {
}
}
@AppStorage("meshMapType") private var meshMapType = "hybridFlyover"
@AppStorage("meshMapUserTrackingMode") private var meshMapUserTrackingMode = 0
@AppStorage("meshMapCenteringMode") private var meshMapCenteringMode = 0
//&& nodePosition != nil
@ -44,6 +45,7 @@ struct NodeMap: View {
private var waypoints: FetchedResults<WaypointEntity>
@State private var mapType: MKMapType = .standard
@State private var userTrackingMode: MKUserTrackingMode = .none
@State private var mapCenteringMode: CenteringMode = .allAnnotations
@State var waypointCoordinate: CLLocationCoordinate2D = LocationHelper.DefaultLocation
@State var editingWaypoint: Int = 0
@ -76,6 +78,7 @@ struct NodeMap: View {
}, positions: Array(positions),
waypoints: Array(waypoints),
mapViewType: mapType,
userTrackingMode: userTrackingMode,
centeringMode: mapCenteringMode,
centerOnPositionsOnly: false,
customMapOverlay: self.customMapOverlay,
@ -116,6 +119,7 @@ struct NodeMap: View {
self.bleManager.context = context
self.bleManager.userSettings = userSettings
mapCenteringMode = CenteringMode(rawValue: meshMapCenteringMode) ?? CenteringMode.allAnnotations
userTrackingMode = UserTrackingModes(rawValue: meshMapUserTrackingMode)?.MKUserTrackingModeValue() ?? MKUserTrackingMode.none
switch meshMapType {
case "standard":
mapType = .standard