fine tuning of color markings #28

Marrrrtthias · Sep 13, 2022 · d3096f1 · d3096f1
1 parent e0369ef
commit d3096f1
Showing 1 changed file with 29 additions and 15 deletions.
diff --git a/station/lib/usecase/get_stations_use_case.dart b/station/lib/usecase/get_stations_use_case.dart
@@ -16,7 +16,9 @@ class GetStationsUseCaseImpl extends GetStationsUseCase {
   @override
   Future<List<StationModel>> invoke(
       String type, CoordinateModel position) async {
-    StationPricesModel minPrices = await _fetchMinPrices(type, position);
+    List<StationPricesModel> minMaxPrices = await _fetchMinMaxPrices(type, position);
+    StationPricesModel minPrices = minMaxPrices[0];
+    StationPricesModel maxPrices = minMaxPrices[1];
 
     return _stationRepository.list(type, position, 15).then((stations) {
       return stations
@@ -27,11 +29,13 @@ class GetStationsUseCaseImpl extends GetStationsUseCase {
               station.address,
               StationPricesModel(
                 station.prices.e5,
-                _getPriceRange(minPrices.e5, station.prices.e5),
+                _getPriceRange(minPrices.e5, maxPrices.e5, station.prices.e5),
                 station.prices.e10,
-                _getPriceRange(minPrices.e10, station.prices.e10),
+                _getPriceRange(
+                    minPrices.e10, maxPrices.e10, station.prices.e10),
                 station.prices.diesel,
-                _getPriceRange(minPrices.diesel, station.prices.diesel),
+                _getPriceRange(
+                    minPrices.diesel, maxPrices.diesel, station.prices.diesel),
               ),
               station.coordinate,
               station.openTimes,
@@ -40,7 +44,7 @@ class GetStationsUseCaseImpl extends GetStationsUseCase {
     });
   }
 
-  Future<StationPricesModel> _fetchMinPrices(
+  Future<List<StationPricesModel>> _fetchMinMaxPrices(
       String type, CoordinateModel position) {
     return _stationRepository.list(type, position, 25).then((stations) {
       Iterable<double> e5Prices =
@@ -52,24 +56,34 @@ class GetStationsUseCaseImpl extends GetStationsUseCase {
       Iterable<double> dieselPrices =
           stations.map((s) => s.prices.diesel).where((p) => p != 0.0);
 
-      return StationPricesModel(
-          e5Prices.isNotEmpty ? e5Prices.reduce(min) : 0,
-          StationPriceRange.unknown,
-          e10Prices.isNotEmpty ? e10Prices.reduce(min) : 0,
-          StationPriceRange.unknown,
-          dieselPrices.isNotEmpty ? dieselPrices.reduce(min) : 0,
-          StationPriceRange.unknown);
+      return [
+        StationPricesModel(
+            e5Prices.isNotEmpty ? e5Prices.reduce(min) : 0,
+            StationPriceRange.unknown,
+            e10Prices.isNotEmpty ? e10Prices.reduce(min) : 0,
+            StationPriceRange.unknown,
+            dieselPrices.isNotEmpty ? dieselPrices.reduce(min) : 0,
+            StationPriceRange.unknown),
+        StationPricesModel(
+            e5Prices.isNotEmpty ? e5Prices.reduce(max) : 0,
+            StationPriceRange.unknown,
+            e10Prices.isNotEmpty ? e10Prices.reduce(max) : 0,
+            StationPriceRange.unknown,
+            dieselPrices.isNotEmpty ? dieselPrices.reduce(max) : 0,
+            StationPriceRange.unknown),
+      ];
     });
   }
 
-  StationPriceRange _getPriceRange(double minPrice, double price) {
+  StationPriceRange _getPriceRange(
+      double minPrice, double maxPrice, double price) {
     if (price == 0.0) {
       return StationPriceRange.unknown;
     }
 
-    if (minPrice + 0.04 >= price) {
+    if (minPrice + ((maxPrice - minPrice) * .1) >= price) {
       return StationPriceRange.cheap;
-    } else if (minPrice + 0.10 >= price) {
+    } else if (minPrice + ((maxPrice - minPrice) * .5) >= price) {
       return StationPriceRange.normal;
     } else {
       return StationPriceRange.expensive;