add Jawg Maps sponsor logo

Migrate Mapbox -> MapLibre
Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map
2025-12-24 23:57:45 -05:00 · 2024-05-08 21:39:29 +02:00 · 2024-05-08 21:39:29 +02:00
51 changed files with 188 additions and 538 deletions
--- a/.github/workflows/apikeys-ci.xml
+++ b/.github/workflows/apikeys-ci.xml
@@ -1,6 +1,8 @@
 <resources>
   <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
   <string name="mapbox_key" translatable="false">ci</string>
+   <string name="jawg_key" translatable="false">ci</string>
+   <string name="arcgis_key" translatable="false">ci</string>
   <string name="goingelectric_key" translatable="false">ci</string>
   <string name="chargeprice_key" translatable="false">ci</string>
   <string name="openchargemap_key" translatable="false">ci</string>
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,8 @@ jobs:
          OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
          CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          JAWG_API_KEY: ${{ secrets.JAWG_API_KEY }}
+          ARCGIS_API_KEY: ${{ secrets.ARCGIS_API_KEY }}
          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
          FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
          ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -1,115 +0,0 @@
-on:
-  push:
-    branches:
-      - '*'
-
-name: Generate Screenshots
-
-jobs:
-
-  screenshot:
-    name: Generate screenshots
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        device:
-          - profile: pixel_6
-            api-level: 34
-            display_size: 1080x2336  # subtracted the 64px bottom navigation bar
-            type: phone
-          - profile: pixel_tablet
-            api-level: 34
-            display_size: 2560x1488  # subtracted the 64px navigation bar and 48px status bar
-            type: tenInch
-    env:
-      ANDROID_USER_HOME: /home/runner/.android
-    steps:
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Retrieve debug keystore
-        env:
-          DEBUG_KEYSTORE_BASE64: ${{ secrets.DEBUG_KEYSTORE_BASE64 }}
-        run: |
-          mkdir ~/.config/.android
-          echo $DEBUG_KEYSTORE_BASE64 | base64 --decode >  ~/.config/.android/debug.keystore
-
-      - name: Set up Java environment
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'zulu'
-          cache: 'gradle'
-
-      - name: Setup Android SDK
-        run: |
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;latest"
-          rm -r $ANDROID_HOME/cmdline-tools/latest
-          mv $ANDROID_HOME/cmdline-tools/latest-2 $ANDROID_HOME/cmdline-tools/latest
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --version
-
-      - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: ${{ runner.os }}-avd-api${{ matrix.device.api-level }}-${{ matrix.device.profile }}
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.device.api-level }}
-          target: google_atd
-          arch: x86_64
-          profile: ${{ matrix.device.profile }}
-          force-avd-creation: false
-          ram-size: 2048M
-          disk-size: 4096M
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
-          disable-animations: true
-          script: echo "Generated AVD snapshot for caching."
-
-      - name: Build app
-        run: ./gradlew assembleGoogleNormalDebug assembleGoogleNormalAndroidTest
-        env:
-          GOINGELECTRIC_API_KEY: ${{ secrets.GOINGELECTRIC_API_KEY }}
-          OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
-          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
-          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
-          FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
-          ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}
-
-      - name: Run emulator and generate screenshots
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.device.api-level }}
-          target: google_atd
-          arch: x86_64
-          profile: ${{ matrix.device.profile }}
-          force-avd-creation: false
-          ram-size: 2048M
-          disk-size: 4096M
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
-          disable-animations: true
-          script: |
-            adb shell pm clear net.vonforst.evmap.debug || true
-            adb shell wm size ${{ matrix.device.display_size }}
-            adb logcat -c
-            
-            adb logcat *:E &            
-            fastlane screengrab --app_apk_path app/build/outputs/apk/googleNormal/debug/app-google-normal-debug.apk  --test_apk_path app/build/outputs/apk/androidTest/googleNormal/debug/app-google-normal-debug-androidTest.apk --tests_package_name=net.vonforst.evmap.debug.test --app_package_name net.vonforst.evmap.debug -p net.vonforst.evmap.screenshot --use_timestamp_suffix false --clear_previous_screenshots true --device_type=${{ matrix.device.type }} -q en-US,de-DE,fr-FR,nb-rNO,nl-NL,pt-PT,ro-RO
-
-      - name: Upload screenshots as artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: screenshots-${{ matrix.device.profile }}-${{ matrix.device.api-level }}
-          path: fastlane/metadata/android
--- a/README.md
+++ b/README.md
@@ -24,7 +24,8 @@ Features
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
+- Can use Google Maps or OpenStreetMap as map backends - the version available on F-Droid only uses
+  OSM.

 Screenshots
 -----------
@@ -43,7 +44,8 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 features and how they can be obtained in our [documentation page](doc/api_keys.md).

 There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
