Release 2.1.2

old Shell Recharge/NewMotion map doesn't exist anymore, the new one is limited to Shell's own chargers

Gemfile.lock

@@ -2,8 +2,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
     aws-partitions (1.1196.0)
@@ -41,11 +41,32 @@ GEM
     dotenv (2.7.6)
     emoji_regex (3.0.0)
     excon (0.76.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    faraday (1.10.5)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.0)
@@ -131,7 +152,7 @@ GEM
     naturally (2.2.0)
     os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.6)
+    public_suffix (7.0.5)
     rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -139,6 +160,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
@@ -161,7 +183,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.18.0)
@@ -176,7 +197,7 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  x64-mingw32
+  x64-mingw-ucrt
   x86_64-linux
 
 DEPENDENCIES

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 Johan von Forstner and contributors
+Copyright (c) 2020-2026 Johan von Forstner and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -88,6 +88,3 @@ information on the [Donate page](https://ev-map.app/donate/) on the EVMap websit
 <a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="38"/></a><br>
 Since May 2024, **JawgMaps** provide their OpenStreetMap vector map tiles service to EVMap for
 free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
-
-<a href="https://www.jetbrains.com/community/opensource/"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg" alt="JetBrains logo" height="38"/></a><br>
-As part of its support program for Open-source projects, **JetBrains** supports the development of EVMap since December 2023 with a license of their software suite.

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
         minSdk = 23
         targetSdk = 36
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 270
-        versionName = "2.1.0"
+        versionCode = 274
+        versionName = "2.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -320,7 +320,7 @@ dependencies {
     implementation("com.squareup.moshi:moshi-adapters:1.15.2")
     implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
     implementation("io.coil-kt:coil:2.7.0")
-    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
+    implementation("com.github.ev-map:StfalconImageViewer:c6ba219517")
     implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
     implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
     implementation("com.airbnb.android:lottie:6.6.10")
@@ -369,7 +369,11 @@ dependencies {
     implementation("androidx.room:room-runtime:$roomVersion")
     ksp("androidx.room:room-compiler:$roomVersion")
     implementation("androidx.room:room-ktx:$roomVersion")
-    implementation("com.github.anboralabs:spatia-room:1.0.1")
+    implementation("com.github.anboralabs:spatia-room:1.0.1") {
+        exclude("com.github.dalgarins", "android-spatialite")
+    }
+    // forked version with upgraded libxml 2.15.2 & APP_STL := c++_static
+    implementation("io.github.ev-map:android-spatialite:2.3.0-alpha")
 
     // billing library
     val billingVersion = "7.0.0"

app/src/main/java/net/vonforst/evmap/MapsActivity.kt

@@ -9,12 +9,14 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
+import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
@@ -254,11 +256,9 @@ class MapsActivity : AppCompatActivity(),
     fun showLocation(charger: ChargeLocation, rootView: View) {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse(
-            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
-                Uri.encode(charger.name)
-            })"
-        )
+        intent.data = "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
+            Uri.encode(charger.name)
+        })".toUri()
 
         val resolveInfo =
             packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
@@ -277,11 +277,19 @@ class MapsActivity : AppCompatActivity(),
         try {
             startActivity(intent)
         } catch (e: ActivityNotFoundException) {
-            Snackbar.make(
-                rootView,
-                R.string.no_maps_app_found,
-                Snackbar.LENGTH_SHORT
-            ).show()
+            try {
+                // if the intent is not working with an explicit package for some reason,
+                // as a last resort, try again without package
+                intent.setPackage(null)
+                startActivity(intent)
+            } catch (e: ActivityNotFoundException) {
+                Snackbar.make(
+                    rootView,
+                    R.string.no_maps_app_found,
+                    Snackbar.LENGTH_SHORT
+                ).show()
+                Log.e("MapsActivity", "no navigation app found")
+            }
         }
     }
 
@@ -294,12 +302,12 @@ class MapsActivity : AppCompatActivity(),
             )
             .build()
 
-        val uri = Uri.parse(url)
+        val uri = url.toUri()
         val viewIntent = Intent(Intent.ACTION_VIEW, uri)
         if (preferBrowser) {
             // EVMap may be set as default app for this link, but we want to open it in a browser
             // try to find default web browser
-            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
+            val browserIntent = Intent(Intent.ACTION_VIEW, "http://".toUri())
             val resolveInfo =
                 packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
             val pkg = resolveInfo?.activityInfo?.packageName.takeIf { it != "android" }
@@ -334,20 +342,37 @@ class MapsActivity : AppCompatActivity(),
         try {
             intent.launchUrl(this, uri)
         } catch (e: ActivityNotFoundException) {
-            Snackbar.make(
-                rootView,
-                R.string.no_browser_app_found,
-                Snackbar.LENGTH_SHORT
-            ).show()
+            try {
+                // if the intent is not working with an explicit package for some reason,
+                // as a last resort, try again without package
+                intent.intent.setPackage(null)
+                intent.launchUrl(this, uri)
+            } catch (e: ActivityNotFoundException) {
+                Snackbar.make(
+                    rootView,
+                    R.string.no_browser_app_found,
+                    Snackbar.LENGTH_SHORT
+                ).show()
+                Log.e("MapsActivity", "no web browser found")
+            }
         }
     }
 
