From 609d984df1e67ec67b20d307bf30d0a9baadcbeb Mon Sep 17 00:00:00 2001 From: Johan von Forstner Date: Mon, 25 Dec 2023 18:25:47 +0100 Subject: [PATCH] Tesla availability detectors: fix bug numMissing may have been < 0 --- .../evmap/api/availability/TeslaGuestAvailabilityDetector.kt | 2 +- .../evmap/api/availability/TeslaOwnerAvailabilityDetector.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt index 9956ec5b..828bc9cd 100644 --- a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt @@ -116,7 +116,7 @@ class TeslaGuestAvailabilityDetector( // If we have just one type of charger, we can still match val numMissing = scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - statusSorted.size - if (scV2Connectors.isEmpty() || scV3Connectors.isEmpty() && numMissing > 0) { + if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) { statusSorted = statusSorted + List(numMissing) { ChargerAvailability.UNKNOWN } } else { diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaOwnerAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaOwnerAvailabilityDetector.kt index a4906de2..ed6624ad 100644 --- a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaOwnerAvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaOwnerAvailabilityDetector.kt @@ -100,7 +100,7 @@ class TeslaOwnerAvailabilityDetector( // If we have just one type of charger, we can still match val numMissing = scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - statusSorted.size - if (scV2Connectors.isEmpty() || scV3Connectors.isEmpty() && numMissing > 0) { + if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) { statusSorted = statusSorted + List(numMissing) { ChargerAvailability.UNKNOWN } } else {