diff --git a/app/src/main/java/net/vonforst/evmap/api/Utils.kt b/app/src/main/java/net/vonforst/evmap/api/Utils.kt
index 168b02723..0e1ae6fb1 100644
--- a/app/src/main/java/net/vonforst/evmap/api/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/Utils.kt
@@ -48,7 +48,8 @@ private val plugNames = mapOf(
Chargepoint.TYPE_2_UNKNOWN to R.string.plug_type_2,
Chargepoint.TYPE_2_PLUG to R.string.plug_type_2,
Chargepoint.TYPE_2_SOCKET to R.string.plug_type_2,
- Chargepoint.TYPE_3 to R.string.plug_type_3,
+ Chargepoint.TYPE_3A to R.string.plug_type_3a,
+ Chargepoint.TYPE_3C to R.string.plug_type_3c,
Chargepoint.CCS_UNKNOWN to R.string.plug_ccs,
Chargepoint.CCS_TYPE_1 to R.string.plug_ccs,
Chargepoint.CCS_TYPE_2 to R.string.plug_ccs,
diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
index 61e55cab0..58c3bf9b1 100644
--- a/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
@@ -4,7 +4,6 @@ import com.squareup.moshi.FromJson
import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
import com.squareup.moshi.ToJson
-import net.vonforst.evmap.api.availability.tesla.LocalTimeAdapter
import net.vonforst.evmap.model.ChargeLocation
import net.vonforst.evmap.model.Chargepoint
import net.vonforst.evmap.utils.distanceBetween
@@ -15,7 +14,6 @@ import retrofit2.http.GET
import retrofit2.http.Path
import retrofit2.http.Query
import java.time.Instant
-import java.time.LocalTime
private const val coordRange = 0.005 // range of latitude and longitude for loading the map
private const val maxDistance = 60 // max distance between reported positions in meters
@@ -202,7 +200,8 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
val id = index.toLong()
val power = connector.maxPowerInKw ?: 0.0
val type = when (connector.plugTypeName) {
- "Typ 3A" -> Chargepoint.TYPE_3
+ "Typ 3A" -> Chargepoint.TYPE_3A
+ "Typ 3C \"Scame\"" -> Chargepoint.TYPE_3C
"Typ 2" -> Chargepoint.TYPE_2_UNKNOWN
"Typ 1" -> Chargepoint.TYPE_1
"Steckdose(D)" -> Chargepoint.SCHUKO
diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
index b31c71046..33731a381 100644
--- a/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
@@ -1,6 +1,5 @@
package net.vonforst.evmap.api.availability
-import androidx.car.app.model.DateTimeWithZone
import com.squareup.moshi.FromJson
import com.squareup.moshi.JsonClass
import com.squareup.moshi.Moshi
@@ -13,12 +12,8 @@ import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory
import retrofit2.http.GET
import retrofit2.http.Path
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneOffset
import java.time.ZonedDateTime
-import java.time.format.DateTimeParseException
-import java.util.*
+import java.util.Locale
private const val coordRange = 0.005 // range of latitude and longitude for loading the map
private const val maxDistance = 60 // max distance between reported positions in meters
@@ -180,7 +175,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
val id = connector.uid
val power = connector.electricalProperties.getPower()
val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
- "type3" -> Chargepoint.TYPE_3
+ "type3" -> Chargepoint.TYPE_3C
"type2" -> Chargepoint.TYPE_2_UNKNOWN
"type1" -> Chargepoint.TYPE_1
"domestic" -> Chargepoint.SCHUKO
diff --git a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
index 572f62ecb..adc2c8539 100644
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
@@ -208,7 +208,7 @@ data class GEChargepoint(val type: String, val power: Double, val count: Int) {
return when (type) {
Chargepoint.TYPE_1 -> "Typ1"
Chargepoint.TYPE_2_UNKNOWN -> "Typ2"
- Chargepoint.TYPE_3 -> "Typ3"
+ Chargepoint.TYPE_3C -> "Typ3"
Chargepoint.CCS_UNKNOWN -> "CCS"
Chargepoint.CCS_TYPE_2 -> "Typ2"
Chargepoint.SCHUKO -> "Schuko"
@@ -225,7 +225,7 @@ data class GEChargepoint(val type: String, val power: Double, val count: Int) {
return when (type) {
"Typ1" -> Chargepoint.TYPE_1
"Typ2" -> Chargepoint.TYPE_2_UNKNOWN
- "Typ3" -> Chargepoint.TYPE_3
+ "Typ3" -> Chargepoint.TYPE_3C
"Tesla Supercharger CCS" -> Chargepoint.CCS_UNKNOWN
"CCS" -> Chargepoint.CCS_UNKNOWN
"Schuko" -> Chargepoint.SCHUKO
diff --git a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
index 31bc927a3..983ca73c6 100644
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
@@ -180,8 +180,8 @@ data class OCMConnection(
25L -> Chargepoint.TYPE_2_SOCKET
1036L -> Chargepoint.TYPE_2_PLUG
1L -> Chargepoint.TYPE_1
- 36L -> Chargepoint.TYPE_3
- 26L -> Chargepoint.TYPE_3
+ 36L -> Chargepoint.TYPE_3A
+ 26L -> Chargepoint.TYPE_3C
else -> title ?: ""
}
}
diff --git a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
index 03ee2c174..b54ce523d 100644
--- a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
@@ -434,7 +434,8 @@ data class Chargepoint(
const val TYPE_2_UNKNOWN = "Type 2 (either plug or socket)"
const val TYPE_2_SOCKET = "Type 2 socket"
const val TYPE_2_PLUG = "Type 2 plug"
- const val TYPE_3 = "Type 3"
+ const val TYPE_3A = "Type 3A"
+ const val TYPE_3C = "Type 3C"
const val CCS_TYPE_2 = "CCS Type 2"
const val CCS_TYPE_1 = "CCS Type 1"
const val CCS_UNKNOWN = "CCS (either Type 1 or Type 2)"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8629b44ef..cf649e66f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -303,7 +303,8 @@
Síť
zatím není implementováno
Navigační tlačítko otevře aplikaci map s umístěním nabíječky
- Typ 3A
+ Typ 3C
+ Typ 3A
Terén
Typ mapy
Nepodařilo se zjistit polohu. Zkontrolujte prosím nastavení systému
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4a3f92b2c..17b5d576b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -59,7 +59,8 @@
Anschlüsse
Typ 1
Typ 2
- Typ 3A
+ Typ 3C
+ Typ 3A
CCS
Schuko
CHAdeMO
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c748dcda1..5b77651ba 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -145,7 +145,8 @@
Licences
Source du statut en temps réel (bêta) : %s
Type 2
- Type 3A
+ Type 3C
+ Type 3A
CEE Rouge
tous
Rapport d\'anomalie (dernière mise à jour : %s)
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 5fe7aa3e8..0daed701d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -97,7 +97,8 @@
Schuko
Tesla Supercharger
Type 2
- Type 3A
+ Type 3C
+ Type 3A
alle
ingen
færre …
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 96017240e..dd8fb344c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -62,7 +62,8 @@
Alleen laadpunten met gratis parking
Minimaal aantal connecteren
Connectoren
- Type 3A
+ Type 3C
+ Type 3A
Schuko
CHAdeMO
CEE Red
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b7316cbfa..77304e707 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -256,7 +256,8 @@
Conectores
Tipo 1
Tipo 2
- Tipo 3A
+ Tipo 3C
+ Tipo 3A
CCS
Schuko
CHAdeMO
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4ca908214..de26b1da6 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -58,7 +58,8 @@
Conectori
Type 1
Type 2
- Type 3A
+ Type 3C
+ Type 3A
CCS
Schuko
CHAdeMO
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c34c2549c..ea40374ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,8 @@
Connectors
Type 1
Type 2
- Type 3A
+ Type 3A
+ Type 3C
CCS
Schuko
CHAdeMO