From 930a5efcea583e63c7566ccdea8be518c9e65212 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 9 Jul 2023 17:35:37 +0200 Subject: [PATCH] OSM: implement cost description --- .../vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt b/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt index 75d744378..99786c43f 100644 --- a/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt +++ b/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt @@ -171,7 +171,7 @@ data class OSMChargingStation( return null } - private fun getCost(): Cost? { + private fun getCost(): Cost { val freecharging = when (tags["fee"]?.lowercase()) { "yes", "y" -> false "no", "n" -> true @@ -182,7 +182,9 @@ data class OSMChargingStation( "yes", "y", "interval" -> false else -> null } - return Cost(freecharging, freeparking) + val description = listOfNotNull(tags["charge"], tags["charge:conditional"]).ifEmpty { null } + ?.joinToString("\n") + return Cost(freecharging, freeparking, null, description) } companion object {