fix bug in caching algorithm that caused chargers to disappear

some filters require details that we do not get in normal queries

app/src/main/java/net/vonforst/evmap/api/ChargepointApi.kt

@@ -49,6 +49,8 @@ interface ChargepointApi<out T : ReferenceData> {
 
     fun convertFiltersToSQL(filters: FilterValues, referenceData: ReferenceData): FiltersSQLQuery
 
+    fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean
+
     val name: String
     val id: String
 

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -546,5 +546,14 @@ class GoingElectricApiWrapper(
 
         return FiltersSQLQuery(result.toString(), requiresChargepointQuery, requiresChargeCardQuery)
     }
+
+    override fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean {
+        val chargecards = filters.getMultipleChoiceValue("chargecards")
+        return filters.getBooleanValue("freecharging") == true
+                || filters.getBooleanValue("freeparking") == true
+                || filters.getBooleanValue("open_247") == true
+                || filters.getBooleanValue("barrierfree") == true
+                || (chargecards != null && !chargecards.all)
+    }
 }
 

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt

@@ -379,4 +379,10 @@ class OpenChargeMapApiWrapper(
         return FiltersSQLQuery(result.toString(), requiresChargepointQuery, false)
     }
 
+    override fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean {
+        val operators = filters.getMultipleChoiceValue("operators")
+        return (operators != null && !operators.all)
+        // TODO: it would be possible to implement this without requiring details if we extended the data structure to also save the operator ID in the DB
+    }
+
 }

app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt

@@ -161,6 +161,7 @@ class ChargeLocationsRepository(
         val filtersSerialized =
             filters?.filter { it.value != it.filter.defaultValue() }?.takeIf { it.isNotEmpty() }
                 ?.serialize()
+        val requiresDetail = filters?.let { api.filteringInSQLRequiresDetails(it) } ?: false
         val savedRegionResult = savedRegionDao.savedRegionCovers(
             bounds.southwest.latitude,
             bounds.northeast.latitude,
@@ -168,7 +169,8 @@ class ChargeLocationsRepository(
             bounds.northeast.longitude,
             api.id,
             cacheSoftLimitDate(api),
-            filtersSerialized
+            filtersSerialized,
+            requiresDetail
         )
         val useClustering = shouldUseServerSideClustering(zoom)
         val apiResult = liveData {
@@ -224,13 +226,15 @@ class ChargeLocationsRepository(
         val filtersSerialized =
             filters?.filter { it.value != it.filter.defaultValue() }?.takeIf { it.isNotEmpty() }
                 ?.serialize()
+        val requiresDetail = filters?.let { api.filteringInSQLRequiresDetails(it) } ?: false
         val savedRegionResult = savedRegionDao.savedRegionCoversRadius(
             location.latitude,
             location.longitude,
             radiusMeters * 0.999,  // to account for float rounding errors
             api.id,
             cacheSoftLimitDate(api),
-            filtersSerialized
+            filtersSerialized,
+            requiresDetail
         )
         val useClustering = shouldUseServerSideClustering(zoom)
         val apiResult = liveData {