From 9d7278e0e2aff191e8f921869f72bb463d223132 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sun, 14 Nov 2021 15:58:08 +0100
Subject: [PATCH] AvailabilityDetector: support missing household plugs in
 NewMotion data

fixes #146
---
 .../api/availability/AvailabilityDetector.kt  | 14 +++++-
 .../availability/AvailabilityDetectorTest.kt  | 44 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
index 5068a606..d2469ef5 100644
--- a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
@@ -65,10 +65,20 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
+            var chargepoints = chargepoints
+
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
             val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
-            val geTypes = chargepoints.map { it.type }.distinct().toSet()
+            var geTypes = chargepoints.map { it.type }.distinct().toSet()
+            if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
+                    Chargepoint.SCHUKO
+                )) {
+                // If charger has household plugs and other plugs, try removing the household plugs
+                // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
+                geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
+                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
+            }
             if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
                 // find connectors of this type
@@ -92,7 +102,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumBy { it.count } == connsOfType.size
+                    && chargepoints.sumOf { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one
diff --git a/app/src/test/java/net/vonforst/evmap/api/availability/AvailabilityDetectorTest.kt b/app/src/test/java/net/vonforst/evmap/api/availability/AvailabilityDetectorTest.kt
index 3d883e26..a101903d 100644
--- a/app/src/test/java/net/vonforst/evmap/api/availability/AvailabilityDetectorTest.kt
+++ b/app/src/test/java/net/vonforst/evmap/api/availability/AvailabilityDetectorTest.kt
@@ -138,4 +138,48 @@ class AvailabilityDetectorTest {
             )
         )
     }
+
+
+    @Test
+    fun testMatchChargepointsMissingSchuko() {
+        // single charger with 2 22kw chargepoints and two Schuko sockets
+        val chargepoints = listOf(
+            Chargepoint(Chargepoint.TYPE_2_UNKNOWN, 22.0, 2),
+            Chargepoint(Chargepoint.SCHUKO, 2.3, 2)
+        )
+
+        // NewMotion only includes the Type 2 sockets
+        assertEquals(
+            mapOf(chargepoints[0] to setOf(0L, 1L)),
+            BaseAvailabilityDetector.matchChargepoints(
+                mapOf(
+                    0L to (27.0 to Chargepoint.TYPE_2_UNKNOWN),
+                    1L to (27.0 to Chargepoint.TYPE_2_UNKNOWN)
+                ),
+                chargepoints
+            )
+        )
+    }
+
+    @Test
+    fun testMatchChargepointsMissingSchukoDifferentPower() {
+        // single charger with 2 22kw chargepoints with load balancing and two Schuko sockets
+        val chargepoints = listOf(
+            Chargepoint(Chargepoint.TYPE_2_UNKNOWN, 22.0, 1),
+            Chargepoint(Chargepoint.TYPE_2_UNKNOWN, 11.0, 1),
+            Chargepoint(Chargepoint.SCHUKO, 2.3, 2)
+        )
+
+        // NewMotion only includes the Type 2 sockets
+        assertEquals(
+            mapOf(chargepoints[1] to setOf(0L), chargepoints[0] to setOf(1L)),
+            BaseAvailabilityDetector.matchChargepoints(
+                mapOf(
+                    0L to (27.0 to Chargepoint.TYPE_2_UNKNOWN),
+                    1L to (27.0 to Chargepoint.TYPE_2_UNKNOWN)
+                ),
+                chargepoints
+            )
+        )
+    }
 }
\ No newline at end of file