-    fun shareUrl(url: String) {
+    fun shareUrl(url: String, rootView: View) {
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, url)
         }
-        startActivity(intent)
+        try {
+            startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Snackbar.make(
+                rootView,
+                R.string.no_share_app_found,
+                Snackbar.LENGTH_SHORT
+            ).show()
+            Log.e("MapsActivity", "no sharing app found")
+        }
     }
 
     override fun onPreferenceStartFragment(

app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt

@@ -176,8 +176,7 @@ class AvailabilityRepository(context: Context) {
         teslaOwnerAvailabilityDetector,
         TeslaGuestAvailabilityDetector(okhttp),
         NobilAvailabilityDetector(okhttp, context),
-        EnBwAvailabilityDetector(okhttp),
-        NewMotionAvailabilityDetector(okhttp)
+        EnBwAvailabilityDetector(okhttp)
     )
 
     suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {

app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt

@@ -136,17 +136,8 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         var markers =
             api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
 
-        markers = markers.flatMap {
-            if (it.grouped) {
-                api.getMarkers(
-                    it.viewPort.lowerLeftLon,
-                    it.viewPort.upperRightLon,
-                    it.viewPort.lowerLeftLat,
-                    it.viewPort.upperRightLat
-                )
-            } else {
-                listOf(it)
-            }
+        repeat(3) {
+            markers = ungroupMarkers(markers)
         }
         if (markers.any { it.grouped }) throw AvailabilityDetectorException("markers still grouped")
 
@@ -241,6 +232,20 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         )
     }
 
+    private suspend fun ungroupMarkers(markers: List<EnBwApi.EnBwLocation>): List<EnBwApi.EnBwLocation> =
+        markers.flatMap {
+            if (it.grouped) {
+                api.getMarkers(
+                    it.viewPort.lowerLeftLon,
+                    it.viewPort.upperRightLon,
+                    it.viewPort.lowerLeftLat,
+                    it.viewPort.upperRightLat
+                )
+            } else {
+                listOf(it)
+            }
+        }
+
     override fun isChargerSupported(charger: ChargeLocation): Boolean {
         val country = charger.chargepriceData?.country ?: charger.address?.country
 

app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt

@@ -1,231 +0,0 @@
-package net.vonforst.evmap.api.availability
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.utils.distanceBetween
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.GET
-import retrofit2.http.Path
-import java.time.ZonedDateTime
-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
-
-interface NewMotionApi {
-    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}/{zoom}")
-    suspend fun getMarkers(
-        @Path("lngMin") lngMin: Double,
-        @Path("lngMax") lngMax: Double,
-        @Path("latMin") latMin: Double,
-        @Path("latMax") latMax: Double,
-        @Path("zoom") zoom: Int = 22
-    ): List<NMMarker>
-
-    @GET("locations/{id}")
-    suspend fun getLocation(@Path("id") id: Long): NMLocation
-
-    @JsonClass(generateAdapter = true)
-    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long, val evseCount: Int)
-
-    @JsonClass(generateAdapter = true)
-    data class NMCoordinates(val latitude: Double, val longitude: Double)
-
-    @JsonClass(generateAdapter = true)
-    data class NMLocation(
-        val uid: Long,
-        val coordinates: NMCoordinates,
-        val operatorName: String,
-        val evses: List<NMEvse>
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMEvse(
-        val evseId: String?,
-        val status: String,
-        val connectors: List<NMConnector>,
-        val updated: ZonedDateTime?
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMConnector(
-        val uid: Long,
-        val connectorType: String,
-        val electricalProperties: NMElectricalProperties
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMElectricalProperties(val powerType: String, val voltage: Int, val amperage: Int, val maxElectricPower: Double?) {
-        fun getPower(): Double {
-            maxElectricPower?.let { return it }
-            val phases = when (powerType) {
-                "AC1Phase" -> 1
-                "AC3Phase" -> 3
-                else -> 1
-            }
-            val volt = when (voltage) {
-                277 -> 230
-                else -> voltage
-            }
-            val power = volt * amperage * phases
-            return when (power) {
-                3680 -> 3.7
-                11040 -> 11.0
-                22080 -> 22.0
-                43470 -> 43.0
-                else -> power / 1000.0
-            }
-        }
-    }
-
-    companion object {
-        fun create(client: OkHttpClient, baseUrl: String? = null): NewMotionApi {
-            val retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl ?: "https://ui-map.shellrecharge.com/api/map/v2/")
-                .addConverterFactory(
-                    MoshiConverterFactory.create(
-                        Moshi.Builder().add(ZonedDateTimeAdapter()).build()
-                    )
-                )
-                .client(client)
-                .build()
-            return retrofit.create(NewMotionApi::class.java)
-        }
-    }
-}
-
-internal class ZonedDateTimeAdapter {
-    @FromJson
-    fun fromJson(value: String): ZonedDateTime? = ZonedDateTime.parse(value)
-
-    @ToJson
-    fun toJson(value: ZonedDateTime): String = value.toString()
-}
-
-data class NmStatus(
-    val conn: NewMotionApi.NMConnector,
-    val status: String,
-    val evseId: String?,
-    val updated: ZonedDateTime?
-)
-
-class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
-    BaseAvailabilityDetector(client) {
-    val api = NewMotionApi.create(client, baseUrl)
-
-    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
-        val lat = location.coordinates.lat
-        val lng = location.coordinates.lng
-
-        // find nearest station to this position
-        var markers =
-            api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
-        val nearest = markers.minByOrNull { marker ->
-            distanceBetween(marker.coordinates.latitude, marker.coordinates.longitude, lat, lng)
-        } ?: throw AvailabilityDetectorException("no candidates found.")
-
-        if (distanceBetween(
-                nearest.coordinates.latitude,
-                nearest.coordinates.longitude,
-                lat,
-                lng
-            ) > radius
-        ) {
-            throw AvailabilityDetectorException("no candidates found")
-        }
-
-        markers = if (nearest.evseCount < location.totalChargepoints) {
-            // combine related stations
-            markers.filter { marker ->
-                distanceBetween(
-                    marker.coordinates.latitude,
-                    marker.coordinates.longitude,
-                    nearest.coordinates.latitude,
-                    nearest.coordinates.longitude
-                ) < maxDistance
-            }
-        } else {
-            listOf(nearest)
-        }
-
-        // load details
-        var details = markers.map {
-            api.getLocation(it.locationUid)
-        }
-        // only include stations from same operator
-        details = details.filter {
-            it.operatorName == details[0].operatorName
-        }
-        val connectorStatus = details.flatMap { it.evses }.flatMap { evse ->
-            evse.connectors.map { connector ->
-                NmStatus(connector, evse.status, evse.evseId, evse.updated)
-            }
-        }
-
-        val nmConnectors = mutableMapOf<Long, Pair<Double, String>>()
-        val nmStatus = mutableMapOf<Long, ChargepointStatus>()
-        val nmEvseId = mutableMapOf<Long, String>()
-        val nmUpdated = mutableMapOf<Long, ZonedDateTime>()
-        connectorStatus.forEach { (connector, statusStr, evseId, updated) ->
-            val id = connector.uid
-            val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
-                "type3" -> Chargepoint.TYPE_3C
-                "type2" -> Chargepoint.TYPE_2_UNKNOWN
-                "type1" -> Chargepoint.TYPE_1
-                "domestic" -> Chargepoint.SCHUKO
-                "type1combo" -> Chargepoint.CCS_TYPE_1  // US CCS, aka type1_combo
-                "type2combo" -> Chargepoint.CCS_TYPE_2  // EU CCS, aka type2_combo
-                "tepcochademo" -> Chargepoint.CHADEMO
-                "unspecified" -> "unknown"
-                "unknown" -> "unknown"
-                "saej1772" -> "unknown"
-                else -> "unknown"
-            }
-            val status = when (statusStr) {
-                "Unavailable" -> ChargepointStatus.FAULTED
-                "Available" -> ChargepointStatus.AVAILABLE
-                "Occupied" -> ChargepointStatus.CHARGING
-                "Unspecified" -> ChargepointStatus.UNKNOWN
-                else -> ChargepointStatus.UNKNOWN
-            }
-            nmConnectors.put(id, power to type)
-            nmStatus.put(id, status)
-            evseId?.let { nmEvseId[id] = it }
-            updated?.let { nmUpdated[id] = it }
-        }
-
-        val match = matchChargepoints(nmConnectors, location.chargepointsMerged)
-        val chargepointStatus = match.mapValues { entry ->
-            entry.value.map { nmStatus[it]!! }
-        }
-        val evseIds = if (nmEvseId.size == nmStatus.size) match.mapValues { entry ->
-            entry.value.map { nmEvseId[it]!! }
-        } else null
-        val updated = match.mapValues { entry -> entry.value.map { nmUpdated[it]?.toInstant() } }
-        return ChargeLocationStatus(
-            chargepointStatus,
-            "NewMotion",
-            evseIds,
-            lastChange = updated
-        )
-    }
-
-    override fun isChargerSupported(charger: ChargeLocation): Boolean {
-        // NewMotion is our fallback
-        return when (charger.dataSource) {
-            "goingelectric" -> charger.network != "Tesla Supercharger"
-            "nobil" -> charger.network != "Tesla"
-            "openchargemap" -> charger.chargepriceData?.network !in listOf("23", "3534")
-            "openstreetmap" -> charger.operator !in listOf("Tesla, Inc.", "Tesla")
-            else -> false
-        }
-    }
-
-}

