Meshtastic-Apple/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift

136 lines
4.1 KiB
Swift
Raw Permalink Normal View History

//
// PersistenceEntityExtenstion.swift
// Meshtastic
//
// Copyright(c) Garth Vander Houwen 11/28/21.
//
2021-12-16 14:13:54 -08:00
import CoreData
import CoreLocation
import MapKit
import MeshtasticProtobufs
2021-12-16 14:13:54 -08:00
import SwiftUI
extension PositionEntity {
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
@MainActor
static func allPositionsFetchRequest() -> NSFetchRequest<PositionEntity> {
2024-03-23 09:01:44 -07:00
let request: NSFetchRequest<PositionEntity> = PositionEntity.fetchRequest()
2024-03-23 18:01:20 -07:00
request.sortDescriptors = [NSSortDescriptor(key: "time", ascending: false)]
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
let positionPredicate = NSPredicate(format: "nodePosition != nil AND nodePosition.user != nil AND latest == true AND nodePosition.user.shortName != ''")
request.predicate = positionPredicate
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
// Distance Predicate
if let cl = LocationsHandler.currentLocation {
let d: Double = UserDefaults.meshMapDistance * 1.1
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
let r: Double = 6371009 // Earth's mean radius in meters
// Calculate Bounding Box
let meanLatitidue = cl.latitude * .pi / 180
let deltaLatitude = d / r * 180 / .pi
let deltaLongitude = d / (r * cos(meanLatitidue)) * 180 / .pi
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
let minLatitude: Double = cl.latitude - deltaLatitude
let maxLatitude: Double = cl.latitude + deltaLatitude
let minLongitude: Double = cl.longitude - deltaLongitude
let maxLongitude: Double = cl.longitude + deltaLongitude
// Scale bounding box values by 1e7 and use integer attributes (longitudeI, latitudeI)
let scale: Double = 1e7
let minLongitudeI = Int(minLongitude * scale)
let maxLongitudeI = Int(maxLongitude * scale)
let minLatitudeI = Int(minLatitude * scale)
let maxLatitudeI = Int(maxLatitude * scale)
// Use integer comparison in the predicate
let distancePredicate = NSPredicate(format: "(%ld <= longitudeI) AND (longitudeI <= %ld) AND (%ld <= latitudeI) AND (latitudeI <= %ld)",
minLongitudeI, maxLongitudeI, minLatitudeI, maxLatitudeI)
2024-03-24 13:13:05 -07:00
request.predicate = NSCompoundPredicate(type: .and, subpredicates: [positionPredicate, distancePredicate])
}
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
2024-03-23 09:01:44 -07:00
return request
}
2021-12-16 14:13:54 -08:00
var latitude: Double? {
let d = Double(latitudeI)
if d == 0 {
2021-12-18 20:49:50 -08:00
return 0
2021-12-16 14:13:54 -08:00
}
return d / 1e7
}
2021-12-25 23:48:12 -08:00
2021-12-16 14:13:54 -08:00
var longitude: Double? {
let d = Double(longitudeI)
if d == 0 {
2021-12-18 20:49:50 -08:00
return 0
2021-12-16 14:13:54 -08:00
}
return d / 1e7
}
2021-12-25 23:48:12 -08:00
var nodeCoordinate: CLLocationCoordinate2D? {
2021-12-20 22:29:28 -08:00
if latitudeI != 0 && longitudeI != 0 {
2021-12-16 14:13:54 -08:00
let coord = CLLocationCoordinate2D(latitude: latitude!, longitude: longitude!)
return coord
} else {
return nil
}
}
2023-03-06 10:33:18 -08:00
2023-01-27 20:22:17 -08:00
var nodeLocation: CLLocation? {
if latitudeI != 0 && longitudeI != 0 {
let location = CLLocation(latitude: latitude!, longitude: longitude!)
return location
} else {
return nil
}
}
2023-03-06 10:33:18 -08:00
2021-12-16 14:13:54 -08:00
var annotaton: MKPointAnnotation {
let pointAnn = MKPointAnnotation()
if nodeCoordinate != nil {
pointAnn.coordinate = nodeCoordinate!
2021-12-16 14:13:54 -08:00
}
return pointAnn
}
var isPreciseLocation: Bool {
precisionBits == 32 || precisionBits == 0
}
var fuzzedNodeCoordinate: CLLocationCoordinate2D? {
// With reduced precisionBits, many nodes can overlap on the map, making them unclickable.
// Use a hash of the position ID to fuzz coordinate slightly so that these nodes can be distinguished at the higest zoom levels. This allows them to be clicked individually.
if latitudeI != 0 && longitudeI != 0 {
// Derive two uniform pseudorandom numbers [0,1) from id.hashValue
let u1 = Double(id.hashValue & 0xFFFF) / 65536.0
let u2 = Double((id.hashValue >> 16) & 0xFFFF) / 65536.0
// Angle and radius
let offsetAngle = 2.0 * .pi * u1
let offsetRadius = 0.00001 * sqrt(u2) // 1.0e-5 degrees at equator is about 1.11 m or 4 ft
let dLat = sin(offsetAngle) * offsetRadius
let dLon = cos(offsetAngle) * offsetRadius
let coord = CLLocationCoordinate2D(
latitude: latitude! + dLat,
longitude: longitude! + dLon
)
return coord
} else {
return nil
}
}
2021-12-16 14:13:54 -08:00
}
extension PositionEntity: MKAnnotation {
2025-01-21 09:19:14 -08:00
public var coordinate: CLLocationCoordinate2D { nodeCoordinate ?? LocationsHandler.DefaultLocation }
public var fuzzedCoordinate: CLLocationCoordinate2D { fuzzedNodeCoordinate ?? LocationsHandler.DefaultLocation }
2025-04-27 16:19:10 -07:00
public var title: String? { nodePosition?.user?.shortName ?? "Unknown".localized }
public var subtitle: String? { time?.formatted() }
}