From 951ecec688e388788cc988f6bb94a4221313a443 Mon Sep 17 00:00:00 2001 From: Joshua Pirihi Date: Tue, 21 Dec 2021 20:15:07 +1300 Subject: [PATCH] Node map kinda working --- Meshtastic Client.xcodeproj/project.pbxproj | 4 +-- .../UserInterfaceState.xcuserstate | Bin 0 -> 28207 bytes .../xcschemes/xcschememanagement.plist | 14 ++++++++ MeshtasticClient/Views/Nodes/NodeMap.swift | 33 +++++++++++++----- 4 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 Meshtastic Client.xcodeproj/project.xcworkspace/xcuserdata/joshuapirihi.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 Meshtastic Client.xcodeproj/xcuserdata/joshuapirihi.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Meshtastic Client.xcodeproj/project.pbxproj b/Meshtastic Client.xcodeproj/project.pbxproj index af7c9c5e..ae67097f 100644 --- a/Meshtastic Client.xcodeproj/project.pbxproj +++ b/Meshtastic Client.xcodeproj/project.pbxproj @@ -683,7 +683,7 @@ CODE_SIGN_ENTITLEMENTS = MeshtasticClient/MeshtasticClient.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"MeshtasticClient/Preview Content\""; - DEVELOPMENT_TEAM = GCH7VS5Y9R; + DEVELOPMENT_TEAM = 37C534H572; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = MeshtasticClient/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; @@ -710,7 +710,7 @@ CODE_SIGN_ENTITLEMENTS = MeshtasticClient/MeshtasticClient.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"MeshtasticClient/Preview Content\""; - DEVELOPMENT_TEAM = GCH7VS5Y9R; + DEVELOPMENT_TEAM = 37C534H572; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = MeshtasticClient/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; diff --git a/Meshtastic Client.xcodeproj/project.xcworkspace/xcuserdata/joshuapirihi.xcuserdatad/UserInterfaceState.xcuserstate b/Meshtastic Client.xcodeproj/project.xcworkspace/xcuserdata/joshuapirihi.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..0cf935596330218c3fcaee2a3d3ba117033cec78 GIT binary patch literal 28207 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 + + + + SchemeUserState + + MeshtasticClient.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/MeshtasticClient/Views/Nodes/NodeMap.swift b/MeshtasticClient/Views/Nodes/NodeMap.swift index c3aee386..9a76385d 100644 --- a/MeshtasticClient/Views/Nodes/NodeMap.swift +++ b/MeshtasticClient/Views/Nodes/NodeMap.swift @@ -36,23 +36,38 @@ struct NodeMap: View { set: { _ in } ) + /*ForEach ( locationNodes ) { node in + let mostRecent = node.positions?.lastObject as! PositionEntity + if mostRecent.coordinate != nil { + + annotations.append(MapLocation(name: node.user?.shortName! ?? "???", coordinate: mostRecent.coordinate!)) + + } + }*/ + NavigationView { ZStack { + + Map(coordinateRegion: regionBinding, interactionModes: [.all], showsUserLocation: true, - userTrackingMode: .constant(.follow)//, - //ForEach ( locationNodes ) { node in - // let mostRecent = node.positions?.lastObject as! PositionEntity - // if mostRecent.coordinate != nil { + userTrackingMode: .constant(.follow), + annotationItems: self.locationNodes.filter({ nodeinfo in + return nodeinfo.positions != nil && nodeinfo.positions!.count > 0 + }) + ) { locationNode in - // annotations.append(MapLocation(name: node.user?.shortName! ?? "???", coordinate: mostRecent.coordinate!)) - - // } - // } - ) + return MapAnnotation( + coordinate: (locationNode.positions!.lastObject as! PositionEntity).coordinate ?? CLLocationCoordinate2D(latitude: 0, longitude: 0), + content: { + CircleText(text: locationNode.user!.shortName ?? "???", color: .accentColor) + } + ) + + } //} .frame(maxHeight: .infinity) .ignoresSafeArea(.all, edges: [.leading, .trailing])