app/src/main/java/net/vonforst/evmap/api/nobil/NobilModel.kt

@@ -274,6 +274,14 @@ data class NobilChargerStation(
                 "43" -> 600.0 // 600 kW DC
                 "44" -> 700.0 // 700 kW DC
                 "45" -> 800.0 // 800 kW DC
+                "46" -> 320.0
+                "47" -> 900.0
+                "48" -> 1000.0
+                "49" -> 1100.0
+                "50" -> 1200.0
+                "51" -> 1300.0
+                "52" -> 1400.0
+                "53" -> 1500.0
                 else -> null
             }
 

app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt

@@ -15,8 +15,10 @@ import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
 import androidx.car.app.model.CarText
 import androidx.car.app.model.ForegroundCarColorSpan
+import androidx.car.app.model.Header
 import androidx.car.app.model.ItemList
 import androidx.car.app.model.ListTemplate
+import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.Pane
 import androidx.car.app.model.PaneTemplate
 import androidx.car.app.model.ParkedOnlyOnClickListener
@@ -241,20 +243,23 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
 
                             )
                             setOnClickListener {
-                                lifecycleScope.launch {
-                                    db.filterProfileDao().delete(it)
-                                    if (prefs.filterStatus == it.id) {
-                                        prefs.filterStatus = FILTERS_DISABLED
+                                val confirmScreen = ConfirmDeleteScreen(carContext, it) {
+                                    lifecycleScope.launch {
+                                        db.filterProfileDao().delete(it)
+                                        if (prefs.filterStatus == it.id) {
+                                            prefs.filterStatus = FILTERS_DISABLED
+                                        }
+                                        CarToast.makeText(
+                                            carContext,
+                                            carContext.getString(
+                                                R.string.deleted_item,
+                                                it.name
+                                            ),
+                                            CarToast.LENGTH_SHORT
+                                        ).show()
                                     }
-                                    CarToast.makeText(
-                                        carContext,
-                                        carContext.getString(
-                                            R.string.deleted_item,
-                                            it.name
-                                        ),
-                                        CarToast.LENGTH_SHORT
-                                    ).show()
                                 }
+                                screenManager.push(confirmScreen)
                             }
                         }.build())
                     }
