Ignore charge locations with no EV chargers

nobil has data on biogas and hydrogen "chargers", but we don't want them in EVMap
ev-map · Nov 11, 2024 · a01098a · a01098a
1 parent b722dd0
commit a01098a
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 51 deletions.
diff --git a/app/src/main/java/net/vonforst/evmap/api/nobil/NobilApi.kt b/app/src/main/java/net/vonforst/evmap/api/nobil/NobilApi.kt
@@ -3,6 +3,7 @@ package net.vonforst.evmap.api.nobil
 import android.content.Context
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
+import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.Moshi
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.addDebugInterceptors
@@ -154,10 +155,12 @@ class NobilApiWrapper(
     }
 
     private fun postprocessResult(
-        response: NobilResponseData,
+        data: NobilResponseData,
         filters: FilterValues?
     ): List<ChargepointListItem> {
-        return response.chargerStations!!.map { it.convert(response.rights) }.distinct()
+        if (data.rights == null ) throw JsonDataException("Rights field is missing in received data")
+
+        return data.chargerStations!!.mapNotNull { it.convert(data.rights) }.distinct()
     }
 
     override suspend fun getChargepointDetail(

diff --git a/app/src/main/java/net/vonforst/evmap/api/nobil/NobilModel.kt b/app/src/main/java/net/vonforst/evmap/api/nobil/NobilModel.kt
@@ -16,6 +16,10 @@ import net.vonforst.evmap.model.ReferenceData
 import java.time.Instant
 import java.time.LocalDateTime
 
+data class NobilReferenceData(
+    val dummy: Int
+) : ReferenceData()
+
 @JsonClass(generateAdapter = true)
 data class NobilRectangleSearchRequest(
     val apikey: String,
@@ -67,12 +71,18 @@ data class NobilChargerStation(
     @Json(name = "csmd") val chargerStationData: NobilChargerStationData,
     @Json(name = "attr") val chargerStationAttributes: NobilChargerStationAttributes
 ) {
-    fun convert(dataLicense: String?) = ChargeLocation(
-        chargerStationData.id,
-        "nobil",
-        HtmlCompat.fromHtml(chargerStationData.name, HtmlCompat.FROM_HTML_MODE_COMPACT).toString(),
-        chargerStationData.position,
-        Address(chargerStationData.city,
+    fun convert(dataLicense: String) : ChargeLocation? {
+        val chargepoints = chargerStationAttributes.conn.mapNotNull { createChargepointFromNobilConnection(it.value) }
+        if (chargepoints.isEmpty()) return null
+
+        return ChargeLocation(
+            chargerStationData.id,
+            "nobil",
+            HtmlCompat.fromHtml(chargerStationData.name, HtmlCompat.FROM_HTML_MODE_COMPACT)
+                .toString(),
+            chargerStationData.position,
+            Address(
+                chargerStationData.city,
                 when (chargerStationData.landCode) {
                     "DAN" -> "Denmark"
                     "FIN" -> "Finland"
@@ -82,39 +92,59 @@ data class NobilChargerStation(
                     else -> ""
                 },
                 chargerStationData.zipCode,
-                listOfNotNull(chargerStationData.street, chargerStationData.houseNumber).joinToString(" ")),
-        chargerStationAttributes.conn.map { createChargepointFromNobilConnection(it.value) },
-        null,
-        "",
-        null,
-        null,
-        chargerStationData.ocpiId != null ||
-                chargerStationData.updated.isAfter(LocalDateTime.now().minusMonths(6)),
-        null,
-        if (chargerStationData.operator != null) HtmlCompat.fromHtml(chargerStationData.operator, HtmlCompat.FROM_HTML_MODE_COMPACT).toString() else null,
-        if (chargerStationData.userComment != null) HtmlCompat.fromHtml(chargerStationData.userComment, HtmlCompat.FROM_HTML_MODE_COMPACT).toString() else null,
-        null,
-        if (chargerStationData.description != null) HtmlCompat.fromHtml(chargerStationData.description, HtmlCompat.FROM_HTML_MODE_COMPACT).toString() else null,
-        if (chargerStationData.image == "no.image.svg") null else listOf(NobilChargerPhotoAdapter(chargerStationData.image)),
-        null,
-        // 24: Open 24h
-        if (chargerStationAttributes.st["24"]?.attrTrans == "Yes") OpeningHours(twentyfourSeven = true, null, null) else null,
-        // 7: Parking fee
-        when (chargerStationAttributes.st["7"]?.attrTrans) {
-            "Yes" -> Cost(freeparking = false)
-            "No" -> Cost(freeparking = true)
-            else -> null
-        },
-        dataLicense,
-        null,
-        null,
-        null,
-        Instant.now(),
-        true
-    )
+                listOfNotNull(
+                    chargerStationData.street,
+                    chargerStationData.houseNumber
+                ).joinToString(" ")
+            ),
+            chargepoints,
+            null,
+            "",
+            null,
+            null,
+            chargerStationData.ocpiId != null ||
+                    chargerStationData.updated.isAfter(LocalDateTime.now().minusMonths(6)),
+            null,
+            if (chargerStationData.operator != null) HtmlCompat.fromHtml(
+                chargerStationData.operator,
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            ).toString() else null,
+            if (chargerStationData.userComment != null) HtmlCompat.fromHtml(
+                chargerStationData.userComment,
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            ).toString() else null,
+            null,
+            if (chargerStationData.description != null) HtmlCompat.fromHtml(
+                chargerStationData.description,
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            ).toString() else null,
+            if (chargerStationData.image == "no.image.svg") null else listOf(
+                NobilChargerPhotoAdapter(chargerStationData.image)
+            ),
+            null,
+            // 24: Open 24h
+            if (chargerStationAttributes.st["24"]?.attrTrans == "Yes") OpeningHours(
+                twentyfourSeven = true,
+                null,
+                null
+            ) else null,
+            // 7: Parking fee
+            when (chargerStationAttributes.st["7"]?.attrTrans) {
+                "Yes" -> Cost(freeparking = false)
+                "No" -> Cost(freeparking = true)
+                else -> null
+            },
+            dataLicense,
+            null,
+            null,
+            null,
+            Instant.now(),
+            true
+        )
+    }
 
     companion object {
-        fun createChargepointFromNobilConnection(attribs: Map<String, NobilChargerStationGenericAttribute>): Chargepoint {
+        fun createChargepointFromNobilConnection(attribs: Map<String, NobilChargerStationGenericAttribute>): Chargepoint? {
             // https://nobil.no/admin/attributes.php
 
             val isFixedCable = attribs["25"]?.attrTrans == "Yes"
@@ -127,8 +157,8 @@ data class NobilChargerStation(
                 "40" -> Chargepoint.SUPERCHARGER // Tesla Connector Model
                 "50" -> Chargepoint.SCHUKO // Type 2 + Schuko
                 "60" -> Chargepoint.CCS_UNKNOWN // Type1/Type2
-                "70" -> "" // Hydrogen
-                "82" -> "" // Biogas
+                "70" -> return null // Hydrogen
+                "82" -> return null // Biogas
                 else -> ""
             }
 
@@ -216,16 +246,6 @@ data class NobilChargerStationGenericAttribute(
     @Json(name = "attrval") val attrVal: Any
 )
 
-@JsonClass(generateAdapter = true)
-data class NobilChargerStationConnection(
-    @Json(name = "st") val st: Map<String, NobilChargerStationGenericAttribute>,
-    @Json(name = "conn") val conn: Map<String, Map<String, NobilChargerStationGenericAttribute>>
-)
-
-data class NobilReferenceData(
-    val dummy: Int
-) : ReferenceData()
-
 @Parcelize
 @JsonClass(generateAdapter = true)
 class NobilChargerPhotoAdapter(override val id: String) :