diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 962893b8..56e102bb 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -965,7 +965,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.2; + MARKETING_VERSION = 2.0.3; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -998,7 +998,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.2; + MARKETING_VERSION = 2.0.3; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; diff --git a/Meshtastic/Helpers/LocationHelper.swift b/Meshtastic/Helpers/LocationHelper.swift index 929c3617..db7ec2f8 100644 --- a/Meshtastic/Helpers/LocationHelper.swift +++ b/Meshtastic/Helpers/LocationHelper.swift @@ -52,23 +52,21 @@ class LocationHelper: NSObject, ObservableObject { } static var satsInView: Int { - // If we have a position we have a sat var sats = 1 - if shared.locationManager.location?.verticalAccuracy ?? 0 > 0 { sats = 4 - - if 0...15 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ + if 0...5 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ sats = 12 - } else if 16...30 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ + } else if 6...15 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ sats = 10 + } else if 16...30 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ + sats = 9 } else if 31...45 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ - sats = 8 + sats = 7 } else if 46...60 ~= shared.locationManager.location?.horizontalAccuracy ?? 0{ - sats = 6 + sats = 5 } - } else if shared.locationManager.location?.verticalAccuracy ?? 0 < 0 && 60...300 ~= shared.locationManager.location?.horizontalAccuracy ?? 0 { sats = 3 } else if shared.locationManager.location?.verticalAccuracy ?? 0 < 0 && shared.locationManager.location?.horizontalAccuracy ?? 0 > 300 {