Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
}
}

Expand Down
Loading