mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-05-24 06:45:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

OSM: Implement output power parsing

Browse Source
This commit is contained in:
Danilo Bargen
2022-01-28 23:38:26 +01:00
parent 9548748a64
commit 038da0856e
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt
View File

@@ -135,9 +135,9 @@ data class OSMChargingStation(
}
if (count > 0) {
if (socket.evmapKey != null) {
chargepoints.add(Chargepoint(socket.evmapKey, null, count))
val outputPower = parseOutputPower(this.tags["${socket.osmSocketBaseTag()}:output"])
chargepoints.add(Chargepoint(socket.evmapKey, outputPower, count))
}
// TODO: Power parsing
}
}
return chargepoints
@@ -162,4 +162,27 @@ data class OSMChargingStation(
// we could implement an "open now" feature.
return null
}
companion object {
/**
* Parse raw OSM output power.
*
* The proper format to map output power for an EV charging station is "<amount> kW",
* for example "22 kW" or "3.7 kW". Some fields in the wild are tagged with the unit "kVA"
* instead of "kW", those can be treated as equivalent.
*
* Sometimes people also mapped plain numbers (e.g. 7000, I assume that's 7 kW),
* ranges (5,5 - 11 kW, huh?) or even current (32 A), which is wrong. If we cannot parse,
* just ignore the field.
*/
fun parseOutputPower(rawOutput: String?): Double? {
if (rawOutput == null) {
return null;
}
val pattern = Regex("([0-9.,]+)\\s*(kW|kVA)", setOf(RegexOption.IGNORE_CASE))
val matchResult = pattern.matchEntire(rawOutput) ?: return null
val numberString = matchResult.groupValues[1].replace(',', '.')
return numberString.toDoubleOrNull()
}
}
}

27
app/src/test/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModelTest.kt
View File

@@ -4,6 +4,7 @@ import com.squareup.moshi.Moshi
import net.vonforst.evmap.api.openchargemap.ZonedDateTimeAdapter
import net.vonforst.evmap.model.Chargepoint
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test
import java.time.Instant
import java.time.Month
@@ -80,7 +81,33 @@ class OpenStreetMapModelTest {
val type2 = chargeLocation.chargepoints.single { it.type == Chargepoint.TYPE_2_SOCKET }
val chademo = chargeLocation.chargepoints.single { it.type == Chargepoint.CHADEMO }
assertEquals(2, ccs.count)
assertEquals(150.0, ccs.power)
assertEquals(1, type2.count)
assertEquals(22.0, type2.power)
assertEquals(2, chademo.count)
assertEquals(60.0, chademo.power)
}
@Test
fun parseOutputPower() {
// Null input -> null output
assertNull(OSMChargingStation.parseOutputPower(null))
// Invalid input -> null output
assertNull(OSMChargingStation.parseOutputPower(""))
assertNull(OSMChargingStation.parseOutputPower("a"))
assertNull(OSMChargingStation.parseOutputPower("22 A"))
// Invalid number -> null output
assertNull(OSMChargingStation.parseOutputPower("22.0.1 kW"))
// Valid output power values
assertEquals(22.0, OSMChargingStation.parseOutputPower("22 kW"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22 kVA"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22. kW"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22.0 kW"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22,0 kW"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22kW"))
assertEquals(22.0, OSMChargingStation.parseOutputPower("22 kW"))
}
}