- The `foss` variants only use Mapbox data and should run on most Android devices, even without
+
+- The `foss` variants only use OSM data and should run on most Android devices, even without
  Google Play Services.
    - `fossNormal` is intended to run on smartphones and tablets, and also includes the Android
      Auto app for use on the car display (however for that to work, the Android Auto app is
@@ -75,5 +77,12 @@ You can use our [Weblate page](https://hosted.weblate.org/projects/evmap/) to he
 into new languages.

 <a href="https://hosted.weblate.org/engage/evmap/">
-<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="500" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="400" alt="Translation status" />
 </a>
+
+Sponsors
+--------
+
+<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="58"/></a><br>
+Since mid 2024, **JawgMaps** provides 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/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
    id("com.mikepenz.aboutlibraries.plugin")
 }

+val supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro,cs"

 android {
    defaultConfig {
@@ -22,6 +23,8 @@ android {
        versionName = "1.8.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        resourceConfigurations += supportedLocales.split(",")
+        buildConfigField("String", "supportedLocales", "\"$supportedLocales\"")
    }

    signingConfigs {
@@ -97,9 +100,6 @@ android {
        disable += listOf("NullSafeMutableLiveData")
        warning += listOf("MissingTranslation")
    }
-    androidResources {
-        generateLocaleConfig = true
-    }

    testOptions {
        unitTests {
@@ -146,6 +146,28 @@ android {
        if (mapboxKey != null) {
            resValue("string", "mapbox_key", mapboxKey)
        }
+        var jawgKey =
+            System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
+        if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
+            jawgKey = decode(
+                project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (jawgKey != null) {
+            resValue("string", "jawg_key", jawgKey)
+        }
+        var arcgisKey =
+            System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
+        if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
+            arcgisKey = decode(
+                project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (arcgisKey != null) {
+            resValue("string", "arcgis_key", jawgKey)
+        }
        var chargepriceKey =
            System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
                ?.toString()
@@ -261,28 +283,11 @@ dependencies {
    automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")

    // AnyMaps
-    val anyMapsVersion = "4854581f72"
+    val anyMapsVersion = "c087b3e7c2"
    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
    googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
-        exclude(group = "com.google.android.gms", module = "play-services-location")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-core")
-    }
-    // original version of mapbox-android-core
-    googleImplementation("com.mapbox.mapboxsdk:mapbox-android-core:2.0.1")
-    // patched version that removes build-time dependency on GMS (-> no Google location services)
-    fossImplementation("com.github.ev-map:mapbox-events-android:a21c324501")
-
-    implementation("com.mapbox.mapboxsdk:mapbox-android-sdk") {
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
-        version {
-            strictly("9.1.0-SNAPSHOT")
-        }
-    }
+    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion")

    // Google Places
    googleImplementation("com.google.android.libraries.places:places:3.3.0")
@@ -325,7 +330,6 @@ dependencies {
    debugImplementation("com.facebook.flipper:flipper:0.238.0")
    debugImplementation("com.facebook.soloader:soloader:0.10.5")
    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.238.0")
-    debugImplementation("androidx.test.espresso:espresso-idling-resource:3.5.1")

    // testing
    testImplementation("junit:junit:4.13.2")
@@ -336,14 +340,11 @@ dependencies {
    testImplementation("androidx.test:core:1.5.0")
    testImplementation("androidx.arch.core:core-testing:2.2.0")
    testImplementation("androidx.car.app:app-testing:$carAppVersion")
+    testImplementation("androidx.test:core:1.5.0")

    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1")
-    androidTestImplementation("androidx.test:rules:1.5.0")
    androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
-    androidTestImplementation("tools.fastlane:screengrab:2.1.1")

    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")

--- a/app/src/androidTest/java/net/vonforst/evmap/storage/SavedRegionDaoTest.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/storage/SavedRegionDaoTest.kt
@@ -1,4 +1,4 @@
-package net.vonforst.evmap.storage
+package com.johan.evmap.storage

 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
--- a/app/src/androidTest/java/net/vonforst/evmap/screenshot/DataBindingIdlingResource.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/screenshot/DataBindingIdlingResource.kt
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.vonforst.evmap.screenshot
-
-import android.view.View
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.FragmentActivity
-import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.IdlingResource
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import java.util.UUID
-
-/**
- * An espresso idling resource implementation that reports idle status for all data binding
- * layouts. Data Binding uses a mechanism to post messages which Espresso doesn't track yet.
- *
- * Since this application only uses fragments, the resource only checks the fragments and their
- * children instead of the whole view tree.
- *
- * Tracking bug: https://github.com/android/android-test/issues/317
- */
-class DataBindingIdlingResource(
-    activityScenarioRule: ActivityScenarioRule<out FragmentActivity>
-) : IdlingResource {
-    // list of registered callbacks
-    private val idlingCallbacks = mutableListOf<IdlingResource.ResourceCallback>()
-
-    // give it a unique id to workaround an espresso bug where you cannot register/unregister
-    // an idling resource w/ the same name.
-    private val id = UUID.randomUUID().toString()
-
-    // holds whether isIdle is called and the result was false. We track this to avoid calling
-    // onTransitionToIdle callbacks if Espresso never thought we were idle in the first place.
-    private var wasNotIdle = false
-
-    lateinit var activity: FragmentActivity
-
-    override fun getName() = "DataBinding $id"
-
-    init {
-        monitorActivity(activityScenarioRule.scenario)
-    }
-
-    override fun isIdleNow(): Boolean {
-        val idle = !getBindings().any { it.hasPendingBindings() }
-        @Suppress("LiftReturnOrAssignment")
-        if (idle) {
-            if (wasNotIdle) {
-                // notify observers to avoid espresso race detector
-                idlingCallbacks.forEach { it.onTransitionToIdle() }
-            }
-            wasNotIdle = false
-        } else {
-            wasNotIdle = true
-            // check next frame
-            activity.findViewById<View>(android.R.id.content).postDelayed({
-                isIdleNow
-            }, 16)
-        }
-        return idle
-    }
-
-    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
-        idlingCallbacks.add(callback)
-    }
-
-    /**
-     * Sets the activity from an [ActivityScenario] to be used from [DataBindingIdlingResource].
-     */
-    private fun monitorActivity(
-        activityScenario: ActivityScenario<out FragmentActivity>
-    ) {
-        activityScenario.onActivity {
-            this.activity = it
-        }
-    }
-
-    /**
-     * Find all binding classes in all currently available fragments.
-     */
-    private fun getBindings(): List<ViewDataBinding> {
-        val fragments = (activity as? FragmentActivity)
-            ?.supportFragmentManager
-            ?.fragments
-
-        val bindings =
-            fragments?.mapNotNull {
-                it.view?.getBinding()
-            } ?: emptyList()
-        val childrenBindings = fragments?.flatMap { it.childFragmentManager.fragments }
-            ?.mapNotNull { it.view?.getBinding() } ?: emptyList()
-
-        return bindings + childrenBindings
-    }
-}
-
-private fun View.getBinding(): ViewDataBinding? = DataBindingUtil.getBinding(this)
--- a/app/src/androidTest/java/net/vonforst/evmap/screenshot/ScreenshotTest.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/screenshot/ScreenshotTest.kt
@@ -1,155 +0,0 @@
-package net.vonforst.evmap.screenshot
-
-import android.Manifest.permission.ACCESS_FINE_LOCATION
-import android.content.Intent
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.pressBack
-import androidx.test.espresso.contrib.DrawerActions
-import androidx.test.espresso.contrib.NavigationViewActions
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.GrantPermissionRule
-import androidx.test.rule.GrantPermissionRule.grant
-import kotlinx.coroutines.runBlocking
-import net.vonforst.evmap.EXTRA_CHARGER_ID
-import net.vonforst.evmap.EXTRA_LAT
-import net.vonforst.evmap.EXTRA_LON
-import net.vonforst.evmap.EspressoIdlingResource
-import net.vonforst.evmap.MapsActivity
-import net.vonforst.evmap.R
-import net.vonforst.evmap.api.goingelectric.GEReferenceData
-import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
-import net.vonforst.evmap.model.Favorite
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.storage.PreferenceDataSource
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import tools.fastlane.screengrab.Screengrab
-import tools.fastlane.screengrab.locale.LocaleTestRule
-import java.time.Instant
-
-
-@RunWith(AndroidJUnit4::class)
-class ScreenshotTest {
-    companion object {
-        @JvmStatic
-        @BeforeClass
-        fun beforeAll() {
-            IdlingRegistry.getInstance().register(EspressoIdlingResource.countingIdlingResource)
-
-            Screengrab.setDefaultScreenshotStrategy { screenshotName, screenshotCallback ->
-                screenshotCallback.screenshotCaptured(
-                    screenshotName,
-                    androidx.test.core.app.takeScreenshot()
-                )
-            }
-
-            val context = InstrumentationRegistry.getInstrumentation().targetContext
-            val prefs = PreferenceDataSource(context)
-            prefs.dataSourceSet = true
-            prefs.welcomeDialogShown = true
-            prefs.privacyAccepted = true
-            prefs.opensourceDonationsDialogLastShown = Instant.now()
-            prefs.chargepriceMyVehicles = setOf("b58bc94d-d929-ad71-d95b-08b877bf76ba")
-            prefs.appStartCounter = 0
-            prefs.mapProvider = "google"
-
-            // insert favorites
-            val db = AppDatabase.getInstance(context)
-            val api = GoingElectricApiWrapper(
-                context.getString(R.string.goingelectric_key),
-                context = context
-            )
-            val ids = listOf(70774L to true, 40315L to true, 65330L to true, 62489L to false)
-            runBlocking {
-                val refData = api.getReferenceData().data as GEReferenceData
-                ids.forEachIndexed { i, (id, favorite) ->
-                    val detail = api.getChargepointDetail(refData, id).data!!
-                    db.chargeLocationsDao().insert(detail)
-                    if (db.favoritesDao().findFavorite(id, "goingelectric") == null && favorite) {
-                        db.favoritesDao().insert(
-                            Favorite(
-                                chargerId = id,
-                                chargerDataSource = "goingelectric"
-                            )
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    @get:Rule
-    val localeTestRule = LocaleTestRule()
-
-    @get:Rule
-    val activityRule: ActivityScenarioRule<MapsActivity> = ActivityScenarioRule(
-        Intent(
-            InstrumentationRegistry.getInstrumentation().targetContext,
-            MapsActivity::class.java
-        ).apply {
-            putExtra(EXTRA_CHARGER_ID, 62489L)
-            putExtra(EXTRA_LAT, 53.099512)
-            putExtra(EXTRA_LON, 9.981884)
-        })
-
-    @get:Rule
-    val permissionRule: GrantPermissionRule = grant(ACCESS_FINE_LOCATION)
-
-    @Before
-    fun setUp() {
-        IdlingRegistry.getInstance().register(DataBindingIdlingResource(activityRule))
-    }
-
-    @Test
-    fun testTakeScreenshot() {
-        Thread.sleep(15000L)
-        Screengrab.screenshot("01_map_google")
-
-        onView(withId(R.id.topPart)).perform(click())
-
-        Thread.sleep(1000L)
-        Screengrab.screenshot("02_detail")
-
-        onView(withId(R.id.btnChargeprice)).perform(click())
-        Thread.sleep(5000L)
-        Screengrab.screenshot("03_prices")
-
-        onView(isRoot()).perform(pressBack())
-        Thread.sleep(500L)
-        onView(isRoot()).perform(pressBack())
-
-        Thread.sleep(2000L)
-
-        onView(withId(R.id.menu_filter)).perform(click())
-        Thread.sleep(1000L)
-        onView(withText(R.string.menu_edit_filters)).perform(click())
-
-        Thread.sleep(1000L)
-
-        Screengrab.screenshot("05_filters")
-        onView(isRoot()).perform(pressBack())
-
-        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
-        onView(withId(R.id.nav_view)).perform(NavigationViewActions.navigateTo(R.id.favs))
-
-        Thread.sleep(10000L)
-        Screengrab.screenshot("04_favorites")
-
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        PreferenceDataSource(context).mapProvider = "mapbox"
-        onView(isRoot()).perform(pressBack())
-
-        Thread.sleep(5000L)
-        Screengrab.screenshot("01_map_mapbox")
-    }
-}
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,25 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Permissions needed for fastlane screengrab -->
-
-    <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- Allows for storing and retrieving screenshots -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-    <!-- Allows changing locales -->
-    <uses-permission
-        android:name="android.permission.CHANGE_CONFIGURATION"
-        tools:ignore="ProtectedPermissions" />
-
-    <!-- Allows changing SystemUI demo mode -->
-    <uses-permission
-        android:name="android.permission.DUMP"
-        tools:ignore="ProtectedPermissions" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <application>
        <activity
--- a/app/src/debug/java/net/vonforst/evmap/DebugInits.kt
+++ b/app/src/debug/java/net/vonforst/evmap/DebugInits.kt
@@ -2,8 +2,6 @@ package net.vonforst.evmap

 import android.content.Context
 import android.os.Build
-import androidx.test.espresso.IdlingRegistry
-import androidx.test.espresso.idling.CountingIdlingResource
 import com.facebook.flipper.android.AndroidFlipperClient
 import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
 import com.facebook.flipper.plugins.inspector.DescriptorMapping
@@ -36,29 +34,9 @@ fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {
    } catch (e: ClassNotFoundException) {
        isRunningTest = false
    }
-
+    
    if (!isRunningTest) {
        this.addNetworkInterceptor(FlipperOkhttpInterceptor(networkFlipperPlugin))
    }
    return this
-}
-
-/**
- * Contains a static reference to [IdlingResource], only available in the 'debug' build type.
- */
-object EspressoIdlingResource {
-    private const val RESOURCE = "GLOBAL"
-
-    @JvmField
-    val countingIdlingResource = CountingIdlingResource(RESOURCE)
-
-    fun increment() {
-        countingIdlingResource.increment()
-    }
-
-    fun decrement() {
-        if (!countingIdlingResource.isIdleNow) {
-            countingIdlingResource.decrement()
-        }
-    }
 }
--- a/app/src/foss/res/values-cs/strings.xml
+++ b/app/src/foss/res/values-cs/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
    <string name="donate_paypal">Přispět pomocí PayPalu</string>
-    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap.</string>
 </resources>
--- a/app/src/foss/res/values-de/strings.xml
+++ b/app/src/foss/res/values-de/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
    <string name="donate_paypal">Mit PayPal spenden</string>
-    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap.</string>
 </resources>
--- a/app/src/foss/res/values-fr/strings.xml
+++ b/app/src/foss/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
-    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap.</string>
    <string name="donate_paypal">Faire un don avec PayPal</string>
 </resources>
--- a/app/src/foss/res/values-nb-rNO/strings.xml
+++ b/app/src/foss/res/values-nb-rNO/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donate_paypal">Doner med PayPal</string>
-    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap.</string>
    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
 </resources>
--- a/app/src/foss/res/values-nl/strings.xml
+++ b/app/src/foss/res/values-nl/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Vond je EVMap nuttig\? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
    <string name="donate_paypal">Doneer via PayPal</string>
-    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap.</string>
 </resources>
--- a/app/src/foss/res/values-pt/strings.xml
+++ b/app/src/foss/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap.</string>
    <string name="donate_paypal">Doar com o PayPal</string>
    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.</string>
 </resources>
--- a/app/src/foss/res/values-ro/strings.xml
+++ b/app/src/foss/res/values-ro/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Crezi ca EVMap este util? Sprijina dezvoltarea printr-o donatie pentru dezvoltator.</string>
    <string name="donate_paypal">Doneaza cu PayPal</string>
-    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap.</string>
 </resources>
--- a/app/src/foss/res/values/strings.xml
+++ b/app/src/foss/res/values/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
    <string name="donate_paypal">Donate with PayPal</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap.</string>
 </resources>
--- a/app/src/google/res/values-cs/strings.xml
+++ b/app/src/google/res/values-cs/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři.
 \n
 \nGoogle si z každého daru strhne 15 %.</string>
-    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap.</string>
 </resources>
--- a/app/src/google/res/values-de/strings.xml
+++ b/app/src/google/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
-    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap für die Kartendaten wechseln.</string>
 </resources>
--- a/app/src/google/res/values-fr/strings.xml
+++ b/app/src/google/res/values-fr/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
 \n
 \nGoogle prend 15% sur chaque don.</string>
-    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
+    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap pour les données cartographiques.</string>
 </resources>
--- a/app/src/google/res/values-nb-rNO/strings.xml
+++ b/app/src/google/res/values-nb-rNO/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
 \n
 \nGoogle tar 15% av alle donasjoner.</string>
-    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap for kartdata.</string>
 </resources>
--- a/app/src/google/res/values-nl/strings.xml
+++ b/app/src/google/res/values-nl/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
 \n
 \nGoogle houdt 15% in van elke donatie.</string>
-    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap voor de kaartgegevens.</string>
 </resources>
--- a/app/src/google/res/values-pt/strings.xml
+++ b/app/src/google/res/values-pt/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
 \n
 \nA Google cobra 15% de cada doação.</string>
-    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap nas definições da app.</string>
 </resources>
--- a/app/src/google/res/values/arrays.xml
+++ b/app/src/google/res/values/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
    <string-array name="pref_map_provider_names">
        <item>@string/pref_provider_google_maps</item>
-        <item>@string/pref_provider_osm_mapbox</item>
+        <item>@string/pref_provider_osm</item>
    </string-array>
    <string-array name="pref_map_provider_values" translatable="false">
        <item>google</item>
--- a/app/src/google/res/values/strings.xml
+++ b/app/src/google/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
-    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap for the map data.</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,12 +41,21 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">

        <meta-data
            android:name="com.mapbox.ACCESS_TOKEN"
            android:value="@string/mapbox_key" />

+        <meta-data
+            android:name="io.jawg.ACCESS_TOKEN"
+            android:value="@string/jawg_key" />
+
+        <meta-data
+            android:name="com.arcgis.ACCESS_TOKEN"
+            android:value="@string/arcgis_key" />
+
        <activity
            android:name=".MapsActivity"
            android:label="@string/app_name"
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -1,6 +1,5 @@
 package net.vonforst.evmap

-import android.app.ActivityOptions
 import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -207,15 +206,18 @@ class MapsActivity : AppCompatActivity(),
                    }
                }
            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
-                navController.navigate(
-                    R.id.map, MapFragmentArgs(
-                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                        latLng = LatLng(
-                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                            intent.getDoubleExtra(EXTRA_LON, 0.0)
-                        )
-                    ).toBundle()
-                )
+                deepLink = navController.createDeepLink()
+                    .setDestination(R.id.map)
+                    .setArguments(
+                        MapFragmentArgs(
+                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                            latLng = LatLng(
+                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                                intent.getDoubleExtra(EXTRA_LON, 0.0)
+                            )
+                        ).toBundle()
+                    )
+                    .createPendingIntent()
            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
                deepLink = navController.createDeepLink()
                    .setGraph(navGraph)
--- a/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt
+++ b/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt
@@ -113,8 +113,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {

    override fun getAttributionString(): Int = R.string.powered_by_mapbox

-    override fun getAttributionImage(dark: Boolean): Int =
-        if (dark) com.mapbox.mapboxsdk.R.drawable.mapbox_logo_icon else R.drawable.mapbox_logo
+    override fun getAttributionImage(dark: Boolean): Int = R.drawable.mapbox_logo
 }

 private fun BoundingBox.toLatLngBounds(): LatLngBounds {
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -225,12 +225,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            mapFragment = MapFragment()
            mapFragment!!.priority = arrayOf(
                when (provider) {
-                    "mapbox" -> MapFragment.MAPBOX
+                    "mapbox" -> MapFragment.MAPLIBRE
                    "google" -> MapFragment.GOOGLE
                    else -> null
                },
                MapFragment.GOOGLE,
-                MapFragment.MAPBOX
+                MapFragment.MAPLIBRE
            )
            childFragmentManager
                .beginTransaction()
@@ -275,7 +275,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

            // set map padding so that compass is not obstructed by toolbar
            mapTopPadding = systemWindowInsetTop + (48 * density).toInt() + (16 * density).toInt()
-            // if we actually use map.setPadding here, Mapbox will re-trigger onApplyWindowInsets
+            // if we actually use map.setPadding here, MapLibre will re-trigger onApplyWindowInsets
            // and cause an infinite loop. So we rely on onMapReady being called later than
            // onApplyWindowInsets.

@@ -1052,6 +1052,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        val context = this.context ?: return
        chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)

+        vm.mapTrafficSupported.value =
+            mapFragment?.let { AnyMap.Feature.TRAFFIC_LAYER in it.supportedFeatures } ?: false
+
        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
            // Google Maps: icons can be generated in background thread
            lifecycleScope.launch {
@@ -1060,7 +1063,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                }
            }
        } else {
-            // Mapbox: needs to be run on main thread
+            // MapLibre: needs to be run on main thread
            chargerIconGenerator.preloadCache()
        }

--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
@@ -41,7 +41,7 @@ class UiSettingsFragment : BaseSettingsFragment() {

    override fun onResume() {
        super.onResume()
-        langPref.value = getAppLocale(requireContext())
+        langPref.value = getAppLocale()
        immediateNavPref.isVisible = isGoogleMapsInstalled()
    }

--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -108,14 +108,11 @@ class PreferenceDataSource(val context: Context) {
    val darkmode: String
        get() = sp.getString("darkmode", "default")!!

-    var mapProvider: String
+    val mapProvider: String
        get() = sp.getString(
            "map_provider",
            context.getString(R.string.pref_map_provider_default)
        )!!
-        set(value) {
-            sp.edit().putString("map_provider", value).apply()
-        }

    var searchProvider: String
        get() = sp.getString(
--- a/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
@@ -1,12 +1,10 @@
 package net.vonforst.evmap.ui

-import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import net.vonforst.evmap.R
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.storage.PreferenceDataSource

-
 fun updateNightMode(prefs: PreferenceDataSource) {
    AppCompatDelegate.setDefaultNightMode(
        when (prefs.darkmode) {
@@ -27,14 +25,13 @@ fun updateAppLocale(language: String) {
    )
 }

-fun getAppLocale(context: Context): String? {
+fun getAppLocale(): String? {
    val locales = AppCompatDelegate.getApplicationLocales()
    return if (locales.isEmpty) {
        "default"
    } else {
        val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
-        val choices =
-            context.resources.getStringArray(R.array.pref_language_values).joinToString(",")
-        LocaleListCompat.forLanguageTags(choices).getFirstMatch(arr)?.toLanguageTag()
+        LocaleListCompat.forLanguageTags(BuildConfig.supportedLocales).getFirstMatch(arr)
+            ?.toLanguageTag()
    }
-}
+}
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -8,7 +8,6 @@ import jsonapi.Relationships
 import jsonapi.ResourceIdentifier
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.EspressoIdlingResource
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.model.ChargeLocation
@@ -49,7 +48,6 @@ class ChargepriceViewModel(
                } else {
                    value = Resource.loading(null)
                    viewModelScope.launch {
-                        EspressoIdlingResource.increment()
                        value = try {
                            val result = api.getVehicles()
                            Resource.success(result.filter {
@@ -59,8 +57,6 @@ class ChargepriceViewModel(
                            Resource.error(e.message, null)
                        } catch (e: HttpException) {
                            Resource.error(e.message, null)
-                        } finally {
-                            EspressoIdlingResource.decrement()
                        }
                    }
                }
@@ -257,7 +253,6 @@ class ChargepriceViewModel(

        loadPricesJob?.cancel()
        loadPricesJob = viewModelScope.launch {
-            EspressoIdlingResource.increment()
            try {
                val result = api.getChargePrices(
                    ChargepriceRequest(
@@ -300,8 +295,6 @@ class ChargepriceViewModel(
            } catch (e: HttpException) {
                chargePrices.value = Resource.error(e.message, null)
                chargePriceMeta.value = Resource.error(e.message, null)
-            } finally {
-                EspressoIdlingResource.decrement()
            }
        }
    }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -3,7 +3,16 @@ package net.vonforst.evmap.viewmodel
 import android.app.Application
 import android.graphics.Point
 import android.os.Parcelable
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.liveData
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
+import androidx.lifecycle.viewModelScope
 import com.car2go.maps.AnyMap
 import com.car2go.maps.Projection
 import com.car2go.maps.model.LatLng
@@ -24,7 +33,17 @@ import net.vonforst.evmap.api.openchargemap.OCMConnection
 import net.vonforst.evmap.api.openchargemap.OCMReferenceData
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.model.FavoriteWithDetail
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
@@ -282,6 +301,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        }
    }

+    val mapTrafficSupported: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = false
+        }
+    }
+
    val mapTrafficEnabled: MutableLiveData<Boolean> by lazy {
        MutableLiveData<Boolean>().apply {
            value = prefs.mapTrafficEnabled
--- a/app/src/main/res/layout/map_layers.xml
+++ b/app/src/main/res/layout/map_layers.xml
@@ -80,6 +80,7 @@
            android:layout_marginEnd="16dp"
            android:text="@string/map_details"
            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+            app:goneUnless="@{vm.mapTrafficSupported}"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.0"
            app:layout_constraintStart_toStartOf="parent"
@@ -94,6 +95,7 @@
            android:layout_marginEnd="16dp"
            android:text="@string/map_traffic"
            android:checked="@={vm.mapTrafficEnabled}"
+            app:goneUnless="@{vm.mapTrafficSupported}"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/textView23" />
--- a/app/src/main/res/resources.properties
+++ b/app/src/main/res/resources.properties
@@ -1 +0,0 @@
-unqualifiedResLocale=en-US
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -271,6 +271,7 @@
    <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
    <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm">OpenStreetMap</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Mitwirkende</string>
    <string name="about_contributors_text">Dank an alle Mitwirkenden für ihre Beiträge von Code und Übersetzungen für EVMap:</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -380,7 +380,4 @@
    <string name="status_faulted">Fora de serviço</string>
    <string name="status_since">%1$s desde %2$s</string>
    <string name="status_unknown">Estado Desconhecido</string>
-    <string name="pref_chargeprice_native_integration">Comparação de preços no EVMap</string>
-    <string name="pref_chargeprice_native_integration_on">Os preços serão exibidos diretamente no EVMap</string>
-    <string name="pref_chargeprice_native_integration_off">O botão de comparação de preços abrirá a app ou site do Chargeprice</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -271,6 +271,7 @@
    <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
    <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm">OpenStreetMap</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Contributors</string>
    <string name="about_contributors_text">Thanks to all contributors for their coding and translation contributions to EVMap:</string>
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="de" />
+    <locale android:name="fr" />
+    <locale android:name="nb-NO" />
+</locale-config>
--- a/app/src/release/java/net/vonforst/evmap/DebugInits.kt
+++ b/app/src/release/java/net/vonforst/evmap/DebugInits.kt
@@ -7,10 +7,4 @@ fun addDebugInterceptors(context: Context) {

 }

-fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder = this
-
-object EspressoIdlingResource {
-    fun increment() {}
-
-    fun decrement() {}
-}
+fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder = this
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,9 +26,6 @@ allprojects {
        mavenCentral()
        //noinspection JcenterRepositoryObsolete
        maven { setUrl("https://jitpack.io") }
-        maven {
-            setUrl("https://raw.githubusercontent.com/ev-map/mapbox-gl-native-android/mvn")
-        }
    }
 }

--- a/doc/api_keys.md
+++ b/doc/api_keys.md
@@ -17,6 +17,12 @@ be put into the app in the form of a resource file called `apikeys.xml` under
   <string name="mapbox_key" translatable="false">
      insert your Mapbox key here
   </string>
+   <string name="jawg_key" translatable="false">
+      insert your Jawg Maps key here
+   </string>
+   <string name="arcgis_key" translatable="false">
+      insert your ArcGIS Maps key here
+   </string>
   <string name="goingelectric_key" translatable="false">
      insert your GoingElectric key here
   </string>
@@ -52,10 +58,12 @@ Map providers

 The different Map SDKs are wrapped by our [fork](https://github.com/ev-map/AnyMaps) of the
 [AnyMaps](https://github.com/sharenowTech/AnyMaps) library to provide a common API. The `google`
-build flavor of the app includes both Google Maps and Mapbox and allows the user to switch between
-the two, while the `foss` flavor only includes the Mapbox SDK.
+build flavor of the app includes both Google Maps and OpenStreetMap (vector tiles from
+[Jawg Maps](https://www.jawg.io/en/) through [MapLibre](https://maplibre.org/)) and allows the user
+to switch between the two, while the `foss` flavor only includes OSM.

-> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not Mapbox, as the latter has
+> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not
+> OSM/MapLibre, as the latter has
 [issues displaying the markers](https://github.com/mapbox/mapbox-gl-native/issues/10829). It works fine on real Android devices.

 ### Google Maps
@@ -77,9 +85,39 @@ the two, while the `foss` flavor only includes the Mapbox SDK.

 </details>

+### Jawg Maps
+
+[Dynamic Maps](https://www.jawg.io/docs/apidocs/maps/)
+
+<details>
+<summary>How to obtain an API key</summary>
+
+1. [Sign up](https://www.jawg.io/lab) for a Jawg account
+2. Under [Access Tokens](https://www.jawg.io/lab/access-tokens), copy your default access token or
+   create a new one. Do not restrict it to a specific origin (this setting is not compatible with
+   Android apps).
+
+</details>
+
+### ArcGIS
+
+[World Imagery basemap](https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9)
+*We use this for the satellite map, as [Jawg's](https://blog.jawg.io/satellite-imaging/) satellite
+style does not have global coverage.*
+
+<details>
+<summary>How to obtain an API key</summary>
+
+1. [Sign up](https://developers.arcgis.com/dashboard/) for an ArcGIS developer account
+2. In the dashboard, copy your default API key or create a new one. It has to have access to the
+   "Basemaps" service.
+
+</details>
+
 ### Mapbox

-[Maps SDK for Android](https://docs.mapbox.com/android/maps)
+[Geocoding API](https://docs.mapbox.com/api/search/geocoding/)
+*previously we also used Mapbox's Maps SDK, but this has now been switched to Jawg Maps.*

 <details>
 <summary>How to obtain an API key</summary>
@@ -91,7 +129,6 @@ the two, while the `foss` flavor only includes the Mapbox SDK.

 </details>

-
 Charging station databases
 --------------------------

--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -5,7 +5,7 @@ Funkce:
 - Zobrazuje všechny nabíjecí stanice z komunitou spravovaných databází GoingElectric.de a Open Charge Map.
 - Informace o dostupnosti v reálném čase (pouze v Evropě)
 - Integrované srovnání cen pomocí Chargeprice.app (pouze v Evropě)
- Mapové podklady z OpenStreetMap (Mapbox)
+- Mapové podklady z OpenStreetMap
 - Vyhledávání míst
 - Pokročilé možnosti filtrování, včetně uložených profilů filtrů
 - Seznam oblíbených, také s informacemi o dostupnosti
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -5,7 +5,7 @@ Funktionen:
 - Anzeige der Stromtankstellen aus den Stromtankstellenverzeichnissen von GoingElectric.de und Open Charge Map
 - Echtzeit-Verfügbarkeitsanzeige für viele Ladesäulen (nur in Europa)
 - Integrierter Preisvergleich für die jeweilige Ladesäule mit Chargeprice.app (nur in Europa)
- Kartendaten von OpenStreetMap (Mapbox)
+- Kartendaten von OpenStreetMap
 - Suche nach Orten
 - Erweiterte Filterfunktionen, Filterprofile speichern
 - Favoritenliste, auch mit Anzeige der Verfügbarkeit
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -5,7 +5,7 @@ Features:
 - Shows all charging stations from the community-maintained GoingElectric.de and Open Charge Map directories
 - Realtime availability information (only in Europe)
 - Integrated price comparison using Chargeprice.app (only in Europe)
- Map data from OpenStreetMap (Mapbox)
+- Map data from OpenStreetMap
 - Search for places
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
--- a/fastlane/metadata/android/fr/full_description.txt
+++ b/fastlane/metadata/android/fr/full_description.txt
@@ -5,7 +5,7 @@ Caractéristiques :
 - Affiche toutes les stations de recharge des répertoires GoingElectric.de et Open Charge Map gérés par la communauté.
 - Informations sur la disponibilité en temps réel (uniquement en Europe)
 - Comparaison des prix intégrée grâce à Chargeprice.app (uniquement en Europe)
- Données cartographiques provenant d'OpenStreetMap (Mapbox)
+- Données cartographiques provenant d'OpenStreetMap
 - Recherche de lieux
 - Options de filtrage avancées, y compris les profils de filtrage enregistrés
 - Liste de favoris, avec également des informations sur la disponibilité
--- a/fastlane/metadata/android/nb-NO/full_description.txt
+++ b/fastlane/metadata/android/nb-NO/full_description.txt
@@ -5,7 +5,7 @@ Du finner info om ladestasjoner i hele verden og sanntidsinfo for mange av dem s
 - Materiell design
 - Sanntidsinfo (kun i Europa)
 - Integrert sammenligningsinfo ved bruk av Chargeprice.app (kun i Europa)
- Kartdata fra OpenStreetMap (Mapbox)
+- Kartdata fra OpenStreetMap
 - Søk etter steder
 - Avanserte filtreringsvalg, inkludert lagrede filterprofiler
 - Favorittliste, som også har tilgjengelighetsinfo
--- a/fastlane/metadata/android/nl-NL/full_description.txt
+++ b/fastlane/metadata/android/nl-NL/full_description.txt
@@ -5,7 +5,7 @@ Kenmerken:
 - Toont alle laadpunten van de GoingElectric.de en Open Charge Map databanken
 - Real-time status (enkel in Europa)
 - Geïntegreerde prijsvergelijking via Chargeprice.app (enkel in Europe)
- Kaartgegevens van OpenStreetMap (Mapbox)
+- Kaartgegevens van OpenStreetMap
 - Zoek naar locaties
 - Geavanceerde filtermogelijkheden, inclusief bewaarde filterprofielen
 - Lijst van favorieten, met statusinformatie
--- a/fastlane/metadata/android/pt/full_description.txt
+++ b/fastlane/metadata/android/pt/full_description.txt
@@ -5,7 +5,7 @@ Destaques:
 - Mostra todas as estações de carregamento dos diretórios GoingElectric.de e Open Charge Map mantidos pela comunidade
 - Informação de disponibilidade em tempo real (apenas na Europa)
 - Comparação de preços integrada usando o Chargeprice.app (apenas na Europa)
- Informação do mapa via OpenStreetMap (Mapbox)
+- Informação do mapa via OpenStreetMap
 - Pesquise lugares
 - Opções de filtragem avançadas, incluindo filtros de pesquisa que podem ser guardados
 - Lista de favoritos, também com informações de disponibilidade
Author	SHA1	Message	Date
johan12345	1a830fda5b	add Jawg Maps sponsor logo	2024-05-08 21:39:29 +02:00
johan12345	3df83f2d56	Migrate Mapbox -> MapLibre Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map	2024-05-08 21:39:29 +02:00