From e7b2a85358b44ac94da6c36dc8899ac5f77d8d71 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 9 Nov 2026 23:02:54 +0000 Subject: [PATCH] Use device localisation for temperature/distance/pressure units --- .../Extensions/LPPSensorType+LocaleUnits.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/MC1Services/Sources/MC1Services/Extensions/LPPSensorType+LocaleUnits.swift b/MC1Services/Sources/MC1Services/Extensions/LPPSensorType+LocaleUnits.swift index 002a071f1e..f36179bf9b 100644 --- a/MC1Services/Sources/MC1Services/Extensions/LPPSensorType+LocaleUnits.swift +++ b/MC1Services/Sources/MC1Services/Extensions/LPPSensorType+LocaleUnits.swift @@ -18,7 +18,8 @@ public extension LPPSensorType { /// Whether this type's value will be converted for the current locale. var isConverted: Bool { - preferredUnit != nil + guard let target = preferredUnit, let si = siDimension else { return false } + return target != si } /// The fraction length appropriate for the converted value. @@ -41,16 +42,13 @@ public extension LPPSensorType { // MARK: - Private - /// The locale-preferred Dimension for this sensor type, or nil if metric (no conversion needed). + /// The Foundation locale-preferred unit, or nil for non-locale-sensitive types. private var preferredUnit: Dimension? { - guard siDimension != nil, - Locale.current.measurementSystem != .metric else { return nil } switch self { - case .temperature: return UnitTemperature.fahrenheit - case .barometer: return UnitPressure.inchesOfMercury - case .altitude: return UnitLength.feet - case .distance: return UnitLength.feet - default: return nil + case .temperature: UnitTemperature(forLocale: .current) + case .barometer: UnitPressure(forLocale: .current, usage: .barometric) + case .altitude, .distance: UnitLength(forLocale: .current) + default: nil } }