2023-10-03 18:45:23 -07:00
|
|
|
//
|
|
|
|
|
// MapSettingsForm.swift
|
|
|
|
|
// Meshtastic
|
|
|
|
|
//
|
|
|
|
|
// Created by Garth Vander Houwen on 10/3/23.
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
import SwiftUI
|
|
|
|
|
import MapKit
|
2025-07-22 00:48:50 +00:00
|
|
|
import OSLog
|
2023-10-03 18:45:23 -07:00
|
|
|
|
|
|
|
|
struct MapSettingsForm: View {
|
|
|
|
|
@Environment(\.dismiss) private var dismiss
|
2024-07-17 21:43:06 -07:00
|
|
|
@State private var currentDetent = PresentationDetent.medium
|
2024-03-25 18:43:03 -07:00
|
|
|
@AppStorage("meshMapShowNodeHistory") private var nodeHistory = false
|
2025-05-24 00:19:00 -07:00
|
|
|
@AppStorage("meshMapShowRouteLines") private var enableMapRouteLines = false
|
2024-03-25 18:43:03 -07:00
|
|
|
@AppStorage("enableMapConvexHull") private var convexHull = false
|
2025-05-24 00:19:00 -07:00
|
|
|
@AppStorage("enableMapWaypoints") private var enableMapWaypoints = true
|
|
|
|
|
@AppStorage("enableMapShowFavorites") private var enableMapShowFavorites = false
|
2025-07-22 00:48:50 +00:00
|
|
|
@AppStorage("mapOverlaysEnabled") private var mapOverlaysEnabled = false
|
2025-07-22 04:13:54 +00:00
|
|
|
@ObservedObject private var mapDataManager = MapDataManager.shared
|
2023-11-09 17:43:38 -08:00
|
|
|
@Binding var traffic: Bool
|
|
|
|
|
@Binding var pointsOfInterest: Bool
|
|
|
|
|
@Binding var mapLayer: MapLayer
|
2024-03-25 18:43:03 -07:00
|
|
|
@AppStorage("meshMapDistance") private var meshMapDistance: Double = 800000
|
2024-02-17 15:37:28 -08:00
|
|
|
@Binding var meshMap: Bool
|
2025-07-22 02:03:36 +00:00
|
|
|
@Binding var enabledOverlayConfigs: Set<UUID>
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2023-10-03 18:45:23 -07:00
|
|
|
var body: some View {
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2023-11-26 10:45:03 -08:00
|
|
|
NavigationStack {
|
2023-10-03 18:45:23 -07:00
|
|
|
Form {
|
|
|
|
|
Section(header: Text("Map Options")) {
|
|
|
|
|
Picker(selection: $mapLayer, label: Text("")) {
|
|
|
|
|
ForEach(MapLayer.allCases, id: \.self) { layer in
|
|
|
|
|
if layer != MapLayer.offline {
|
2025-05-23 23:41:32 -07:00
|
|
|
Text(layer.localized.capitalized)
|
2023-10-03 18:45:23 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.pickerStyle(SegmentedPickerStyle())
|
|
|
|
|
.padding(.top, 5)
|
|
|
|
|
.padding(.bottom, 5)
|
2024-10-05 15:50:57 -07:00
|
|
|
.onChange(of: mapLayer) { _, newMapLayer in
|
2023-11-09 17:43:38 -08:00
|
|
|
UserDefaults.mapLayer = newMapLayer
|
|
|
|
|
}
|
2024-03-24 22:56:38 -07:00
|
|
|
if meshMap {
|
2025-10-05 17:51:18 -07:00
|
|
|
if LocationsHandler.currentLocation != nil {
|
|
|
|
|
HStack {
|
|
|
|
|
Label("Distance", systemImage: "lines.measurement.horizontal")
|
|
|
|
|
Picker("", selection: $meshMapDistance) {
|
|
|
|
|
ForEach(MeshMapDistances.allCases) { di in
|
|
|
|
|
Text(di.description)
|
|
|
|
|
.tag(di.id)
|
|
|
|
|
}
|
2024-03-24 22:23:55 -07:00
|
|
|
}
|
2025-10-05 17:51:18 -07:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
|
|
|
|
}
|
|
|
|
|
.onChange(of: meshMapDistance) { _, newMeshMapDistance in
|
|
|
|
|
UserDefaults.meshMapDistance = newMeshMapDistance
|
2024-03-24 22:23:55 -07:00
|
|
|
}
|
|
|
|
|
}
|
2025-05-24 00:19:00 -07:00
|
|
|
Toggle(isOn: $enableMapWaypoints) {
|
|
|
|
|
Label {
|
2025-10-05 17:51:18 -07:00
|
|
|
Text("Waypoints")
|
2025-05-24 00:19:00 -07:00
|
|
|
} icon: {
|
|
|
|
|
Image(systemName: "signpost.right.and.left")
|
|
|
|
|
.symbolRenderingMode(.multicolor)
|
|
|
|
|
}
|
2024-03-25 19:20:36 -07:00
|
|
|
}
|
2025-05-24 00:19:00 -07:00
|
|
|
.tint(.accentColor)
|
2023-10-03 18:45:23 -07:00
|
|
|
}
|
2025-05-24 00:19:00 -07:00
|
|
|
Toggle(isOn: $enableMapShowFavorites) {
|
|
|
|
|
Label {
|
|
|
|
|
Text("Favorites")
|
|
|
|
|
} icon: {
|
|
|
|
|
Image(systemName: "star.fill")
|
|
|
|
|
.symbolRenderingMode(.multicolor)
|
|
|
|
|
}
|
2025-05-23 20:53:31 -07:00
|
|
|
}
|
2025-05-24 00:19:00 -07:00
|
|
|
.tint(.accentColor)
|
2025-10-05 17:51:18 -07:00
|
|
|
if !meshMap {
|
|
|
|
|
Toggle(isOn: $nodeHistory) {
|
|
|
|
|
Label("Node History", systemImage: "building.columns.fill")
|
|
|
|
|
}
|
|
|
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
2025-10-21 06:03:01 -07:00
|
|
|
Toggle(isOn: $enableMapRouteLines) {
|
|
|
|
|
Label("Route Lines", systemImage: "road.lanes")
|
2025-10-05 17:51:18 -07:00
|
|
|
}
|
2025-10-21 06:03:01 -07:00
|
|
|
.tint(.accentColor)
|
|
|
|
|
|
2024-03-24 22:56:38 -07:00
|
|
|
}
|
2023-10-03 18:45:23 -07:00
|
|
|
Toggle(isOn: $convexHull) {
|
|
|
|
|
Label("Convex Hull", systemImage: "button.angledbottom.horizontal.right")
|
|
|
|
|
}
|
|
|
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
|
|
|
.onTapGesture {
|
|
|
|
|
self.convexHull.toggle()
|
|
|
|
|
UserDefaults.enableMapConvexHull = self.convexHull
|
|
|
|
|
}
|
|
|
|
|
Toggle(isOn: $traffic) {
|
|
|
|
|
Label("Traffic", systemImage: "car")
|
|
|
|
|
}
|
|
|
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
|
|
|
.onTapGesture {
|
|
|
|
|
self.traffic.toggle()
|
|
|
|
|
UserDefaults.enableMapTraffic = self.traffic
|
|
|
|
|
}
|
|
|
|
|
Toggle(isOn: $pointsOfInterest) {
|
2025-05-24 00:19:00 -07:00
|
|
|
Label {
|
|
|
|
|
Text("Points of Interest")
|
|
|
|
|
} icon: {
|
|
|
|
|
Image(systemName: "mappin.and.ellipse")
|
|
|
|
|
.symbolRenderingMode(.multicolor)
|
|
|
|
|
}
|
2023-10-03 18:45:23 -07:00
|
|
|
}
|
2025-05-24 00:19:00 -07:00
|
|
|
.tint(.accentColor)
|
2023-10-03 18:45:23 -07:00
|
|
|
.onTapGesture {
|
|
|
|
|
self.pointsOfInterest.toggle()
|
|
|
|
|
UserDefaults.enableMapPointsOfInterest = self.pointsOfInterest
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2025-07-27 17:19:31 -07:00
|
|
|
Section(header: Text("Map Overlays")) {
|
2025-07-21 21:42:36 +00:00
|
|
|
let hasUserData = GeoJSONOverlayManager.shared.hasUserData()
|
|
|
|
|
// Master toggle for map overlays
|
2025-07-22 00:48:50 +00:00
|
|
|
Toggle(isOn: $mapOverlaysEnabled) {
|
2025-07-16 02:45:17 +00:00
|
|
|
Label {
|
2025-07-21 21:42:36 +00:00
|
|
|
VStack(alignment: .leading) {
|
|
|
|
|
Text("Map Overlays")
|
|
|
|
|
Text(GeoJSONOverlayManager.shared.getActiveDataSource())
|
|
|
|
|
.font(.caption)
|
|
|
|
|
.foregroundColor(.secondary)
|
|
|
|
|
}
|
2025-07-16 02:45:17 +00:00
|
|
|
} icon: {
|
2025-07-21 21:42:36 +00:00
|
|
|
Image(systemName: "map")
|
2025-07-27 22:31:57 -07:00
|
|
|
.symbolRenderingMode(.multicolor)
|
2025-07-16 02:45:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.tint(.accentColor)
|
2025-07-27 22:31:57 -07:00
|
|
|
.disabled(!hasUserData && !mapOverlaysEnabled)
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2025-07-22 00:48:50 +00:00
|
|
|
// Show individual file toggles when overlays are enabled
|
|
|
|
|
if mapOverlaysEnabled && hasUserData {
|
2025-07-22 04:13:54 +00:00
|
|
|
if !mapDataManager.getUploadedFiles().isEmpty {
|
2025-07-22 00:48:50 +00:00
|
|
|
// Individual file toggles
|
2025-07-22 04:13:54 +00:00
|
|
|
ForEach(mapDataManager.getUploadedFiles()) { file in
|
2025-07-22 00:48:50 +00:00
|
|
|
Toggle(isOn: Binding(
|
2025-07-23 20:26:50 +00:00
|
|
|
get: {
|
2025-07-22 02:18:00 +00:00
|
|
|
return enabledOverlayConfigs.contains(file.id)
|
2025-07-22 00:48:50 +00:00
|
|
|
},
|
|
|
|
|
set: { newValue in
|
2025-07-22 02:03:36 +00:00
|
|
|
if newValue {
|
|
|
|
|
enabledOverlayConfigs.insert(file.id)
|
|
|
|
|
} else {
|
|
|
|
|
enabledOverlayConfigs.remove(file.id)
|
|
|
|
|
}
|
2025-07-22 00:48:50 +00:00
|
|
|
}
|
|
|
|
|
)) {
|
|
|
|
|
Label {
|
|
|
|
|
VStack(alignment: .leading) {
|
|
|
|
|
Text(file.originalName)
|
|
|
|
|
.font(.subheadline)
|
|
|
|
|
HStack {
|
2025-09-12 03:49:47 +02:00
|
|
|
Text("\(file.overlayCount) features")
|
2025-07-22 00:48:50 +00:00
|
|
|
.font(.caption2)
|
|
|
|
|
.foregroundColor(.secondary)
|
|
|
|
|
Spacer()
|
|
|
|
|
Text(ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .file))
|
|
|
|
|
.font(.caption2)
|
|
|
|
|
.foregroundColor(.secondary)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} icon: {
|
2025-07-22 02:03:36 +00:00
|
|
|
let isEnabled = enabledOverlayConfigs.contains(file.id)
|
|
|
|
|
Image(systemName: isEnabled ? "doc.fill" : "doc")
|
|
|
|
|
.foregroundColor(isEnabled ? .accentColor : .secondary)
|
2025-07-22 00:48:50 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.tint(.accentColor)
|
|
|
|
|
}
|
2025-07-22 04:13:54 +00:00
|
|
|
NavigationLink(destination: MapDataFiles()) {
|
2025-07-27 22:31:57 -07:00
|
|
|
Label {
|
|
|
|
|
Text("Manage map data")
|
|
|
|
|
} icon: {
|
2025-07-22 00:48:50 +00:00
|
|
|
Image(systemName: "folder")
|
2025-07-27 22:31:57 -07:00
|
|
|
.symbolRenderingMode(.multicolor)
|
2025-07-22 00:48:50 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
ContentUnavailableView("No map data files uploaded", systemImage: "exclamationmark.triangle")
|
2025-07-21 21:42:36 +00:00
|
|
|
}
|
|
|
|
|
} else if !hasUserData {
|
2025-07-22 00:48:50 +00:00
|
|
|
// Upload prompt when no data available
|
2025-07-22 04:13:54 +00:00
|
|
|
NavigationLink(destination: MapDataFiles()) {
|
2025-07-27 22:31:57 -07:00
|
|
|
Label {
|
|
|
|
|
Text("Upload map data to enable overlays")
|
|
|
|
|
} icon: {
|
2025-07-21 21:42:36 +00:00
|
|
|
Image(systemName: "arrow.up.doc")
|
2025-07-27 22:31:57 -07:00
|
|
|
.symbolRenderingMode(.multicolor)
|
2025-07-21 21:42:36 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-07-16 02:45:17 +00:00
|
|
|
}
|
2023-10-03 18:45:23 -07:00
|
|
|
}
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2023-10-03 18:45:23 -07:00
|
|
|
#if targetEnvironment(macCatalyst)
|
2025-07-27 22:31:57 -07:00
|
|
|
Spacer()
|
|
|
|
|
Button {
|
|
|
|
|
dismiss()
|
|
|
|
|
} label: {
|
|
|
|
|
Label("Close", systemImage: "xmark")
|
|
|
|
|
}
|
|
|
|
|
.buttonStyle(.bordered)
|
|
|
|
|
.buttonBorderShape(.capsule)
|
|
|
|
|
.controlSize(.large)
|
|
|
|
|
.padding(.bottom)
|
2023-10-03 18:45:23 -07:00
|
|
|
#endif
|
|
|
|
|
}
|
2025-10-05 17:51:18 -07:00
|
|
|
.presentationDetents([.large], selection: $currentDetent)
|
2024-07-17 21:43:06 -07:00
|
|
|
.presentationContentInteraction(.scrolls)
|
2023-11-09 17:43:38 -08:00
|
|
|
.presentationDragIndicator(.visible)
|
2024-07-17 21:43:06 -07:00
|
|
|
.presentationBackgroundInteraction(.enabled(upThrough: .medium))
|
2025-07-22 00:48:50 +00:00
|
|
|
.onAppear {
|
2025-07-22 04:13:54 +00:00
|
|
|
// Initialize map data manager
|
|
|
|
|
mapDataManager.initialize()
|
2025-07-22 00:48:50 +00:00
|
|
|
}
|
2025-08-28 22:54:17 -07:00
|
|
|
|
2023-10-03 18:45:23 -07:00
|
|
|
}
|
|
|
|
|
}
|