@@ -299,6 +304,31 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     }
 }
 
+class ConfirmDeleteScreen(ctx: CarContext, val profile: FilterProfile, val deleteListener: () -> Unit): Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        val message = carContext.getString(R.string.auto_confirm_delete_profile, profile.name)
+        return MessageTemplate.Builder(message)
+            .setHeader(Header.Builder()
+                .setTitle(carContext.getString(R.string.delete))
+                .setStartHeaderAction(Action.BACK)
+                .build())
+            .addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.delete))
+                .setBackgroundColor(CarColor.PRIMARY)
+                .setFlags(Action.FLAG_PRIMARY)
+                .setOnClickListener {
+                    deleteListener()
+                    screenManager.pop()
+                }
+                .build())
+            .addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.cancel))
+                .setOnClickListener { screenManager.pop() }
+                .build())
+            .build()
+    }
+}
+
 @androidx.car.app.annotations.ExperimentalCarApi
 class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
     private val vm = FilterViewModel(carContext.applicationContext as Application)
@@ -360,18 +390,21 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
 
                         )
                         setOnClickListener {
-                            lifecycleScope.launch {
-                                vm.deleteCurrentProfile()
-                                CarToast.makeText(
-                                    carContext,
-                                    carContext.getString(
-                                        R.string.deleted_item,
-                                        currentProfile.name
-                                    ),
-                                    CarToast.LENGTH_SHORT
-                                ).show()
-                                screenManager.pop()
+                            val confirmScreen = ConfirmDeleteScreen(carContext, currentProfile) {
+                                lifecycleScope.launch {
+                                    vm.deleteCurrentProfile()
+                                    CarToast.makeText(
+                                        carContext,
+                                        carContext.getString(
+                                            R.string.deleted_item,
+                                            currentProfile.name
+                                        ),
+                                        CarToast.LENGTH_SHORT
+                                    ).show()
+                                    screenManager.pop()
+                                }
                             }
+                            screenManager.push(confirmScreen)
                         }
                     }.build())
                 }

app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt

@@ -513,7 +513,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                 R.id.menu_share -> {
                     val charger = vm.charger.value?.data
                     if (charger != null && charger.url != null) {
-                        (activity as? MapsActivity)?.shareUrl(charger.url)
+                        (activity as? MapsActivity)?.shareUrl(charger.url, binding.root)
                     }
                     true
                 }

app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt

@@ -101,7 +101,7 @@ abstract class ChargeLocationsDao {
     ): List<ChargeLocation>
 
     @SkipQueryVerification
