Added new filters to car market: batteryCapacity, drivingRange & maxT…

…railerWeight (#290)
finn-no · Jun 6, 2019 · 131fb2a · 131fb2a
1 parent 6666768
commit 131fb2a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/Sources/Charcoal/Models/FilterUnit.swift b/Sources/Charcoal/Models/FilterUnit.swift
@@ -16,6 +16,7 @@ public enum FilterUnit: Equatable {
     case seats
     case squareMeters
     case year
+    case kiloWattHour
     case custom(
         value: String,
         accessibilityValue: String,
@@ -46,6 +47,8 @@ public enum FilterUnit: Equatable {
             return "unit.squareMeters.value".localized()
         case .year:
             return ""
+        case .kiloWattHour:
+            return "unit.kiloWattHour.value".localized()
         case let .custom(value, _, _):
             return value
         }
@@ -75,6 +78,8 @@ public enum FilterUnit: Equatable {
             return "unit.squareMeters.accessibilityValue".localized()
         case .year:
             return "unit.years.accessibilityValue".localized()
+        case .kiloWattHour:
+            return "unit.kiloWattHour.accessibilityValue".localized()
         case let .custom(_, accessibilityValue, _):
             return accessibilityValue
         }

diff --git a/Sources/Charcoal/Resources/en.lproj/Localizable.strings b/Sources/Charcoal/Resources/en.lproj/Localizable.strings
@@ -46,6 +46,7 @@
 "unit.kilometers.value" = "km";
 "unit.seats.value" = "seter";
 "unit.squareMeters.value" = "m²";
+"unit.kiloWattHour.value" = "kWh";
 
 "unit.centimeters.accessibilityValue" = "centimeter";
 "unit.cubicCentimeters.accessibilityValue" = "kubikkcentimeter";
@@ -58,6 +59,7 @@
 "unit.seats.accessibilityValue" = "seter";
 "unit.squareMeters.accessibilityValue" = "kvadratmeter";
 "unit.years.accessibilityValue" = "år";
+"unit.kiloWattHour.accessibilityValue" = "kilowattime";
 
 "map.title" = "Område i kart";
 "map.homeAddress" = "Min hjemmeadresse";

diff --git a/Sources/FINNSetup/FilterKey.swift b/Sources/FINNSetup/FilterKey.swift
@@ -102,4 +102,7 @@ public enum FilterKey: String, CodingKey {
     case wheelSets = "wheel_sets"
     case womenClothingBrand = "women_clothing_brand"
     case year
+    case batteryCapacity = "battery_capacity"
+    case drivingRange = "driving_range"
+    case maxTrailerWeight = "max_trailer_weight"
 }
diff --git a/Sources/FINNSetup/FilterMarkets/FilterMarketCar.swift b/Sources/FINNSetup/FilterMarkets/FilterMarketCar.swift
@@ -33,6 +33,9 @@ extension FilterMarketCar: FilterConfiguration {
                 .mileage,
                 .leasepriceInit,
                 .leasepriceMonth,
+                .batteryCapacity,
+                .drivingRange,
+                .maxTrailerWeight,
                 .price,
                 .map,
                 .location,
@@ -56,6 +59,9 @@ extension FilterMarketCar: FilterConfiguration {
                 .map,
                 .location,
                 .year,
+                .batteryCapacity,
+                .drivingRange,
+                .maxTrailerWeight,
                 .price,
                 .mileage,
                 .engineEffect,
@@ -111,6 +117,9 @@ extension FilterMarketCar: FilterConfiguration {
         return [
             .leasepriceInit,
             .leasepriceMonth,
+            .batteryCapacity,
+            .drivingRange,
+            .maxTrailerWeight,
         ]
     }
 
@@ -191,6 +200,12 @@ extension FilterMarketCar: FilterConfiguration {
             default:
                 return nil
             }
+        case .batteryCapacity:
+            return .configuration(minimumValue: 0, maximumValue: 150, increment: 10, unit: .kiloWattHour)
+        case .drivingRange:
+            return .configuration(minimumValue: 0, maximumValue: 750, increment: 50, unit: .kilometers)
+        case .maxTrailerWeight:
+            return .configuration(minimumValue: 0, maximumValue: 4000, increment: 200, unit: .kilograms)
         default:
             return nil
         }