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

Better camera on the node map

Browse source 
Smart position for the database (store just the latest postion if it is the same as the last)
This commit is contained in:
Garth Vander Houwen 2023-11-17 23:07:11 -08:00
parent 3d06e55818
commit 70052affc4
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -256,6 +256,13 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext)
guard let mutablePositions = fetchedNode[0].positions!.mutableCopy() as? NSMutableOrderedSet else {
return
}
/// Don't save the same position over and over.
if mutablePositions.count > 0 {
let mostRecent = mutablePositions.lastObject as! PositionEntity
if mostRecent.latitudeI == position.latitudeI && mostRecent.longitudeI == position.latitudeI {
mutablePositions.remove(mostRecent)
}
}
mutablePositions.add(position)
fetchedNode[0].id = Int64(packet.from)
fetchedNode[0].num = Int64(packet.from)

16
Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
View file

@ -48,7 +48,7 @@ struct NodeMapSwiftUI: View {
var body: some View {
let positionArray = node.positions?.array as? [PositionEntity] ?? []
let mostRecent = node.positions?.lastObject as? PositionEntity
var mostRecent = node.positions?.lastObject as? PositionEntity
let lineCoords = positionArray.compactMap({(position) -> CLLocationCoordinate2D in
return position.nodeCoordinate ?? LocationHelper.DefaultLocation
})
@ -225,8 +225,12 @@ struct NodeMapSwiftUI: View {
}
}
.onChange(of: node) {
let mostRecent = node.positions?.lastObject as? PositionEntity
position = MapCameraPosition.automatic//.camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 1500, heading: 0, pitch: 0))
mostRecent = node.positions?.lastObject as? PositionEntity
if node.positions?.count ?? 0 > 1 {
position = .automatic
} else {
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 150, heading: 0, pitch: 60))
}
if let mostRecent {
Task {
scene = try? await fetchScene(for: mostRecent.coordinate)
@ -245,6 +249,12 @@ struct NodeMapSwiftUI: View {
case .offline:
mapStyle = MapStyle.hybrid(elevation: .realistic, pointsOfInterest: showPointsOfInterest ? .all : .excludingAll, showsTraffic: showTraffic)
}
mostRecent = node.positions?.lastObject as? PositionEntity
if node.positions?.count ?? 0 > 1 {
position = .automatic
} else {
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 150, heading: 0, pitch: 60))
}
if self.scene == nil {
Task {
scene = try? await fetchScene(for: mostRecent!.coordinate)