-    @Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND PtDistWithin(coordinates, MakePoint(:lng, :lat, 4326), :radius) AND timeRetrieved > :after AND ROWID IN (SELECT ROWID FROM SpatialIndex WHERE f_table_name = 'ChargeLocation' AND f_geometry_column = 'coordinates' AND search_frame = BuildCircleMbr(:lng, :lat, :radius)) ORDER BY Distance(coordinates, MakePoint(:lng, :lat, 4326))")
+    @Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND PtDistWithin(coordinates, MakePoint(:lng, :lat, 4326), :radius) AND timeRetrieved > :after AND ROWID IN (SELECT ROWID FROM SpatialIndex WHERE f_table_name = 'ChargeLocation' AND f_geometry_column = 'coordinates' AND search_frame = BuildCircleMbr(:lng, :lat, :radius)) ORDER BY Distance(coordinates, MakePoint(:lng, :lat, 4326), 0)")
     abstract suspend fun getChargeLocationsRadius(
         lat: Double,
         lng: Double,
@@ -583,7 +583,7 @@ class ChargeLocationsRepository(
         val region =
             radiusSpatialIndexQuery(location, radius)
         val order =
-            "ORDER BY Distance(coordinates, MakePoint(${location.longitude}, ${location.latitude}, 4326))"
+            "ORDER BY Distance(coordinates, MakePoint(${location.longitude}, ${location.latitude}, 4326), 0)"
         return queryWithFilters(api, filters, region, order)
     }
 

app/src/main/res/values-cs/strings.xml

@@ -393,4 +393,6 @@
     <string name="chargeprice_removal_2025_dialog_title">Omlouváme se!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Náklady na přístup k údajům ze služby Chargeprice prudce vzrostly a nelze je pokrýt z darů, takže EVMap již nemůže tyto údaje přímo zobrazovat. Prozatím se otevře webová stránka Chargeprice. Alternativní řešení se vyvíjí, ale bude to nějakou dobu trvat a zpočátku bude mít omezené funkce. Děkujeme za trpělivost a podporu!</string>
     <string name="auto_use_new_map_screen">Nová obrazovka mapy (beta)</string>
+    <string name="auto_confirm_delete_profile">Odstranit profil filtru „%s“?</string>
+    <string name="no_share_app_found">Nepodařilo se najít aplikaci ke sdílení</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -6,6 +6,7 @@
     <string name="no_maps_app_found">Bitte installiere eine Navigations-App</string>
     <string name="no_browser_app_found">Bitte installiere einen Webbrowser</string>
     <string name="no_email_app_found">Bitte installiere eine E-Mail-App</string>
+    <string name="no_share_app_found">Keine App zum Teilen gefunden</string>
     <string name="address">Adresse</string>
     <string name="operator">Betreiber</string>
     <string name="network">Verbund</string>
@@ -389,4 +390,5 @@
     <string name="chargeprice_removal_2025_dialog_title">Sorry!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Die Kosten für den Zugriff auf Chargeprice-Daten sind stark gestiegen und können nicht mehr durch Spenden gedeckt werden. Daher kann EVMap diese Daten nicht mehr direkt anzeigen. Hier öffnet sich nun die Chargeprice-Website. Eine alternative Lösung ist in Arbeit, wird aber Zeit brauchen und anfangs nur eingeschränkt funktionieren. Danke für eure Geduld und Unterstützung!</string>
     <string name="auto_use_new_map_screen">Neue Kartendarstellung (beta)</string>
+    <string name="auto_confirm_delete_profile">Filterprofil „%s“ löschen?</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -293,7 +293,7 @@
     <string name="reload">Laadi uuesti</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Mitu selles rakenduses valitud mudelit vastavad selle sõiduki mudelile (%1$s %2$s).</string>
     <string name="navigate">Näita teed</string>
-    <string name="donation_dialog_detail">EVMap põhineb avatud lähtekoodil on tasuta ja vabaks kasutamiseks. Me hea meelega näeme ka huviliste kaastööd GitHubis. Andmekasutusega seotud kulude kastmiseks palun kaalu võimalust arendaja rahaliseks toetamiseks sinu valitud summaga.</string>
+    <string name="donation_dialog_detail">EVMap põhineb avatud lähtekoodil on tasuta ja vabaks kasutamiseks. Me hea meelega näeme ka huviliste kaastööd GitHubis. Andmekasutusega seotud kulude katmiseks palun kaalu võimalust arendaja rahaliseks toetamiseks sinu valitud summaga.</string>
     <string name="chargeprice_donation_dialog_title">Sa tõesti otsid parimaid pakkumisi!</string>
     <string name="chargeprice_donation_dialog_detail">Kasutad hoolega hinnavõrdluse funktsionaalsust. Sellega andmevahetusega seotud kulude katmiseks palun kaalu EVMapi rahalist toetamist.</string>
     <string name="deleted_item">Kustutasime „%s“</string>
@@ -389,4 +389,6 @@
     <string name="chargeprice_removal_2025_dialog_title">Vabandust!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Chargeprice\'i andmete maksumus on 2025. aastast järsult kasvanud ja rahalistest toetustest meile pole võimalik seda enam rahastada. Seega EVMap ei saa neid andmeid enam otse näidata. Asendusena on esialgu kasutusel link Chargeprice\'i veebisaiti. Oleme arendamas ka alternatiivset lahendust, aga selleks kulub aega ning ta võib kasutusele tulla piiratud funktsionaalsuses. Suur tänu teie toe eest!</string>
     <string name="auto_use_new_map_screen">Uus kaardivaade (beetaversioon)</string>
+    <string name="auto_confirm_delete_profile">Kas soovid kustutada filtriprofiili „%s“?</string>
+    <string name="no_share_app_found">Ei leidunud rakendust, millega sisu jagada</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -50,7 +50,7 @@
     <string name="fav_remove">Ta bort från favoriter</string>
     <string name="pref_navigate_use_maps">Omedelbar navigering</string>
     <string name="pref_navigate_use_maps_on">Navigeraknappen startar vägbeskrivning i Google Maps</string>
-    <string name="pref_navigate_use_maps_off">Navigeraknappen öppnar kartappen med laddstationen</string>
+    <string name="pref_navigate_use_maps_off">Navigeraknappen öppnar laddarens position i kartappen</string>
     <string name="coordinates">Koordinater</string>
     <string name="share">Dela</string>
     <string name="filter_free">Endast gratis laddare</string>
@@ -82,7 +82,7 @@
     <string name="map_type_satellite">Satellit</string>
     <string name="map_type_terrain">Terräng</string>
     <string name="map_type">Karttyp</string>
-    <string name="map_details">Kartdetailjer</string>
+    <string name="map_details">Kartdetaljer</string>
     <string name="map_traffic">Trafik</string>
     <string name="faq">Vanliga frågor</string>
     <string name="menu_filters_active">Aktiva filter</string>
@@ -160,14 +160,14 @@
     <string name="filterprofile_name_not_unique">Det finns redan en filterprofil med det namnet</string>
     <string name="filterprofiles_empty_state">Du har inga sparade filterprofiler</string>
     <string name="welcome_to_evmap">Välkommen till EVMap</string>
-    <string name="welcome_1">Hitta laddare för elfordon i din närhet</string>
-    <string name="welcome_2">Varje laddares färg motsvarar dess maximala laddeffekt</string>
-    <string name="welcome_2_detail">Det här visas också i “Om” → “Vanliga frågor”</string>
+    <string name="welcome_1">Hitta laddare till elfordon i närheten</string>
+    <string name="welcome_2">Varje laddares färg motsvarar dess maximala hastighet</string>
+    <string name="welcome_2_detail">Det här visas också i \"Om\" → \"Vanliga frågor\"</string>
     <string name="donation_dialog_title">Tack för att du använder EVMap</string>
-    <string name="donation_dialog_detail">EVMap är fri programvara. Kodbidrag via GitHub tas tacksamt emot. Överväg gärna att donera en valfri summa till utvecklaren för att hjälpa till att täcka driftskostnader.</string>
+    <string name="donation_dialog_detail">EVMap är fri programvara. Kodbidrag tas tacksamt emot via GitHub. Överväg gärna att donera en valfri summa till utvecklaren för att hjälpa till att täcka driftskostnader.</string>
     <string name="chargeprice_donation_dialog_title">Du är en ambitiös prisjämförare!</string>
     <string name="chargeprice_donation_dialog_detail">Du använder prisjämförelsefunktionen flitigt. Hjälp gärna till att täcka kostnaderna för denna funktion genom att stödja EVMap med en donation.</string>
-    <string name="deleted_item">Tog bort “%s”</string>
+    <string name="deleted_item">Tog bort \"%s\"</string>
     <string name="undo">Ångra</string>
     <string name="rename">Döp om</string>
     <string name="charging_barrierfree">Kan användas utan registrering</string>
@@ -225,7 +225,7 @@
         <item quantity="other">%d prisplaner valda</item>
     </plurals>
     <string name="unknown_operator">Okänd operatör</string>
-    <string name="data_sources_description">Vänligen välj en datakälla för laddstationer. Det kan ändras senare i inställningarna.</string>
+    <string name="data_sources_description">Vänligen välj en datakälla för laddstationer. Det kan ändras senare bland inställningarna.</string>
     <string name="data_source_goingelectric">GoingElectric.de</string>
     <string name="data_source_nobil">NOBIL</string>
     <string name="data_source_openstreetmap">OpenStreetMap</string>
@@ -242,7 +242,7 @@
     <string name="crash_report_comment_prompt">Du kan skriva en kommentar nedan:</string>
     <string name="powered_by_mapbox">tillhandahålls av Mapbox</string>
     <string name="pref_search_provider">Sökleverantör</string>
-    <string name="pref_search_provider_info"><![CDATA[Data för sökningar är dyr att hämta, särskilt från Google Maps. Överväg gärna att donera via “Om” → “Donera”.]]></string>
+    <string name="pref_search_provider_info"><![CDATA[Data för sökningar är dyr att hämta, särskilt från Google Maps. Överväg gärna att donera via "Om" → "Donera".]]></string>
     <string name="github_sponsors">GitHub Sponsors</string>
     <string name="donate_desc">Stöd EVMaps utveckling med en engångsdonation</string>
     <string name="github_sponsors_desc">Stöd EVMap via GitHub Sponsors</string>
@@ -252,7 +252,7 @@
     <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
     <string name="referral_link">https://ev-map.app/referrals/</string>
     <string name="required">obligatorisk</string>
-    <string name="edit_filter_profile">Ändra “%s”</string>
+    <string name="edit_filter_profile">Ändra \"%s\"</string>
     <string name="pref_search_delete_recent">Ta bort senaste sökresultaten</string>
     <string name="deleted_recent_search_results">Senaste sökresultaten har tagits bort</string>
     <string name="settings_data_sources">Datakällor</string>
@@ -349,7 +349,7 @@
     <string name="auto_heading">Riktning</string>
     <string name="auto_settings">Inställningar</string>
     <string name="welcome_android_auto">Android Auto-stöd</string>
-    <string name="welcome_android_auto_detail">Du kan också använda EVMap i Android Auto om bilen stöder det. Välj då bara EVMap i Android Auto-menyn.</string>
+    <string name="welcome_android_auto_detail">Du kan också använda EVMap i Android Auto om bilen stöder det. Sök upp och starta EVMap i Android Autos applista.</string>
     <string name="sounds_cool">Låter schysst</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap kunde inte avgöra ditt fordons modell.</string>
     <string name="auto_chargeprice_vehicle_unknown">Inga valda fordon i appen matchar detta fordon (%1$s %2$s).</string>
@@ -368,7 +368,7 @@
     <string name="referral_tesla">Tesla</string>
     <string name="generic_connection_error">Kunde inte hämta data</string>
     <string name="copied">Kopierat till urklipp</string>
-    <string name="downloading_chargers_percent">Laddar ner… %.0f%%</string>
+    <string name="downloading_chargers_percent">Hämtar… %.0f%%</string>
     <string name="status_available">Tillgänglig</string>
     <string name="status_occupied">Upptagen</string>
     <string name="status_charging">Laddar</string>
@@ -385,8 +385,10 @@
     <string name="accessibility_employees">Anställda</string>
     <string name="accessibility_by_appointment">Efter överenskommelse</string>
     <string name="accessibility_residents">Boende</string>
-    <string name="chargeprice_removal_2025_dialog_detail">Kostnaderna för Chargeprice-data har stigit kraftigt och täcks inte av längre av donationer. Därför kan inte EVMap längre visa denna data direkt i appen. Tillsvidare öppnar detta Chargeprices webbsida. En alternativ lösning är under utveckling, men kommer dröja något och kan introduceras med begränsad funktionalitet. Tack för ditt tålamod och stöd!</string>
+    <string name="chargeprice_removal_2025_dialog_detail">Kostnaderna för Chargeprice-data har stigit kraftigt och täcks inte längre av donationer. Därför kan inte EVMap fortsätta visa denna data direkt i appen. Tillsvidare öppnar detta Chargeprices webbsida. En alternativ lösning är under utveckling, men kommer dröja något och kan komma att introduceras med begränsad funktionalitet. Tack för ditt tålamod och stöd!</string>
     <string name="chargeprice_removal_2025_dialog_title">Ursäkta!</string>
     <string name="auto_use_new_map_screen">Ny kartvy (beta)</string>
     <string name="welcome_2_title">Full koll på hastigheten</string>
+    <string name="auto_confirm_delete_profile">Ta bort filterprofilen \"%s\"?</string>
+    <string name="no_share_app_found">Kunde inte hitta en app att dela med</string>
 </resources>

app/src/main/res/values/donottranslate.xml

@@ -29,7 +29,7 @@
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
-    <string name="copyright_summary">©2020–2024 Johan von Forstner and contributors</string>
+    <string name="copyright_summary">©2020–2026 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
     <string name="maplibre_attributionsDialogTitle">MapLibre Maps SDK for Android</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -6,6 +6,7 @@
     <string name="no_maps_app_found">Install a navigation app first</string>
     <string name="no_browser_app_found">Install a web browser first</string>
     <string name="no_email_app_found">Install an email app first</string>
+    <string name="no_share_app_found">Could not find an app to share with</string>
     <string name="address">Address</string>
     <string name="operator">Operator</string>
     <string name="network">Network</string>
@@ -389,4 +390,5 @@
     <string name="chargeprice_removal_2025_dialog_title">Sorry!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Costs for Chargeprice data access have risen sharply and can’t be covered by donations, so EVMap can no longer show this data directly. For now, this opens the Chargeprice website. An alternative solution is being developed, but it’ll take time and may start with limited features. Thanks for your patience and support!</string>
     <string name="auto_use_new_map_screen">New map screen (beta)</string>
+    <string name="auto_confirm_delete_profile">Delete filter profile “%s“?</string>
 </resources>

app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -1,79 +0,0 @@
-package net.vonforst.evmap.api.availability
-
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
-import net.vonforst.evmap.api.goingelectric.GoingElectricApi
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.okResponse
-import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.junit.Test
-import java.net.HttpURLConnection
-
-class NewMotionAvailabilityDetectorTest {
-    val api: GoingElectricApi
-    val webServer = MockWebServer()
-    val newMotion: NewMotionAvailabilityDetector
-
-    init {
-        webServer.start()
-
-        val apikey = ""
-        val baseurl = webServer.url("/ge/").toString()
-        api = GoingElectricApi.create(apikey, baseurl)
-        newMotion = NewMotionAvailabilityDetector(
-            OkHttpClient.Builder().build(),
-            webServer.url("/nm/").toString()
-        )
-
-        webServer.dispatcher = object : Dispatcher() {
-            val notFoundResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
-
-            override fun dispatch(request: RecordedRequest): MockResponse {
-                val segments = request.requestUrl!!.pathSegments
-                val urlHead = segments.subList(0, 2).joinToString("/")
-                when (urlHead) {
-                    "ge/chargepoints" -> {
-                        val id = request.requestUrl!!.queryParameter("ge_id")
-                        return okResponse("/chargers/$id.json")
-                    }
-                    "nm/markers" -> {
-                        val urlTail = segments.subList(2, segments.size).joinToString("/")
-                        val id = when (urlTail) {
-                            "9.56608/9.576080000000001/54.5066/54.516600000000004/22" -> 2105
-                            "9.539283999999999/9.549284/54.471699/54.481699000000006/22" -> 18284
-                            else -> -1
-                        }
-                        return okResponse("/newmotion/$id/markers.json")
-                    }
-                    "nm/locations" -> {
-                        val id = segments.last()
-                        return okResponse("/newmotion/$id.json")
-                    }
-                    else -> return notFoundResponse
-                }
-            }
-        }
-    }
-
-    private fun readResource(s: String) =
-        NewMotionAvailabilityDetectorTest::class.java.getResource(s)?.readText()
-
-    @ExperimentalCoroutinesApi
-    @Test
-    fun apiTest() {
-        for (chargepoint in listOf(2105L, 18284L)) {
-            val charger = runBlocking { api.getChargepointDetail(chargepoint).body()!! }
-                .chargelocations!![0].convert("", true) as ChargeLocation
-            println(charger)
-
-            runBlocking {
-                val result = newMotion.getAvailability(charger)
-                println(result)
-            }
-        }
-    }
-}

fastlane/metadata/android/de-DE/changelogs/272.txt

@@ -0,0 +1,8 @@
+Verbesserungen:
+- Verbesserungen an der Datenquelle Nobil
+- Android Auto: Versehentliches Löschen von Filterprofilen vermeiden
+
+Fehler behoben:
+- Anzeigefehler nach Schließen der Bildergalerie über Zurück-Button
+- Android Auto: Korrekte Sortierung nach Abstand
+- Abstürze behoben

fastlane/metadata/android/de-DE/changelogs/274.txt

@@ -0,0 +1,2 @@
+Verbesserungen:
+- Verbesserungen bei Echtzeitstatus

fastlane/metadata/android/en-US/changelogs/272.txt

@@ -0,0 +1,8 @@
+Improvements:
+- Improvements to Nobil data source
+- Android Auto: Avoid accidental deletion of filter profiles
+
+Bugfixes:
+- Display error after closing photo gallery using back button
+- Android Auto: Fix sorting of charger list by distance
+- Fixed crashes

fastlane/metadata/android/en-US/changelogs/274.txt

@@ -0,0 +1,2 @@
+Improvements:
+- Improvements to realtime status

fastlane/metadata/android/sv/full_description.txt

@@ -1,4 +1,4 @@
-Med EVMap hittar du enkelt laddare för elfordon med hjälp av din Android-telefon. Du får tillgång till data från GoingElectric.de och Open Charge Map som innehåller information om laddstationer över hela världen. För många laddstationer i Europa finns realtidsstatus.
+Med EVMap hittar du enkelt laddare till elfordon med hjälp av din Android-telefon. Du får tillgång till data från GoingElectric.de och Open Charge Map som innehåller information om laddstationer över hela världen. För många laddstationer i Europa finns realtidsstatus.
 
 Funktioner:
 - Material Design

fastlane/metadata/android/sv/short_description.txt

@@ -1 +1 @@
-Hitta laddstationer för elfordon
+Hitta laddstationer till elfordon