mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-02-25 19:07:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

improve heuristics in Chargeprice code

Browse Source 
fixes #238
This commit is contained in:
johan12345
2022-10-05 21:28:51 +02:00
parent eebb060f1a
commit d52ec0c63f
5 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt
View File

@@ -201,6 +201,14 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
try {
val car = determineVehicle(manufacturer, modelName)
val cpStation = ChargepriceStation.fromEvmap(charger, car.compatibleEvmapConnectors)
if (cpStation.chargePoints.isEmpty()) {
errorMessage =
carContext.getString(R.string.chargeprice_no_compatible_connectors)
invalidate()
return@launch
}
val result = api.getChargePrices(
ChargepriceRequest(
dataAdapter = dataAdapter,

25
app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
View File

@@ -104,24 +104,23 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
navigateToCharger(charger)
}
.build())
charger.chargepriceData?.country?.let { country ->
if (ChargepriceApi.isCountrySupported(country, charger.dataSource)) {
addAction(Action.Builder()
.setIcon(
CarIcon.Builder(
IconCompat.createWithResource(
carContext,
R.drawable.ic_chargeprice
)
).build()
)
.setTitle(carContext.getString(R.string.auto_prices))
if (ChargepriceApi.isChargerSupported(charger)) {
addAction(
Action.Builder()
.setIcon(
CarIcon.Builder(
IconCompat.createWithResource(
carContext,
R.drawable.ic_chargeprice
)
).build()
)
.setTitle(carContext.getString(R.string.auto_prices))
.setOnClickListener {
screenManager.push(ChargepriceScreen(carContext, charger))
}
.build())
}
}
} ?: setLoading(true)
}.build()
).apply {

51
app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceApi.kt
View File

@@ -112,18 +112,47 @@ interface ChargepriceApi {
else -> throw IllegalArgumentException()
}
/**
* Checks if a charger is supported by Chargeprice.
*
* This function just applies some heuristics on the charger's data without making API
* calls. If it returns true, that is not a guarantee that Chargeprice will have information
* on this charger. But if it is false, it is pretty unlikely that Chargeprice will have
* useful data, so we do not show the price comparison button in this case.
*/
@JvmStatic
fun isCountrySupported(country: String, dataSource: String): Boolean = when (dataSource) {
"goingelectric" -> country in listOf(
// list of countries according to Chargeprice.app, 2021/08/24
"Deutschland",
"Österreich",
"Schweiz",
"Frankreich",
"Belgien",
"Niederlande",
"Luxemburg",
"Dänemark",
fun isChargerSupported(charger: ChargeLocation): Boolean {
val dataSourceSupported = charger.dataSource in listOf("goingelectric", "openchargemap")
val countrySupported =
charger.chargepriceData?.country?.let { isCountrySupported(it, charger.dataSource) }
?: false
val networkSupported = charger.chargepriceData?.network?.let {
if (charger.dataSource == "openchargemap") {
it !in listOf(
"1", // unknown operator
"44", // private residence/individual
"45" // business owner at location
)
} else {
true
}
} ?: false
val powerAvailable = charger.chargepoints.all { it.hasKnownPower() }
return dataSourceSupported && countrySupported && networkSupported && powerAvailable
}
private fun isCountrySupported(country: String, dataSource: String): Boolean =
when (dataSource) {
"goingelectric" -> country in listOf(
// list of countries according to Chargeprice.app, 2021/08/24
"Deutschland",
"Österreich",
"Schweiz",
"Frankreich",
"Belgien",
"Niederlande",
"Luxemburg",
"Dänemark",
"Norwegen",
"Schweden",
"Slowenien",

6
app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
View File

@@ -243,6 +243,12 @@ class ChargepriceViewModel(
}
val cpStation = ChargepriceStation.fromEvmap(charger, compatibleConnectors)
if (cpStation.chargePoints.isEmpty()) {
// no compatible connectors
chargePrices.value = Resource.success(emptyList())
chargePriceMeta.value = Resource.success(ChargepriceMeta(emptyList()))
return
}
loadPricesJob?.cancel()
loadPricesJob = viewModelScope.launch {

2
app/src/main/res/layout/detail_view.xml
View File

@@ -321,7 +321,7 @@
android:layout_marginTop="8dp"
android:text="@string/go_to_chargeprice"
android:transitionName="@string/shared_element_chargeprice"
app:goneUnless="@{charger.data != null && charger.data.chargepriceData != null && charger.data.chargepriceData.country != null && ChargepriceApi.isCountrySupported(charger.data.chargepriceData.country, charger.data.dataSource)}"
app:goneUnless="@{charger.data != null && ChargepriceApi.isChargerSupported(charger.data)}"
app:icon="@drawable/ic_chargeprice"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="@+id/guideline"