From 85079bb88857ffe235adbfc4dcbb853d0f6d48ae Mon Sep 17 00:00:00 2001 From: johan12345 Date: Thu, 13 Jul 2023 21:20:05 +0200 Subject: [PATCH] fix SQL query for minConnectors filter --- .../net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt | 2 +- .../net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt | 2 +- 2 files changed, 2 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 715fc956..5014eff8 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 @@ -595,7 +595,7 @@ class GoingElectricApiWrapper( val minConnectors = filters.getSliderValue("min_connectors") if (minConnectors != null && minConnectors > 1) { - result.append(" GROUP BY ChargeLocation.id HAVING COUNT(1) >= ${minConnectors}") + result.append(" GROUP BY ChargeLocation.id HAVING SUM(json_extract(cp.value, '$.count')) >= ${minConnectors}") requiresChargepointQuery = true } diff --git a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt index 8392dea7..b6213d92 100644 --- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt +++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt @@ -375,7 +375,7 @@ class OpenChargeMapApiWrapper( val minConnectors = filters.getSliderValue("min_connectors") if (minConnectors != null && minConnectors > 1) { - result.append(" GROUP BY ChargeLocation.id HAVING COUNT(1) >= ${minConnectors}") + result.append(" GROUP BY ChargeLocation.id HAVING SUM(json_extract(cp.value, '$.count')) >= ${minConnectors}") requiresChargepointQuery = true }