From e2e15692bb40f23f2ad95572b1da8e8e331c79df Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Wed, 17 Jun 2020 22:16:10 +0200
Subject: [PATCH] add filter to exclude chargers with reported faults

---
 .../net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt   | 3 ++-
 .../main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt  | 3 ++-
 app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt | 2 ++
 app/src/main/res/values-de/strings.xml                         | 1 +
 app/src/main/res/values/strings.xml                            | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
index a67da6f2..34eb3968 100644
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
@@ -29,7 +29,8 @@ interface GoingElectricApi {
         @Query("networks") networks: String? = null,
         @Query("startkey") startkey: Int? = null,
         @Query("open_twentyfourseven") open247: Boolean = false,
-        @Query("barrierfree") barrierfree: Boolean = false
+        @Query("barrierfree") barrierfree: Boolean = false,
+        @Query("exclude_faults") excludeFaults: Boolean = false
     ): Response<ChargepointList>
 
     @GET("chargepoints/")
diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
index 88f2da29..f1a11c7f 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
@@ -91,7 +91,8 @@ private fun MediatorLiveData<List<Filter<FilterValue>>>.buildFilters(
         MultipleChoiceFilter(
             application.getString(R.string.filter_chargecards), "chargecards",
             chargecardMap, manyChoices = true
-        )
+        ),
+        BooleanFilter(application.getString(R.string.filter_exclude_faults), "exclude_faults")
     )
 }
 
diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
index 83f2a9c3..7db44dd0 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -202,6 +202,7 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
         val freeparking = getBooleanValue(filters, "freeparking")
         val open247 = getBooleanValue(filters, "open_247")
         val barrierfree = getBooleanValue(filters, "barrierfree")
+        val excludeFaults = getBooleanValue(filters, "exclude_faults")
         val minPower = getSliderValue(filters, "min_power")
         val minConnectors = getSliderValue(filters, "min_connectors")
 
@@ -250,6 +251,7 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
                     freeparking = freeparking,
                     open247 = open247,
                     barrierfree = barrierfree,
+                    excludeFaults = excludeFaults,
                     plugs = connectors,
                     chargecards = chargeCards,
                     networks = networks,
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d6f76411..9752de3f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -96,4 +96,5 @@
     <string name="retry">Wiederholen</string>
     <string name="filter_open_247">24 Stunden geöffnet</string>
     <string name="filter_barrierfree">Ohne Vertrag / Registrierung nutzbar</string>
+    <string name="filter_exclude_faults">Ladesäulen mit Störung ausschließen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b787458..4335fe62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,4 +95,5 @@
     <string name="retry">Retry</string>
     <string name="filter_open_247">Available 24/7</string>
     <string name="filter_barrierfree">Usable without registration</string>
+    <string name="filter_exclude_faults">Exclude chargers with reported faults</string>
 </resources>