Release 1.1.2

because that may also mean that no information is available
see #13

.gitattributes

@@ -0,0 +1,2 @@
+_img/screenshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+fastlane/metadata/android/**/images/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: johan12345
+custom: 'https://paypal.me/johan98'

.travis.yml

@@ -1,11 +1,12 @@
 language: java
-dist: trusty
+dist: focal
 env:
   global:
     - secure: KYdFlMarsyXw+OHht1Atp+Kirbw9O09Ck14EjFuKb1eNtknurZ/tGEXuD+8xWh1W8W21kgHEG7s3rzru53t29buz+FW9f+ZmhEWXFP3OydyvXLw4BAVVOjm6xG2uHX/8MOGLJNM7cfaF25EPQ+kznHe84R29KaLH90mNRr2lPa4VnfbcnvDStiVaez/vJ72UoYSP5HICAzoF70yC3ZvvCK1hZv71UIysCbFE2IkxvMhG9OOGebdnRmFssaRCrvfRLjitobcLzkPWzZZIqdjNASf8/iAxX8VgGBYfVj8ID06AfMrtgXNJRCvcD0LICraQ+WPUbikMunRieGO8PNHSB5vKdPoC50aLUa0RoRb4G3QM1pR2A8xAFlIJFX2R7iY+2t24L9hRFqB98+QoQzutfkAI1T0rzem/wtpZpuan+bDawDJEHGCeYbE0aPDAl6lytgrEE9fRgV3c1jJLQzu0xIWG8YLl3iMg0hL+c0wCKXoeqrfCFS6kYmmG7W+rQp4tCZifvRbWfAXwIPQieffKxqdEuUwiUsYxdzCu9v9uU3nflEOLLuRgeMP3gV8mpur9b5GztpkfgfzcAqsF+NiY01kYgGtrgCYlMy0TxASE+UuALrtkQtU01wwhs9RH7Az0Ib3C+MT5DTjxHQCYETIViocmNEG2vfAbgHazCpGAhcY=
     - secure: Hoko50vP+Mwm/O4CWvPvjMxd1gGhi+Bultjyy1WpludSmZFCfKz45Mj1EqzeYk6MeMLvGOEkSLB5wjdXdgJ9j5gEOF5K34k4vESJA7+DqDO3I7Xw9cnWgOXdFqB0qGHar0TVP3Dfg7ZcRgtmeX6t2uoELFLiS9GvTnbZXk4PCUybd979Xi8XHjEQV7+3EZbSjtsI4GFeIK1rrjd0I+UM88zYrWnz1KhdCjWvQb4iZjo+ib6NmGGEMqR7jJPRZz3KB01Y+n5h21qq9/Nv31zQIqt2B5nRxy3vBvvqKapgprIk+hVOpNnBU8w89uWUU6tYUeFk0t7z1TYWjgaBrMmGCM+aKkQ2q5F/ygNzDwB+KkpJx709Yhf0ZX8g2yvkdz+Ok7moYuvmrOPOf4E/U3BlfZxbGtRD2bGYbDgHLFYlTn6v5J2kJHDJAz31yvF5jvJejDaPp2IBVfoMRy7ZJFmGUNHGd9Se6bRwxS++AoobP5WDrBiUXNe2KKDMs3e7vbaO+hLbZ9XHpjeWIJGUfvtTee8EHZqF/8A3ju53V4/R0ehlOv2UZbpYNqcmwrsy9/R4pgMfDkG3Q054LmYrxD8DIC9b8excVMwWRP5aQ1TqZnxO2B1/vJU87RcnGl3jekeHTdHXbRq9BMV4dAdPfB9X3nGIi2GgV0iTBk+24xccOc0=
     - secure: RsN/2nBVv0byMzwchuAhDti1AWKECg3Uzqk6Ahgaqg02zx8GHj60j0qNax7KuMUg70X3G4b3m8ZzndAU0wcJ98UyIku7ofUYgXHm0XYKTJwiyyhrKJ8pZ4qoeCoRkitIGIitlb84fSufVamcoLyLNbLUsO5OzL+Uscyhq/BwAhyOhj5FB9DM+GE9ntanQ4m3k4guMyMctR9CGS6Tk4LKJ1WCm0AnjTPalc+we+7yORY2J/9d6VHLKfaFXbpuWmrdnFfDZqxqcUODsxPVE0LuUtXyKQDTjjfQc8106Z/z19AJS+oLm/2UND84PD3MqsjX6EX0/9k3fY0OsoCuQAivDRmtevQ0bDQrTAyeBLcfnPCw/MYiJWyBcaYBAYK42EAfsFTDBRIduFB/Dpvg+8GuLZSdm4xVYpTlQ2pMtlGNWIGIRQsjk9LZ8swq8QBMiiF/bpMGKdfmnyQj8jkEOCWaAzkR9O+4E4Y7PuBENef9XuV0hLMryCrML2YXigxAKkEUOPhfnG+AbEY+g2kAMp+2EtXaG3tsGxoMhEYA+uRd3o2cacQMMwRpnePH5DYg6F05mrvdHPpt+P9UR1iHaHmjBPAYeksmrdP8bS088zcnePgiL6+6N0m3+l8Krihmxg5RyWjnH18IwX4RO+xg4x3cW+zaScCDbbotDMEYtChF+Hs=
     - secure: LQHMdhaPUlCuJPFrCPpUphJSY6xzAFI/7RrcAVLtLcPhGdS+MeNifIkkAH7MeitTHroOC0dGkZ4bg/8/7bKfgwY4vPH9P50kZcnX5mI6zfBHgNYJzuthj+vJH9RAtkdQOW9Fe1uPIx8R9GUWUOVnkoJh0PQ1gDXdZW5fePqUtn1kYrcCCBE+Bhe3wz6QzTBqGS1nsVRTxQfSJNGi9uH1oi9kQGgQFuCCiJ/P0A6MIhSItkOfuggx/iorA+iASbhWkB4nXYQBbFe/ZhFJWbVfgYlOM0HtpKh8B2AqKw21Em32JoovCbUof4adkY7cH8/4Rt9SujC9YOw+a6oM+e//jJT0sie77V7zl670j+qODTuNvV4qVUwtoxShyc1Sfbd+Xb0xn/OC7DzBg97YuYCF/84yyuq12rl/cofynWE1L5YvGNSJk241XUw98Bvl0MK4VIfQvG9zJP0HnQZcWKt6kFOIEJSCRbmkd2tPPAZFBXBQf/bvpULOoKwneGJZBSapRoCyGwemM+EAzVB9UOXAqsXZ4FHkt1SSJVrTVwgxvXpCfmF6LZPhbz6nvouRWGsC/GdWjrHtdW5lEOvS27qKEL5rXwQ0o+71ZICGo8j4E0GOHXyi857qZhvO7cbOnts+iiawXiWzPXv2gGGabuqPwcU8JPEoWdaiIaeGUczfjBU=
+    - secure: fvPVjj3l+TZ7HF5aGn/pmrkipGIrz+MkKNy3I7pnCJSuD/oVp9nQ5ePP/dAhaRThaW+fQbq7hOmCquPAtfoN9CUnHNV2f2l9RavDQIxdqvpXqY13A0BFffZho6A6H2kO7k6kQQPQEhl4SMJjObnX12/YDaTVx3b7aIroEJ8DyY62xGTsjExtaAksuFwUEekjh0MoWICvyBoDfrYhpiEVI2721rGMHu7FIXwmE38+jj7wwZd3Bp37yI9NY/b3ZQ/HUKyYDuoAL0xl5/GaQlRepD0v2xWQUQ40NArHLfMoscXi55UaENuswCg7rt9os8jCcZ8FkZf1cVsQ71JrE0uxgs00Jfjy2QKM5u1XUZefl1Nw5cfCDTWXIEGsz9OGiidFLehWUupX/6C6wr1BStdlRt+6Pt/FXsYHxO/qog++cKqHjOJRXi+raGAb99HhQ/hLnLUMKl5DIWlKF9DImXiOpfYxrgCJc3y91vNX6noJyWYs6PvErMukTsXFHen+fM0NtfTFoKW682oILvXjoeFvuzKpk49+rcpkJbRi5+Zdo/duSPp/flwvC4LOMi0RZOO9TNMhWKdkyWweDr1HEpvQn6RS87rpHzQwRDvm85F+PkZLMMqyWpuxBWbJf0jVbew21KvTJWamuizsIgCebFh0SSxgObzmMbAIFCkzL0PRsms=
     - ANDROID_HOME=$HOME/android-sdk
 before_install:
   - openssl aes-256-cbc -K $encrypted_53968681344a_key -iv $encrypted_53968681344a_iv -in _ci/keystore.jks.enc -out _ci/keystore.jks -d

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
@@ -125,7 +125,7 @@ GEM
     naturally (2.2.0)
     os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -154,6 +154,7 @@ GEM
     uber (0.1.0)
     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)
@@ -170,6 +171,7 @@ GEM
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   fastlane

README.md

@@ -1,9 +1,9 @@
-EVMap [![Build Status](https://travis-ci.org/johan12345/EVMap.svg?branch=master)](https://travis-ci.org/johan12345/EVMap)
+EVMap [![Build Status](https://app.travis-ci.com/johan12345/EVMap.svg?branch=master)](https://app.travis-ci.com/johan12345/EVMap)
 =====
 
 <img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
 
-Android app to access the goingelectric.de electric vehicle charging station directory.
+Android app to find electric vehicle charging stations.
 
 <a href="https://play.google.com/store/apps/details?id=net.vonforst.evmap" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="100"/></a>
@@ -14,11 +14,12 @@ Features
 --------
 
 - [Material Design](https://material.io/)
-- Shows all charging stations from the community-maintained [GoingElectric.de](https://www.goingelectric.de/stromtankstellen/) directory
-- Realtime availability information (beta)
-- Search places
+- Shows all charging stations from the community-maintained [GoingElectric.de](https://www.goingelectric.de/stromtankstellen/) and [Open Charge Map](https://openchargemap.org) directories
+- Realtime availability information (only in Europe)
+- Search for places
+- Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
-- Charging price comparison, powered by [Chargeprice.app](https://chargeprice.app)
+- Integrated price comparison using [Chargeprice.app](https://chargeprice.app) (only in Europe)
 - Android Auto integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
@@ -27,34 +28,22 @@ Features
 Screenshots
 -----------
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/01_main.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------
 
-The App is developed using Android Studio.
+The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
+the Git repository and open the project with Android Studio.
 
-For testing the app, you need to obtain free API Keys for the 
-[GoingElectric API](https://www.goingelectric.de/stromtankstellen/api/),
-the [Chargeprice API](https://github.com/chargeprice/chargeprice-api-docs)
-as well as for [Google APIs](https://console.developers.google.com/)
-("Maps SDK for Android" and "Places API" need to be activated) and/or [Mapbox](https://www.mapbox.com/). These APIs need to be put into the
-app in the form of a resource file called `apikeys.xml` under `app/src/main/res/values`, with the
-following content:
+The only exception is that you need to obtain some free API keys for the different data sources that
+EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
+`app/src/main/res/values`. You can find more information on which API keys are necessary for which
+features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-```xml
-<resources>
-    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
-        insert your Google Maps key here
-    </string>
-    <string name="mapbox_key" translatable="false">
-        insert your Mapbox key here
-    </string>
-    <string name="goingelectric_key" translatable="false">
-        insert your GoingElectric key here
-    </string>
-    <string name="chargeprice_key" translatable="false">
-        insert your Chargeprice key here
-    </string>
-</resources>
-```
+There are two different build flavors, `google` and `foss`, where only the `google` variant uses
+Google Maps data and provides the Android Auto integration. The `foss` variant only uses Mapbox data
+and should run on devices without Google Play Services.
+
+We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
+app.

_img/connectors/connector_ccs_typ1.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_5" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:1.7;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+</style>
+	<circle cx="9" cy="18.7" r="1.4" />
+	<circle cx="15" cy="18.7" r="1.4" />
+	<path class="st0" d="M8.9,16.1h6.2c1.5,0,2.7,1.2,2.7,2.7l0,0c0,1.5-1.2,2.7-2.7,2.7H8.9c-1.5,0-2.7-1.2-2.7-2.7l0,0
+	C6.2,17.3,7.4,16.1,8.9,16.1z" />
+	<g>
+	<circle cx="14.7" cy="6.4" r="1.3" />
+		<circle cx="15.3" cy="10.5" r="0.8" />
+		<circle cx="8.7" cy="10.5" r="0.8" />
+		<circle cx="9.3" cy="6.4" r="1.3" />
+		<circle cx="12" cy="13.1" r="1.3" />
+		<circle class="st1" cx="12" cy="9.1" r="6.3" />
+		<rect x="11" y="15.4" width="2" height="1.3" />
+		<line class="st2" x1="10.9" y1="1.3" x2="13.1" y2="1.3" />
+		<polygon points="13.1,0.9 13.1,2.4 14.5,3.1 13.8,1 	" />
+		<polygon points="10.9,0.9 10.9,2.4 9.5,3.1 10.2,1 	" />
+</g>
+</svg>

app/build.gradle

@@ -6,15 +6,15 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 46
-        versionName "0.7.2"
+        targetSdkVersion 31
+        versionCode 66
+        versionName "1.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -77,11 +77,21 @@ android {
         if (goingelectricKey != null) {
             variant.resValue "string", "goingelectric_key", goingelectricKey
         }
+        def openchargemapKey = env.OPENCHARGEMAP_API_KEY ?: project.findProperty("OPENCHARGEMAP_API_KEY")
+        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
+            openchargemapKey = decode(project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (openchargemapKey != null) {
+            variant.resValue "string", "openchargemap_key", openchargemapKey
+        }
         def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
         if (googleMapsKey != null && variant.flavorName == 'google') {
             variant.resValue "string", "google_maps_key", googleMapsKey
         }
         def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
         if (mapboxKey != null) {
             variant.resValue "string", "mapbox_key", mapboxKey
         }
@@ -93,103 +103,102 @@ android {
             variant.resValue "string", "chargeprice_key", chargepriceKey
         }
     }
+
+    lintOptions {
+        disable 'NullSafeMutableLiveData'
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.5.0-rc01'
-    implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.12.0'
     implementation 'moe.banana:moshi-jsonapi:3.5.0'
     implementation 'moe.banana:moshi-jsonapi-retrofit-converter:3.5.0'
     implementation 'io.coil-kt:coil:1.1.0'
-    implementation 'com.github.MikeOrtiz:TouchImageView:3.0.3'
+    implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
-    implementation 'com.airbnb.android:lottie:3.4.0'
-    implementation 'io.michaelrocks:bimap:1.0.2'
+    implementation 'com.airbnb.android:lottie:4.1.0'
+    implementation 'io.michaelrocks.bimap:bimap:1.1.0'
     implementation 'com.mapzen.android:lost:3.0.2'
     implementation 'com.google.guava:guava:29.0-android'
     implementation 'com.github.pengrad:mapscaleview:1.6.0'
+    implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.0.0-rc01'
+    googleImplementation 'androidx.car.app:app:1.1.0-rc01'
+    googleImplementation 'androidx.car.app:app-projected:1.1.0-rc01'
 
     // AnyMaps
-    def anyMapsVersion = '1f050d860f'
+    def anyMapsVersion = '751daec281'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
+    googleImplementation 'com.google.android.gms:play-services-maps:18.0.0'
     implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
 
-    // Google Maps v3 Beta
-    googleImplementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
-    googleImplementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
-    googleImplementation 'com.android.volley:volley:1.1.1'
-    googleImplementation 'com.google.android.gms:play-services-base:17.5.0'
-    googleImplementation 'com.google.android.gms:play-services-basement:17.5.0'
-    googleImplementation 'com.google.android.gms:play-services-gcm:17.0.0'
-    googleImplementation 'com.google.android.gms:play-services-location:17.1.0'
-    googleImplementation 'com.google.android.gms:play-services-tasks:17.2.0'
-    googleImplementation 'com.google.auto.value:auto-value-annotations:1.6.3'
-    googleImplementation 'com.google.code.gson:gson:2.8.6'
-    googleImplementation 'com.google.android.datatransport:transport-runtime:2.2.5'
-    googleImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    // Google Places
+    implementation 'com.google.android.libraries.places:places:2.5.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
 
-    // Mapbox places (autocomplete)
-    implementation('com.mapbox.mapboxsdk:mapbox-android-plugin-places-v9:0.12.0') {
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
-    }
+    // Mapbox Geocoding
+    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
 
     // navigation library
-    def nav_version = "2.3.2"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // viewmodel library
-    def lifecycle_version = "2.2.0"
+    def lifecycle_version = "2.4.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.2.6"
+    def room_version = "2.3.0"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
 
     // billing library
-    def billing_version = "3.0.2"
+    def billing_version = "4.0.0"
     googleImplementation "com.android.billingclient:billing:$billing_version"
     googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
 
+    // ACRA (crash reporting)
+    def acraVersion = "5.8.4"
+    implementation("ch.acra:acra-mail:$acraVersion")
+    implementation("ch.acra:acra-dialog:$acraVersion")
+    implementation("ch.acra:acra-limiter:$acraVersion")
+
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
 private static String decode(String s, String key) {

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,107 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="198.3471"
+    android:viewportHeight="198.3471">
+    <group
+        android:translateX="3.1735537"
+        android:translateY="3.1735537">
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M106.2,74.3h-7"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M106.2,60.3c0,0 -17.5,0 -17.5,0"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M93.9,79.5L88.7,79.5"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M94,79v16.2"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M106.2,60.3L99.2,74.3"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M106.2,74.3L93.9,95.2"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <path
+            android:pathData="M67.6,120.6L65.7,104l-2.9,0.3l1.9,16.6L67.6,120.6zM77.9,119.4l-1.9,-16.6l-2.9,0.3l1.9,16.6L77.9,119.4z"
+            android:fillColor="#808080" />
+        <path
+            android:pathData="M83.3,142c-0.9,1.1 -1.6,1.8 -1.7,1.9c-2.6,2.1 -4.7,2.7 -6.4,1.9c-3,-1.5 -2.8,-7.1 -2.7,-7.7l2.1,0.1c-0.1,1.6 0.2,5 1.6,5.7c0.8,0.4 2.2,-0.1 4,-1.6l0,0c0,0 5.8,-5.8 4.6,-10.4c-1.4,-5.5 5,-13.4 7.1,-16.1l0.3,-0.3l1.7,1.3l-0.3,0.4c-6.5,8 -7.2,12.1 -6.7,14.2C87.9,135.4 85.2,139.7 83.3,142z"
+            android:fillColor="#9e9e9e" />
+        <path
+            android:pathData="M61.2,120.4l0.8,6.8l6.3,4.2l8.5,-0.9l5.2,-5.5l-0.8,-6.8L61.2,120.4z"
+            android:fillColor="#9e9e9e" />
+        <path
+            android:pathData="M76.7,130.5l-8.5,0.9l1.8,7.5l6.7,-0.8L76.7,130.5L76.7,130.5zM82.8,112.5l0.7,6.2l-24.4,2.8l-0.7,-6.2L82.8,112.5z"
+            android:fillColor="#666666" />
+        <path
+            android:pathData="M101.9,44.1c-17.5,0 -31.7,14.2 -31.7,31.7c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5C133.6,58.2 119.4,44.1 101.9,44.1z"
+            android:fillColor="#737373" />
+        <path
+            android:pathData="M101.9,44.8c17.4,0 31.5,14 31.7,31.3c0,-0.1 0,-0.2 0,-0.3c0,-17.5 -14.2,-31.7 -31.7,-31.7S70.2,58.2 70.2,75.8c0,0.1 0,0.2 0,0.3C70.4,58.8 84.5,44.8 101.9,44.8L101.9,44.8z"
+            android:fillColor="#FFFFFF"
+            android:fillAlpha="0.2" />
+        <path
+            android:pathData="M103.8,145.5c-0.1,1 -0.9,1.7 -1.9,1.7s-1.8,-0.7 -1.9,-1.7c-3.1,-34 -29.6,-46.5 -29.8,-70.1c0,0.2 0,0.3 0,0.5c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5c0,-0.2 0,-0.3 0,-0.5C133.4,99 106.9,111.5 103.8,145.5L103.8,145.5z"
+            android:fillColor="#303030"
+            android:fillAlpha="0.2" />
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M94.6,60.3v19.2h5.2v15.7l12.2,-21h-7l7,-14C112.1,60.3 94.6,60.3 94.6,60.3z"
+            android:strokeAlpha="0.45"
+            android:fillAlpha="0.45" />
+    </group>
+</vector>

app/src/foss/java/net/vonforst/evmap/autocomplete/Autocomplete.kt

@@ -1,49 +1,5 @@
 package net.vonforst.evmap.autocomplete
 
 import android.content.Context
-import android.content.Intent
-import android.view.inputmethod.InputMethodManager
-import androidx.fragment.app.Fragment
-import com.car2go.maps.model.LatLng
-import com.car2go.maps.model.LatLngBounds
-import com.mapbox.geojson.BoundingBox
-import com.mapbox.geojson.Point
-import com.mapbox.mapboxsdk.plugins.places.autocomplete.PlaceAutocomplete
-import com.mapbox.mapboxsdk.plugins.places.autocomplete.model.PlaceOptions
-import net.vonforst.evmap.R
-import net.vonforst.evmap.fragment.REQUEST_AUTOCOMPLETE
-import net.vonforst.evmap.viewmodel.PlaceWithBounds
 
-
-fun launchAutocomplete(fragment: Fragment) {
-    val placeOptions = PlaceOptions.builder()
-        .build(PlaceOptions.MODE_CARDS)
-
-    val intent = PlaceAutocomplete.IntentBuilder()
-        .accessToken(fragment.getString(R.string.mapbox_key))
-        .placeOptions(placeOptions)
-        .build(fragment.requireActivity())
-        .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-    fragment.startActivityForResult(intent, REQUEST_AUTOCOMPLETE)
-
-    // show keyboard
-    val imm = fragment.requireContext()
-        .getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.toggleSoftInput(0, 0)
-}
-
-fun handleAutocompleteResult(intent: Intent): PlaceWithBounds? {
-    val place = PlaceAutocomplete.getPlace(intent) ?: return null
-    val bbox = place.bbox()?.toLatLngBounds()
-    val center = place.center()!!.toLatLng()
-    return PlaceWithBounds(center, bbox)
-}
-
-private fun BoundingBox.toLatLngBounds(): LatLngBounds {
-    return LatLngBounds(
-        southwest().toLatLng(),
-        northeast().toLatLng()
-    )
-}
-
-private fun Point.toLatLng(): LatLng = LatLng(this.latitude(), this.longitude())
+fun getAutocompleteProviders(context: Context) = listOf(MapboxAutocompleteProvider(context))

app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -27,14 +27,16 @@ class DonateFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
-        val navController = findNavController()
-        binding.toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
         binding.btnDonate.setOnClickListener {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }

app/src/foss/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

@@ -0,0 +1,16 @@
+package net.vonforst.evmap.fragment
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+class OnboardingViewPagerAdapter(fragment: Fragment) :
+    FragmentStateAdapter(fragment) {
+    override fun getItemCount(): Int = 3
+
+    override fun createFragment(position: Int): Fragment = when (position) {
+        0 -> WelcomeFragment()
+        1 -> IconsFragment()
+        2 -> DataSourceSelectFragment()
+        else -> throw IllegalArgumentException()
+    }
+}

app/src/foss/res/values-de/values.xml

@@ -3,6 +3,12 @@
     <string-array name="pref_map_provider_names">
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
     <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 30% Gebühren ab.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
 </resources>

app/src/foss/res/values/values.xml

@@ -6,6 +6,13 @@
     <string-array name="pref_map_provider_values" tranlatable="false">
         <item>mapbox</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="pref_map_provider_default" translatable="false">mapbox</string>
     <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>

app/src/google/AndroidManifest.xml

@@ -5,8 +5,14 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
 
-    <uses-sdk tools:overrideLibrary="androidx.car.app" />
+    <uses-sdk tools:overrideLibrary="androidx.car.app,androidx.car.app.projected" />
+
+    <queries>
+        <package android:name="com.google.android.projection.gearhead" />
+    </queries>
 
     <application>
         <meta-data
@@ -21,6 +27,10 @@
             android:name="androidx.car.app.theme"
             android:resource="@style/CarAppTheme" />
 
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1" />
+
         <service
             android:name=".auto.CarAppService"
             android:label="@string/app_name"
@@ -36,8 +46,7 @@
         <service
             android:name=".auto.CarLocationService"
             android:foregroundServiceType="location"
-            android:enabled="true" />
-
-        <activity android:name=".auto.PermissionActivity" />
+            android:enabled="true"
+            android:exported="false" />
     </application>
 </manifest>

app/src/google/java/net/vonforst/evmap/Inits.kt

@@ -5,10 +5,18 @@ import android.content.Context
 import android.util.Log
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.maps.MapsInitializer
 import com.google.android.libraries.places.api.Places
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.utils.LocaleContextWrapper
 
 fun init(context: Context) {
-    Places.initialize(context, context.getString(R.string.google_maps_key));
+    Places.initialize(context, context.getString(R.string.google_maps_key))
+
+    val localeContext = LocaleContextWrapper.wrap(
+        context.applicationContext, PreferenceDataSource(context).language
+    )
+    MapsInitializer.initialize(localeContext, MapsInitializer.Renderer.LATEST, null)
 }
 
 fun checkPlayServices(activity: Activity): Boolean {

app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt

@@ -1,54 +1,22 @@
 package net.vonforst.evmap.auto
 
-import android.Manifest
 import android.content.*
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
 import android.location.Location
-import android.net.Uri
-import android.os.Bundle
 import android.os.IBinder
-import android.os.ResultReceiver
-import android.text.SpannableStringBuilder
-import android.text.Spanned
 import androidx.car.app.CarContext
-import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.Session
-import androidx.car.app.model.*
-import androidx.car.app.model.Distance.UNIT_KILOMETERS
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.CarHardwareLocation
+import androidx.car.app.hardware.info.CarSensors
 import androidx.car.app.validation.HostValidator
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import coil.imageLoader
-import coil.request.ImageRequest
-import kotlinx.coroutines.*
-import net.vonforst.evmap.*
-import net.vonforst.evmap.api.availability.ChargeLocationStatus
-import net.vonforst.evmap.api.availability.ChargepointStatus
-import net.vonforst.evmap.api.availability.getAvailability
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.GoingElectricApi
-import net.vonforst.evmap.api.nameForPlugType
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.ui.ChargerIconGenerator
-import net.vonforst.evmap.ui.availabilityText
-import net.vonforst.evmap.ui.getMarkerTint
-import net.vonforst.evmap.utils.distanceBetween
-import java.io.IOException
-import java.time.Duration
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
-import kotlin.math.roundToInt
+import net.vonforst.evmap.utils.checkAnyLocationPermission
 
 
 interface LocationAwareScreen {
@@ -79,6 +47,9 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         }
     private var location: Location? = null
     private var locationService: CarLocationService? = null
+    private val hardwareMan: CarHardwareManager by lazy {
+        carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
 
     private val serviceConnection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
@@ -91,40 +62,53 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
             locationService = null
         }
     }
+    private var serviceBound = false
 
     init {
         lifecycle.addObserver(this)
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return if (locationPermissionGranted()) {
-            WelcomeScreen(carContext, this)
-        } else {
-            PermissionScreen(carContext, this)
-        }
+        return WelcomeScreen(carContext, this)
     }
 
-    private fun locationPermissionGranted() =
-        ContextCompat.checkSelfPermission(
-            carContext,
-            Manifest.permission.ACCESS_FINE_LOCATION
-        ) == PackageManager.PERMISSION_GRANTED
+    fun locationPermissionGranted() = carContext.checkAnyLocationPermission()
 
     private val locationReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             val location = intent.getParcelableExtra(CarLocationService.EXTRA_LOCATION) as Location?
-            val mapScreen = this@EVMapSession.mapScreen
-            if (location != null && mapScreen != null) {
-                mapScreen.updateLocation(location)
-            }
-            this@EVMapSession.location = location
+            updateLocation(location)
         }
     }
 
+    private fun updateLocation(location: Location?) {
+        val mapScreen = mapScreen
+        if (location != null && mapScreen != null) {
+            mapScreen.updateLocation(location)
+        }
+        this.location = location
+    }
+
+    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
+        updateLocation(loc.location.value)
+
+        // we successfully received a location from the car hardware,
+        // so we don't need the smartphone location anymore.
+        unbindLocationService()
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun bindLocationService() {
         if (!locationPermissionGranted()) return
-        cas.bindService(
+        if (supportsCarApiLevel3(carContext)) {
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carSensors.addCarHardwareLocationListener(
+                CarSensors.UPDATE_RATE_NORMAL,
+                exec,
+                ::onCarHardwareLocationReceived
+            )
+        }
+        serviceBound = cas.bindService(
             Intent(cas, CarLocationService::class.java),
             serviceConnection,
             Context.BIND_AUTO_CREATE
@@ -132,10 +116,18 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    private fun onStop() {
+        if (supportsCarApiLevel3(carContext)) {
+            hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
+        }
+        unbindLocationService()
+    }
+
     private fun unbindLocationService() {
-        locationService?.let { service ->
-            service.removeLocationUpdates()
+        locationService?.removeLocationUpdates()
+        if (serviceBound) {
             cas.unbindService(serviceConnection)
+            serviceBound = false
         }
     }
 
@@ -153,512 +145,3 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 }
 
-/**
- * Welcome screen with selection between favorites and nearby chargers
- */
-class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
-    private var location: Location? = null
-
-    override fun onGetTemplate(): Template {
-        session.mapScreen = this
-        return PlaceListMapTemplate.Builder().apply {
-            setTitle(carContext.getString(R.string.app_name))
-            location?.let {
-                setAnchor(Place.Builder(CarLocation.create(it)).build())
-            }
-            setItemList(ItemList.Builder().apply {
-                addItem(Row.Builder()
-                    .setTitle(carContext.getString(R.string.auto_chargers_closeby))
-                    .setImage(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_address
-                            )
-                        )
-                            .setTint(CarColor.DEFAULT).build()
-                    )
-                    .setBrowsable(true)
-                    .setOnClickListener {
-                        screenManager.push(MapScreen(carContext, session, favorites = false))
-                    }
-                    .build())
-                addItem(
-                    Row.Builder()
-                        .setTitle(carContext.getString(R.string.auto_favorites))
-                        .setImage(
-                            CarIcon.Builder(
-                                IconCompat.createWithResource(
-                                    carContext,
-                                    R.drawable.ic_fav
-                                )
-                            )
-                                .setTint(CarColor.DEFAULT).build()
-                        )
-                        .setBrowsable(true)
-                        .setOnClickListener {
-                            screenManager.push(MapScreen(carContext, session, favorites = true))
-                        }
-                        .build())
-            }.build())
-            setCurrentLocationEnabled(true)
-            setHeaderAction(Action.APP_ICON)
-            build()
-        }.build()
-    }
-
-    override fun updateLocation(location: Location) {
-        this.location = location
-        invalidate()
-    }
-}
-
-/**
- * Screen to grant location permission
- */
-class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
-    override fun onGetTemplate(): Template {
-        return MessageTemplate.Builder(carContext.getString(R.string.auto_location_permission_needed))
-            .setTitle(carContext.getString(R.string.app_name))
-            .setHeaderAction(Action.APP_ICON)
-            .addAction(
-                Action.Builder()
-                    .setTitle(carContext.getString(R.string.grant_on_phone))
-                    .setBackgroundColor(CarColor.PRIMARY)
-                    .setOnClickListener(ParkedOnlyOnClickListener.create {
-                        val intent = Intent(carContext, PermissionActivity::class.java)
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .putExtra(
-                                PermissionActivity.EXTRA_RESULT_RECEIVER,
-                                object : ResultReceiver(null) {
-                                    override fun onReceiveResult(
-                                        resultCode: Int,
-                                        resultData: Bundle?
-                                    ) {
-                                        if (resultData!!.getBoolean(PermissionActivity.RESULT_GRANTED)) {
-                                            session.bindLocationService()
-                                            screenManager.push(
-                                                WelcomeScreen(
-                                                    carContext,
-                                                    session
-                                                )
-                                            )
-                                        }
-                                    }
-                                })
-                        carContext.startActivity(intent)
-                        CarToast.makeText(
-                            carContext,
-                            R.string.opened_on_phone,
-                            CarToast.LENGTH_LONG
-                        ).show()
-                    })
-                    .build()
-            )
-            .addAction(
-                Action.Builder()
-                    .setTitle(carContext.getString(R.string.cancel))
-                    .setOnClickListener {
-                        carContext.finishCarApp()
-                    }
-                    .build(),
-            )
-            .build()
-    }
-}
-
-/**
- * Main map screen showing either nearby chargers or favorites
- */
-class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
-    Screen(ctx), LocationAwareScreen {
-    private var updateCoroutine: Job? = null
-    private var numUpdates = 0
-    private val maxNumUpdates = 3
-
-    private var location: Location? = null
-    private var lastUpdateLocation: Location? = null
-    private var chargers: List<ChargeLocation>? = null
-    private val api by lazy {
-        GoingElectricApi.create(ctx.getString(R.string.goingelectric_key), context = ctx)
-    }
-    private val searchRadius = 5 // kilometers
-    private val updateThreshold = 2000 // meters
-    private val availabilityUpdateThreshold = Duration.ofMinutes(1)
-    private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus>> =
-        HashMap()
-    private val maxRows = 6
-
-    override fun onGetTemplate(): Template {
-        session.mapScreen = this
-        return PlaceListMapTemplate.Builder().apply {
-            setTitle(
-                carContext.getString(
-                    if (favorites) {
-                        R.string.auto_favorites
-                    } else {
-                        R.string.auto_chargers_closeby
-                    }
-                )
-            )
-            location?.let {
-                setAnchor(Place.Builder(CarLocation.create(it)).build())
-            } ?: setLoading(true)
-            chargers?.take(maxRows)?.let { chargerList ->
-                val builder = ItemList.Builder()
-                chargerList.forEach { charger ->
-                    builder.addItem(formatCharger(charger))
-                }
-                builder.setNoItemsMessage(
-                    carContext.getString(
-                        if (favorites) {
-                            R.string.auto_no_favorites_found
-                        } else {
-                            R.string.auto_no_chargers_found
-                        }
-                    )
-                )
-                setItemList(builder.build())
-            } ?: setLoading(true)
-            setCurrentLocationEnabled(true)
-            setHeaderAction(Action.BACK)
-            build()
-        }.build()
-    }
-
-    private fun formatCharger(charger: ChargeLocation): Row {
-        val color = ContextCompat.getColor(carContext, getMarkerTint(charger))
-        val place =
-            Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
-                .setMarker(
-                    PlaceMarker.Builder()
-                        .setColor(CarColor.createCustom(color, color))
-                        .build()
-                )
-                .build()
-
-        return Row.Builder().apply {
-            setTitle(charger.name)
-            val text = SpannableStringBuilder()
-
-            // distance
-            location?.let {
-                val distance = distanceBetween(
-                    it.latitude, it.longitude,
-                    charger.coordinates.lat, charger.coordinates.lng
-                ) / 1000
-                text.append(
-                    "distance",
-                    DistanceSpan.create(Distance.create(distance, UNIT_KILOMETERS)),
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
-
-            // power
-            if (text.isNotEmpty()) text.append(" · ")
-            text.append("${charger.maxPower.roundToInt()} kW")
-
-            // availability
-            availabilities[charger.id]?.second?.let { av ->
-                val status = av.status.values.flatten()
-                val available = availabilityText(status)
-                val total = charger.chargepoints.sumBy { it.count }
-
-                if (text.isNotEmpty()) text.append(" · ")
-                text.append(
-                    "$available/$total",
-                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
-
-            addText(text)
-            setMetadata(
-                Metadata.Builder()
-                    .setPlace(place)
-                    .build()
-            )
-
-            setOnClickListener {
-                screenManager.push(ChargerDetailScreen(carContext, charger))
-            }
-        }.build()
-    }
-
-    override fun updateLocation(location: Location) {
-        this.location = location
-        if (updateCoroutine != null) {
-            // don't update while still loading last update
-            return
-        }
-
-        invalidate()
-
-        if (lastUpdateLocation == null ||
-            location.distanceTo(lastUpdateLocation) > updateThreshold
-        ) {
-            lastUpdateLocation = location
-            // update displayed chargers
-            loadChargers(location)
-        }
-    }
-
-    private val db = AppDatabase.getInstance(carContext)
-
-    private fun loadChargers(location: Location) {
-        numUpdates++
-        println(numUpdates)
-        if (numUpdates > maxNumUpdates) {
-            CarToast.makeText(carContext, R.string.auto_no_refresh_possible, CarToast.LENGTH_LONG)
-                .show()
-            return
-        }
-        updateCoroutine = lifecycleScope.launch {
-            try {
-                // load chargers
-                if (favorites) {
-                    chargers = db.chargeLocationsDao().getAllChargeLocationsAsync().sortedBy {
-                        distanceBetween(
-                            location.latitude, location.longitude,
-                            it.coordinates.lat, it.coordinates.lng
-                        )
-                    }
-                } else {
-                    val response = api.getChargepointsRadius(
-                        location.latitude,
-                        location.longitude,
-                        searchRadius,
-                        zoom = 16f
-                    )
-                    chargers =
-                        response.body()?.chargelocations?.filterIsInstance(ChargeLocation::class.java)
-                    chargers?.let {
-                        if (it.size < 6) {
-                            // try again with larger radius
-                            val response = api.getChargepointsRadius(
-                                location.latitude,
-                                location.longitude,
-                                searchRadius * 5,
-                                zoom = 16f
-                            )
-                            chargers =
-                                response.body()?.chargelocations?.filterIsInstance(ChargeLocation::class.java)
-                        }
-                    }
-                }
-
-                // remove outdated availabilities
-                availabilities = availabilities.filter {
-                    Duration.between(
-                        it.value.first,
-                        ZonedDateTime.now()
-                    ) > availabilityUpdateThreshold
-                }.toMutableMap()
-
-                // update availabilities
-                chargers?.take(maxRows)?.map {
-                    lifecycleScope.async {
-                        // update only if not yet stored
-                        if (!availabilities.containsKey(it.id)) {
-                            val date = ZonedDateTime.now()
-                            val availability = getAvailability(it).data
-                            if (availability != null) {
-                                availabilities[it.id] = date to availability
-                            }
-                        }
-                    }
-                }?.awaitAll()
-
-                updateCoroutine = null
-                invalidate()
-            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
-                        .show()
-                }
-            }
-        }
-    }
-}
-
-class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
-    var charger: ChargeLocation? = null
-    var photo: Bitmap? = null
-    private var availability: ChargeLocationStatus? = null
-
-    val apikey = ctx.getString(R.string.goingelectric_key)
-    private val api by lazy {
-        GoingElectricApi.create(apikey, context = ctx)
-    }
-
-    private val iconGen = ChargerIconGenerator(carContext, null, oversize = 1.4f, height = 64)
-
-    override fun onGetTemplate(): Template {
-        if (charger == null) loadCharger()
-
-        return PaneTemplate.Builder(
-            Pane.Builder().apply {
-                charger?.let { charger ->
-                    addRow(Row.Builder().apply {
-                        setTitle(charger.address.toString())
-
-                        val icon = iconGen.getBitmap(
-                            tint = getMarkerTint(charger),
-                            fault = charger.faultReport != null,
-                            multi = charger.isMulti()
-                        )
-                        setImage(
-                            CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
-                            Row.IMAGE_TYPE_LARGE
-                        )
-
-                        val chargepointsText = SpannableStringBuilder()
-                        charger.chargepointsMerged.forEachIndexed { i, cp ->
-                            if (i > 0) chargepointsText.append(" · ")
-                            chargepointsText.append(
-                                "${cp.count}× ${
-                                    nameForPlugType(
-                                        carContext,
-                                        cp.type
-                                    )
-                                } ${cp.formatPower()}"
-                            )
-                            availability?.status?.get(cp)?.let { status ->
-                                chargepointsText.append(
-                                    " (${availabilityText(status)}/${cp.count})",
-                                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
-                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                                )
-                            }
-                        }
-                        addText(chargepointsText)
-                    }.build())
-                    addRow(Row.Builder().apply {
-                        photo?.let {
-                            setImage(
-                                CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
-                                Row.IMAGE_TYPE_LARGE
-                            )
-                        }
-                        val operatorText = StringBuilder().apply {
-                            charger.operator?.let { append(it) }
-                            charger.network?.let {
-                                if (isNotEmpty()) append(" · ")
-                                append(it)
-                            }
-                        }
-                        setTitle(operatorText)
-
-                        charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
-                        charger.faultReport?.created?.let {
-                            addText(
-                                carContext.getString(
-                                    R.string.auto_fault_report_date,
-                                    it.atZone(ZoneId.systemDefault())
-                                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
-                                )
-                            )
-                        }
-
-                        /*val types = charger.chargepoints.map { it.type }.distinct()
-                        if (types.size == 1) {
-                            setImage(
-                                CarIcon.of(IconCompat.createWithResource(carContext, iconForPlugType(types[0]))),
-                                Row.IMAGE_TYPE_ICON)
-                        }*/
-                    }.build())
-                    addAction(Action.Builder()
-                        .setIcon(
-                            CarIcon.Builder(
-                                IconCompat.createWithResource(
-                                    carContext,
-                                    R.drawable.ic_navigation
-                                )
-                            ).build()
-                        )
-                        .setTitle(carContext.getString(R.string.navigate))
-                        .setBackgroundColor(CarColor.PRIMARY)
-                        .setOnClickListener {
-                            navigateToCharger(charger)
-                        }
-                        .build())
-                    addAction(
-                        Action.Builder()
-                            .setTitle(carContext.getString(R.string.open_in_app))
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                val intent = Intent(carContext, MapsActivity::class.java)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    .putExtra(EXTRA_CHARGER_ID, charger.id)
-                                    .putExtra(EXTRA_LAT, charger.coordinates.lat)
-                                    .putExtra(EXTRA_LON, charger.coordinates.lng)
-                                carContext.startActivity(intent)
-                                CarToast.makeText(
-                                    carContext,
-                                    R.string.opened_on_phone,
-                                    CarToast.LENGTH_LONG
-                                ).show()
-                            })
-                            .build()
-                    )
-                } ?: setLoading(true)
-            }.build()
-        ).apply {
-            setTitle(chargerSparse.name)
-            setHeaderAction(Action.BACK)
-        }.build()
-    }
-
-    private fun navigateToCharger(charger: ChargeLocation) {
-        val coord = charger.coordinates
-        val intent =
-            Intent(
-                CarContext.ACTION_NAVIGATE,
-                Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
-            )
-        carContext.startCarApp(intent)
-    }
-
-    private fun loadCharger() {
-        lifecycleScope.launch {
-            try {
-                val response = api.getChargepointDetail(chargerSparse.id)
-                charger = response.body()?.chargelocations?.get(0) as ChargeLocation
-
-                val photo = charger?.photos?.firstOrNull()
-                photo?.let {
-                    val size = (carContext.resources.displayMetrics.density * 64).roundToInt()
-                    val url = "https://api.goingelectric.de/chargepoints/photo/?key=${apikey}" +
-                            "&id=${photo.id}&size=${size}"
-                    val request = ImageRequest.Builder(carContext).data(url).build()
-                    this@ChargerDetailScreen.photo =
-                        (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap
-                }
-
-                availability = charger?.let { getAvailability(it).data }
-
-                invalidate()
-            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
-                        .show()
-                }
-            }
-        }
-    }
-}
-
-fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
-    val unknown = status.any { it == ChargepointStatus.UNKNOWN }
-    val available = status.count { it == ChargepointStatus.AVAILABLE }
-    val allFaulted = status.all { it == ChargepointStatus.FAULTED }
-
-    return if (unknown) {
-        CarColor.DEFAULT
-    } else if (available > 0) {
-        CarColor.GREEN
-    } else if (allFaulted) {
-        CarColor.RED
-    } else {
-        CarColor.BLUE
-    }
-}

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

@@ -0,0 +1,295 @@
+package net.vonforst.evmap.auto
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.Screen
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.Model
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import moe.banana.jsonapi2.HasMany
+import moe.banana.jsonapi2.HasOne
+import moe.banana.jsonapi2.JsonBuffer
+import moe.banana.jsonapi2.ResourceIdentifier
+import net.vonforst.evmap.*
+import net.vonforst.evmap.api.chargeprice.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.currency
+import java.io.IOException
+
+class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(ctx) {
+    private val prefs = PreferenceDataSource(ctx)
+    private val db = AppDatabase.getInstance(carContext)
+    private val api by lazy {
+        ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
+    }
+    private var prices: List<ChargePrice>? = null
+    private var meta: ChargepriceChargepointMeta? = null
+    private val maxRows = 6
+    private var errorMessage: String? = null
+    private val batteryRange = listOf(20.0, 80.0)
+
+    override fun onGetTemplate(): Template {
+        if (prices == null) loadData()
+
+        return ListTemplate.Builder().apply {
+            setTitle(
+                carContext.getString(
+                    R.string.chargeprice_battery_range,
+                    batteryRange[0],
+                    batteryRange[1]
+                ) + " · " + carContext.getString(R.string.powered_by_chargeprice)
+            )
+            setHeaderAction(Action.BACK)
+            if (prices == null && errorMessage == null) {
+                setLoading(true)
+            } else {
+                setSingleList(ItemList.Builder().apply {
+                    setNoItemsMessage(
+                        errorMessage ?: carContext.getString(R.string.chargeprice_no_tariffs_found)
+                    )
+                    prices?.take(maxRows)?.forEach { price ->
+                        addItem(Row.Builder().apply {
+                            setTitle(formatProvider(price))
+                            addText(formatPrice(price))
+                        }.build())
+                    }
+                }.build())
+            }
+            setActionStrip(
+                ActionStrip.Builder().addAction(
+                    Action.Builder().setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_chargeprice
+                            )
+                        ).build()
+                    ).setOnClickListener {
+                        val intent = CustomTabsIntent.Builder()
+                            .setDefaultColorSchemeParams(
+                                CustomTabColorSchemeParams.Builder()
+                                    .setToolbarColor(
+                                        ContextCompat.getColor(
+                                            carContext,
+                                            R.color.colorPrimary
+                                        )
+                                    )
+                                    .build()
+                            )
+                            .build().intent
+                        intent.data =
+                            Uri.parse("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=${getDataAdapter()}")
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        try {
+                            carContext.startActivity(intent)
+                            CarToast.makeText(
+                                carContext,
+                                R.string.opened_on_phone,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        } catch (e: ActivityNotFoundException) {
+                            CarToast.makeText(
+                                carContext,
+                                R.string.no_browser_app_found,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        }
+                    }.build()
+                ).build()
+            )
+        }.build()
+    }
+
+    private fun formatProvider(price: ChargePrice): String {
+        if (!price.tariffName.startsWith(price.provider)) {
+            return price.provider + " " + price.tariffName
+        } else {
+            return price.tariffName
+        }
+    }
+
+    private fun formatPrice(price: ChargePrice): String {
+        val totalPrice = carContext.getString(
+            R.string.charge_price_format,
+            price.chargepointPrices.first().price,
+            currency(price.currency)
+        )
+        val kwhPrice = if (price.chargepointPrices.first().price > 0f) {
+            carContext.getString(
+                if (price.chargepointPrices[0].priceDistribution.isOnlyKwh) {
+                    R.string.charge_price_kwh_format
+                } else {
+                    R.string.charge_price_average_format
+                },
+                price.chargepointPrices.get(0).price / meta!!.energy,
+                currency(price.currency)
+            )
+        } else null
+        val monthlyFees = if (price.totalMonthlyFee > 0 || price.monthlyMinSales > 0) {
+            price.formatMonthlyFees(carContext)
+        } else null
+        var text = totalPrice
+        if (kwhPrice != null && monthlyFees != null) {
+            text += " ($kwhPrice, $monthlyFees)"
+        } else if (kwhPrice != null) {
+            text += " ($kwhPrice)"
+        } else if (monthlyFees != null) {
+            text += " ($monthlyFees)"
+        }
+        return text
+    }
+
+    private fun loadData() {
+        if (supportsCarApiLevel3(carContext)) {
+            val exec = ContextCompat.getMainExecutor(carContext)
+            val hardwareMan =
+                carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+            hardwareMan.carInfo.fetchModel(exec) { model ->
+                loadPrices(model)
+            }
+        } else {
+            loadPrices(null)
+        }
+    }
+
+    private fun loadPrices(model: Model?) {
+        val dataAdapter = getDataAdapter() ?: return
+        val manufacturer = model?.manufacturer?.value
+        val modelName = model?.name?.value
+        lifecycleScope.launch {
+            try {
+                var vehicles = api.getVehicles().filter {
+                    it.id in prefs.chargepriceMyVehicles
+                }
+                if (vehicles.isEmpty()) {
+                    errorMessage = carContext.getString(R.string.chargeprice_select_car_first)
+                    invalidate()
+                    return@launch
+                } else if (vehicles.size > 1) {
+                    if (manufacturer != null && modelName != null) {
+                        vehicles = vehicles.filter {
+                            it.brand == manufacturer && it.name.startsWith(modelName)
+                        }
+                        if (vehicles.isEmpty()) {
+                            errorMessage = carContext.getString(
+                                R.string.auto_chargeprice_vehicle_unknown,
+                                manufacturer,
+                                modelName
+                            )
+                            invalidate()
+                            return@launch
+                        } else if (vehicles.size > 1) {
+                            errorMessage = carContext.getString(
+                                R.string.auto_chargeprice_vehicle_ambiguous,
+                                manufacturer,
+                                modelName
+                            )
+                            invalidate()
+                            return@launch
+                        }
+                    } else {
+                        errorMessage =
+                            carContext.getString(R.string.auto_chargeprice_vehicle_unavailable)
+                        invalidate()
+                        return@launch
+                    }
+                }
+                val car = vehicles[0]
+
+                val cpStation = ChargepriceStation.fromEvmap(charger, car.compatibleEvmapConnectors)
+                val result = api.getChargePrices(ChargepriceRequest().apply {
+                    this.dataAdapter = dataAdapter
+                    station = cpStation
+                    vehicle = HasOne(car)
+                    tariffs = if (!prefs.chargepriceMyTariffsAll) {
+                        val myTariffs = prefs.chargepriceMyTariffs ?: emptySet()
+                        HasMany<ChargepriceTariff>(*myTariffs.map {
+                            ResourceIdentifier(
+                                "tariff",
+                                it
+                            )
+                        }.toTypedArray()).apply {
+                            meta = JsonBuffer.create(
+                                ChargepriceApi.moshi.adapter(ChargepriceRequestTariffMeta::class.java),
+                                ChargepriceRequestTariffMeta(ChargepriceInclude.ALWAYS)
+                            )
+                        }
+                    } else null
+                    options = ChargepriceOptions(
+                        batteryRange = batteryRange,
+                        providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
+                        maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
+                        currency = prefs.chargepriceCurrency
+                    )
+                }, ChargepriceApi.getChargepriceLanguage())
+
+                val myTariffs = prefs.chargepriceMyTariffs
+
+                // choose the highest power chargepoint compatible with the car
+                val chargepoint = cpStation.chargePoints.filterIndexed { i, cp ->
+                    charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+                }.maxByOrNull { it.power }
+                if (chargepoint == null) {
+                    errorMessage =
+                        carContext.getString(R.string.chargeprice_no_compatible_connectors)
+                    invalidate()
+                    return@launch
+                }
+                meta =
+                    (result.meta.get<ChargepriceMeta>(ChargepriceApi.moshi.adapter(ChargepriceMeta::class.java)) as ChargepriceMeta).chargePoints.filterIndexed { i, cp ->
+                        charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+                    }.maxByOrNull {
+                        it.power
+                    }
+
+                prices = result.map { cp ->
+                    val filteredPrices =
+                        cp.chargepointPrices.filter {
+                            it.plug == chargepoint.plug && it.power == chargepoint.power
+                        }
+                    if (filteredPrices.isEmpty()) {
+                        null
+                    } else {
+                        cp.clone().apply {
+                            chargepointPrices = filteredPrices
+                        }
+                    }
+                }.filterNotNull()
+                    .sortedBy { it.chargepointPrices.first().price }
+                    .sortedByDescending {
+                        prefs.chargepriceMyTariffsAll ||
+                                myTariffs != null && it.tariff?.get()?.id in myTariffs
+                    }
+                invalidate()
+            } catch (e: IOException) {
+                withContext(Dispatchers.Main) {
+                    CarToast.makeText(
+                        carContext,
+                        R.string.chargeprice_connection_error,
+                        CarToast.LENGTH_LONG
+                    )
+                        .show()
+                }
+            }
+        }
+    }
+
+    private fun getDataAdapter(): String? = when (charger.dataSource) {
+        "goingelectric" -> ChargepriceApi.DATA_SOURCE_GOINGELECTRIC
+        "openchargemap" -> ChargepriceApi.DATA_SOURCE_OPENCHARGEMAP
+        else -> null
+    }
+}

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

@@ -0,0 +1,237 @@
+package net.vonforst.evmap.auto
+
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.Screen
+import androidx.car.app.model.*
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import coil.imageLoader
+import coil.request.ImageRequest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.vonforst.evmap.*
+import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.api.availability.getAvailability
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
+import net.vonforst.evmap.api.createApi
+import net.vonforst.evmap.api.nameForPlugType
+import net.vonforst.evmap.api.stringProvider
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.ChargerIconGenerator
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.viewmodel.Status
+import net.vonforst.evmap.viewmodel.getReferenceData
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import kotlin.math.roundToInt
+
+class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
+    var charger: ChargeLocation? = null
+    var photo: Bitmap? = null
+    private var availability: ChargeLocationStatus? = null
+
+    val prefs = PreferenceDataSource(ctx)
+    private val db = AppDatabase.getInstance(carContext)
+    private val api by lazy {
+        createApi(prefs.dataSource, ctx)
+    }
+    private val referenceData = api.getReferenceData(lifecycleScope, carContext)
+
+    private val imageSize = 128  // images should be 128dp according to docs
+
+    private val iconGen =
+        ChargerIconGenerator(carContext, null, oversize = 1.4f, height = imageSize)
+
+    init {
+        referenceData.observe(this) {
+            loadCharger()
+        }
+    }
+
+    override fun onGetTemplate(): Template {
+        if (charger == null) loadCharger()
+
+        return PaneTemplate.Builder(
+            Pane.Builder().apply {
+                charger?.let { charger ->
+                    addRow(Row.Builder().apply {
+                        setTitle(charger.address.toString())
+
+                        val icon = iconGen.getBitmap(
+                            tint = getMarkerTint(charger),
+                            fault = charger.faultReport != null,
+                            multi = charger.isMulti()
+                        )
+                        setImage(
+                            CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
+                            Row.IMAGE_TYPE_LARGE
+                        )
+
+                        val chargepointsText = SpannableStringBuilder()
+                        charger.chargepointsMerged.forEachIndexed { i, cp ->
+                            if (i > 0) chargepointsText.append(" · ")
+                            chargepointsText.append(
+                                "${cp.count}× ${
+                                    nameForPlugType(
+                                        carContext.stringProvider(),
+                                        cp.type
+                                    )
+                                } ${cp.formatPower()}"
+                            )
+                            availability?.status?.get(cp)?.let { status ->
+                                chargepointsText.append(
+                                    " (${availabilityText(status)}/${cp.count})",
+                                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
+                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                                )
+                            }
+                        }
+                        addText(chargepointsText)
+                    }.build())
+                    addRow(Row.Builder().apply {
+                        photo?.let {
+                            setImage(
+                                CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
+                                Row.IMAGE_TYPE_LARGE
+                            )
+                        }
+                        val operatorText = StringBuilder().apply {
+                            charger.operator?.let { append(it) }
+                            charger.network?.let {
+                                if (isNotEmpty()) append(" · ")
+                                append(it)
+                            }
+                        }.ifEmpty {
+                            carContext.getString(R.string.unknown_operator)
+                        }
+                        setTitle(operatorText)
+
+                        charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
+                        charger.faultReport?.created?.let {
+                            addText(
+                                carContext.getString(
+                                    R.string.auto_fault_report_date,
+                                    it.atZone(ZoneId.systemDefault())
+                                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
+                                )
+                            )
+                        }
+
+                        /*val types = charger.chargepoints.map { it.type }.distinct()
+                        if (types.size == 1) {
+                            setImage(
+                                CarIcon.of(IconCompat.createWithResource(carContext, iconForPlugType(types[0]))),
+                                Row.IMAGE_TYPE_ICON)
+                        }*/
+                    }.build())
+                    addAction(Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_navigation
+                                )
+                            ).build()
+                        )
+                        .setTitle(carContext.getString(R.string.navigate))
+                        .setBackgroundColor(CarColor.PRIMARY)
+                        .setOnClickListener {
+                            navigateToCharger(charger)
+                        }
+                        .build())
+                    charger.chargepriceData?.country?.let { country ->
+                        if (ChargepriceApi.isCountrySupported(country, charger.dataSource)) {
+                            addAction(Action.Builder()
+                                .setIcon(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_chargeprice
+                                        )
+                                    ).build()
+                                )
+                                .setTitle(carContext.getString(R.string.auto_prices))
+                                .setOnClickListener {
+                                    screenManager.push(ChargepriceScreen(carContext, charger))
+                                }
+                                .build())
+                        }
+                    }
+                } ?: setLoading(true)
+            }.build()
+        ).apply {
+            setTitle(chargerSparse.name)
+            setHeaderAction(Action.BACK)
+            setActionStrip(
+                ActionStrip.Builder().addAction(
+                    Action.Builder()
+                        .setTitle(carContext.getString(R.string.open_in_app))
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            val intent = Intent(carContext, MapsActivity::class.java)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .putExtra(EXTRA_CHARGER_ID, chargerSparse.id)
+                                .putExtra(EXTRA_LAT, chargerSparse.coordinates.lat)
+                                .putExtra(EXTRA_LON, chargerSparse.coordinates.lng)
+                            carContext.startActivity(intent)
+                            CarToast.makeText(
+                                carContext,
+                                R.string.opened_on_phone,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        })
+                        .build()
+                ).build()
+            )
+        }.build()
+    }
+
+    private fun navigateToCharger(charger: ChargeLocation) {
+        val coord = charger.coordinates
+        val intent =
+            Intent(
+                CarContext.ACTION_NAVIGATE,
+                Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
+            )
+        carContext.startCarApp(intent)
+    }
+
+    private fun loadCharger() {
+        val referenceData = referenceData.value ?: return
+        lifecycleScope.launch {
+            val response = api.getChargepointDetail(referenceData, chargerSparse.id)
+            if (response.status == Status.SUCCESS) {
+                charger = response.data!!
+
+                val photo = charger?.photos?.firstOrNull()
+                photo?.let {
+                    val size = (carContext.resources.displayMetrics.density * 64).roundToInt()
+                    val url = photo.getUrl(size = size)
+                    val request = ImageRequest.Builder(carContext).data(url).build()
+                    this@ChargerDetailScreen.photo =
+                        (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap
+                }
+
+                availability = charger?.let { getAvailability(it).data }
+
+                invalidate()
+            } else {
+                withContext(Dispatchers.Main) {
+                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
+                        .show()
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,93 @@
+package net.vonforst.evmap.auto
+
+import android.graphics.Bitmap
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.*
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.LiveData
+import net.vonforst.evmap.R
+import net.vonforst.evmap.model.FILTERS_CUSTOM
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.FilterProfile
+import net.vonforst.evmap.storage.PreferenceDataSource
+import kotlin.math.roundToInt
+
+class FilterScreen(ctx: CarContext) : Screen(ctx) {
+    private val prefs = PreferenceDataSource(ctx)
+    private val db = AppDatabase.getInstance(ctx)
+    val filterProfiles: LiveData<List<FilterProfile>> by lazy {
+        db.filterProfileDao().getProfiles(prefs.dataSource)
+    }
+    private val maxRows = 6
+    private val checkIcon =
+        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_check)).build()
+    private val emptyIcon: CarIcon
+
+    init {
+        val size = (ctx.resources.displayMetrics.density * 24).roundToInt()
+        emptyIcon = Bitmap.createBitmap(
+            size,
+            size,
+            Bitmap.Config.ARGB_8888
+        ).asCarIcon()
+    }
+
+    init {
+        filterProfiles.observe(this) {
+            invalidate()
+        }
+    }
+
+    override fun onGetTemplate(): Template {
+        val filterStatus =
+            prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+                ?: FILTERS_DISABLED
+        return ListTemplate.Builder().apply {
+            filterProfiles.value?.let {
+                setSingleList(buildFilterProfilesList(it.take(maxRows), filterStatus))
+            } ?: setLoading(true)
+            setTitle(carContext.getString(R.string.menu_filter))
+            setHeaderAction(Action.BACK)
+        }.build()
+    }
+
+    private fun buildFilterProfilesList(
+        profiles: List<FilterProfile>,
+        filterStatus: Long
+    ): ItemList {
+        return ItemList.Builder().apply {
+            addItem(Row.Builder().apply {
+                setTitle(carContext.getString(R.string.no_filters))
+                if (FILTERS_DISABLED == filterStatus) {
+                    setImage(checkIcon)
+                } else {
+                    setImage(emptyIcon)
+                }
+                setOnClickListener {
+                    prefs.filterStatus = FILTERS_DISABLED
+                    screenManager.pop()
+                }
+            }.build())
+            profiles.forEach {
+                addItem(Row.Builder().apply {
+                    val name =
+                        it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
+                    setTitle(name)
+                    if (it.id == filterStatus) {
+                        setImage(checkIcon)
+                    } else {
+                        setImage(emptyIcon)
+                    }
+                    setOnClickListener {
+                        prefs.filterStatus = it.id
+                        screenManager.pop()
+                    }
+                }.build())
+            }
+            setNoItemsMessage(carContext.getString(R.string.filterprofiles_empty_state))
+        }.build()
+    }
+}

app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt

@@ -0,0 +1,383 @@
+package net.vonforst.evmap.auto
+
+import android.content.pm.PackageManager
+import android.location.Location
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.Screen
+import androidx.car.app.constraints.ConstraintManager
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.lifecycleScope
+import com.car2go.maps.model.LatLng
+import kotlinx.coroutines.*
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.api.availability.getAvailability
+import net.vonforst.evmap.api.createApi
+import net.vonforst.evmap.api.stringProvider
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.FILTERS_CUSTOM
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.utils.distanceBetween
+import net.vonforst.evmap.viewmodel.filtersWithValue
+import net.vonforst.evmap.viewmodel.getFilterValues
+import net.vonforst.evmap.viewmodel.getFilters
+import net.vonforst.evmap.viewmodel.getReferenceData
+import java.io.IOException
+import java.time.Duration
+import java.time.Instant
+import java.time.ZonedDateTime
+import kotlin.collections.set
+import kotlin.math.roundToInt
+
+/**
+ * Main map screen showing either nearby chargers or favorites
+ */
+class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
+    Screen(ctx), LocationAwareScreen {
+    private var updateCoroutine: Job? = null
+    private var numUpdates = 0
+
+    /* Updating map contents is disabled - if the user uses Chargeprice from the charger
+       detail screen, this already means 4 steps, after which the app would crash.
+       follow https://issuetracker.google.com/issues/176694222 for updates how to solve this. */
+    private val maxNumUpdates = 1
+
+    private var location: Location? = null
+    private var lastChargerUpdateLocation: Location? = null
+    private var lastDistanceUpdateTime: Instant? = null
+    private var chargers: List<ChargeLocation>? = null
+    private var prefs = PreferenceDataSource(ctx)
+    private val db = AppDatabase.getInstance(carContext)
+    private val api by lazy {
+        createApi(prefs.dataSource, ctx)
+    }
+    private val searchRadius = 5 // kilometers
+    private val chargerUpdateThreshold = 2000 // meters
+    private val distanceUpdateThreshold = Duration.ofSeconds(15)
+    private val availabilityUpdateThreshold = Duration.ofMinutes(1)
+    private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus>> =
+        HashMap()
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST)
+    } else 6
+
+    private val referenceData = api.getReferenceData(lifecycleScope, carContext)
+    private val filterStatus = MutableLiveData<Long>().apply {
+        value = prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+            ?: FILTERS_DISABLED
+    }
+    private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
+    private val filters = api.getFilters(referenceData, carContext.stringProvider())
+    private val filtersWithValue = filtersWithValue(filters, filterValues)
+
+    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private var energyLevel: EnergyLevel? = null
+
+    init {
+        filtersWithValue.observe(this) {
+            loadChargers()
+        }
+    }
+
+    override fun onGetTemplate(): Template {
+        session.mapScreen = this
+        return PlaceListMapTemplate.Builder().apply {
+            setTitle(
+                carContext.getString(
+                    if (favorites) {
+                        R.string.auto_favorites
+                    } else {
+                        R.string.auto_chargers_closeby
+                    }
+                )
+            )
+            location?.let {
+                setAnchor(Place.Builder(CarLocation.create(it)).build())
+            } ?: setLoading(true)
+            chargers?.take(maxRows)?.let { chargerList ->
+                val builder = ItemList.Builder()
+                // only show the city if not all chargers are in the same city
+                val showCity = chargerList.map { it.address.city }.distinct().size > 1
+                chargerList.forEach { charger ->
+                    builder.addItem(formatCharger(charger, showCity))
+                }
+                builder.setNoItemsMessage(
+                    carContext.getString(
+                        if (favorites) {
+                            R.string.auto_no_favorites_found
+                        } else {
+                            R.string.auto_no_chargers_found
+                        }
+                    )
+                )
+                setItemList(builder.build())
+            } ?: setLoading(true)
+            setCurrentLocationEnabled(true)
+            setHeaderAction(Action.BACK)
+            if (!favorites) {
+                val filtersCount = filtersWithValue.value?.count {
+                    !it.value.hasSameValueAs(it.filter.defaultValue())
+                }
+
+                setActionStrip(
+                    ActionStrip.Builder()
+                        .addAction(
+                            Action.Builder()
+                                .setIcon(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_filter
+                                        )
+                                    )
+                                        .setTint(if (filtersCount != null && filtersCount > 0) CarColor.SECONDARY else CarColor.DEFAULT)
+                                        .build()
+                        )
+                        .setOnClickListener {
+                            screenManager.pushForResult(FilterScreen(carContext)) {
+                                chargers = null
+                                numUpdates = 0
+                                filterStatus.value =
+                                    prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+                                        ?: FILTERS_DISABLED
+                            }
+                            session.mapScreen = null
+                        }
+                        .build())
+                    .build())
+            }
+            build()
+        }.build()
+    }
+
+    private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
+        val markerTint = if (charger.maxPower > 100) {
+            R.color.charger_100kw_dark  // slightly darker color for better contrast
+        } else {
+            getMarkerTint(charger)
+        }
+        val color = ContextCompat.getColor(carContext, markerTint)
+        val place =
+            Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
+                .setMarker(
+                    PlaceMarker.Builder()
+                        .setColor(CarColor.createCustom(color, color))
+                        .build()
+                )
+                .build()
+
+        return Row.Builder().apply {
+            // only show the city if not all chargers are in the same city (-> showCity == true)
+            // and the city is not already contained in the charger name
+            if (showCity && charger.address.city != null && charger.address.city !in charger.name) {
+                setTitle(
+                    CarText.Builder("${charger.name} · ${charger.address.city}")
+                    .addVariant(charger.name)
+                    .build())
+            } else {
+                setTitle(charger.name)
+            }
+
+            val text = SpannableStringBuilder()
+
+            // distance
+            location?.let {
+                val distanceMeters = distanceBetween(
+                    it.latitude, it.longitude,
+                    charger.coordinates.lat, charger.coordinates.lng
+                )
+                text.append(
+                    "distance",
+                    DistanceSpan.create(
+                        roundValueToDistance(
+                            distanceMeters,
+                            energyLevel?.distanceDisplayUnit?.value
+                        )
+                    ),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
+
+            // power
+            if (text.isNotEmpty()) text.append(" · ")
+            text.append("${charger.maxPower.roundToInt()} kW")
+
+            // availability
+            availabilities[charger.id]?.second?.let { av ->
+                val status = av.status.values.flatten()
+                val available = availabilityText(status)
+                val total = charger.chargepoints.sumBy { it.count }
+
+                if (text.isNotEmpty()) text.append(" · ")
+                text.append(
+                    "$available/$total",
+                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
+
+            addText(text)
+            setMetadata(
+                Metadata.Builder()
+                    .setPlace(place)
+                    .build()
+            )
+
+            setOnClickListener {
+                screenManager.push(ChargerDetailScreen(carContext, charger))
+            }
+        }.build()
+    }
+
+    override fun updateLocation(location: Location) {
+        if (location.latitude == this.location?.latitude
+            && location.longitude == this.location?.longitude
+        ) {
+            return
+        }
+        this.location = location
+        if (updateCoroutine != null) {
+            // don't update while still loading last update
+            return
+        }
+
+        val now = Instant.now()
+        if (lastDistanceUpdateTime == null ||
+            Duration.between(lastDistanceUpdateTime, now) > distanceUpdateThreshold
+        ) {
+            lastDistanceUpdateTime = now
+            // update displayed distances
+            invalidate()
+        }
+
+        if (lastChargerUpdateLocation == null ||
+            location.distanceTo(lastChargerUpdateLocation) > chargerUpdateThreshold
+        ) {
+            lastChargerUpdateLocation = location
+            // update displayed chargers
+            loadChargers()
+        }
+    }
+
+    private fun loadChargers() {
+        val location = location ?: return
+        val referenceData = referenceData.value ?: return
+        val filters = filtersWithValue.value ?: return
+
+        numUpdates++
+        println(numUpdates)
+        if (numUpdates > maxNumUpdates) {
+            /*CarToast.makeText(carContext, R.string.auto_no_refresh_possible, CarToast.LENGTH_LONG)
+                .show()*/
+            return
+        }
+        updateCoroutine = lifecycleScope.launch {
+            try {
+                // load chargers
+                if (favorites) {
+                    chargers = db.chargeLocationsDao().getAllChargeLocationsAsync().sortedBy {
+                        distanceBetween(
+                            location.latitude, location.longitude,
+                            it.coordinates.lat, it.coordinates.lng
+                        )
+                    }
+                } else {
+                    val response = api.getChargepointsRadius(
+                        referenceData,
+                        LatLng.fromLocation(location),
+                        searchRadius,
+                        zoom = 16f,
+                        filters
+                    )
+                    chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
+                    chargers?.let {
+                        if (it.size < maxRows) {
+                            // try again with larger radius
+                            val response = api.getChargepointsRadius(
+                                referenceData,
+                                LatLng.fromLocation(location),
+                                searchRadius * 10,
+                                zoom = 16f,
+                                filters
+                            )
+                            chargers =
+                                response.data?.filterIsInstance(ChargeLocation::class.java)
+                        }
+                    }
+                }
+
+                // remove outdated availabilities
+                availabilities = availabilities.filter {
+                    Duration.between(
+                        it.value.first,
+                        ZonedDateTime.now()
+                    ) > availabilityUpdateThreshold
+                }.toMutableMap()
+
+                // update availabilities
+                chargers?.take(maxRows)?.map {
+                    lifecycleScope.async {
+                        // update only if not yet stored
+                        if (!availabilities.containsKey(it.id)) {
+                            val date = ZonedDateTime.now()
+                            val availability = getAvailability(it).data
+                            if (availability != null) {
+                                availabilities[it.id] = date to availability
+                            }
+                        }
+                    }
+                }?.awaitAll()
+
+                updateCoroutine = null
+                lastDistanceUpdateTime = Instant.now()
+                invalidate()
+            } catch (e: IOException) {
+                withContext(Dispatchers.Main) {
+                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
+                        .show()
+                }
+            }
+        }
+    }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        this.energyLevel = energyLevel
+        invalidate()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun setupListeners() {
+        if (ContextCompat.checkSelfPermission(
+                carContext,
+                "com.google.android.gms.permission.CAR_FUEL"
+            ) != PackageManager.PERMISSION_GRANTED
+        )
+            return
+
+        println("Setting up energy level listener")
+
+        val exec = ContextCompat.getMainExecutor(carContext)
+        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    private fun removeListeners() {
+        println("Removing energy level listener")
+        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+    }
+}

app/src/google/java/net/vonforst/evmap/auto/PermissionActivity.kt

@@ -1,72 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.Manifest
-import android.app.Activity
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.os.ResultReceiver
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-
-
-class PermissionActivity : Activity() {
-    companion object {
-        const val EXTRA_RESULT_RECEIVER = "result_receiver";
-        const val RESULT_GRANTED = "granted"
-    }
-
-    private lateinit var resultReceiver: ResultReceiver
-    private val permissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
-    private val requestCode = 1
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (intent != null) {
-            resultReceiver = intent.getParcelableExtra(EXTRA_RESULT_RECEIVER)!!
-            if (!hasPermissions(permissions)) {
-                ActivityCompat.requestPermissions(this, permissions, requestCode)
-            } else {
-                onComplete(
-                    requestCode,
-                    permissions,
-                    intArrayOf(PackageManager.PERMISSION_GRANTED)
-                )
-            }
-        } else {
-            finish()
-        }
-    }
-
-    private fun onComplete(requestCode: Int, permissions: Array<String>?, grantResults: IntArray) {
-        val bundle = Bundle()
-        bundle.putBoolean(
-            RESULT_GRANTED,
-            grantResults.all { it == PackageManager.PERMISSION_GRANTED })
-        resultReceiver.send(requestCode, bundle)
-        finish()
-    }
-
-    private fun hasPermissions(permissions: Array<String>): Boolean {
-        var result = true
-        for (permission in permissions) {
-            if (ContextCompat.checkSelfPermission(
-                    this,
-                    permission
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                result = false
-                break
-            }
-        }
-        return result
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        onComplete(requestCode, permissions, grantResults)
-    }
-}

app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt

@@ -0,0 +1,50 @@
+package net.vonforst.evmap.auto
+
+import androidx.annotation.StringRes
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.*
+import net.vonforst.evmap.R
+
+/**
+ * Screen to grant permission
+ */
+class PermissionScreen(
+    ctx: CarContext,
+    @StringRes val message: Int,
+    val permissions: List<String>
+) : Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        return MessageTemplate.Builder(carContext.getString(message))
+            .setTitle(carContext.getString(R.string.app_name))
+            .setHeaderAction(Action.APP_ICON)
+            .addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.grant_on_phone))
+                    .setBackgroundColor(CarColor.PRIMARY)
+                    .setOnClickListener(ParkedOnlyOnClickListener.create {
+                        requestPermissions()
+                    })
+                    .build()
+            )
+            .addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.cancel))
+                    .setOnClickListener {
+                        carContext.finishCarApp()
+                    }
+                    .build(),
+            )
+            .build()
+    }
+
+    private fun requestPermissions() {
+        carContext.requestPermissions(permissions) { granted, rejected ->
+            if (granted.containsAll(permissions)) {
+                screenManager.pop()
+            } else {
+                requestPermissions()
+            }
+        }
+    }
+}

app/src/google/java/net/vonforst/evmap/auto/Utils.kt

@@ -0,0 +1,149 @@
+package net.vonforst.evmap.auto
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.car.app.CarContext
+import androidx.car.app.constraints.ConstraintManager
+import androidx.car.app.hardware.common.CarUnit
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.Distance
+import androidx.car.app.versioning.CarAppApiLevels
+import androidx.core.graphics.drawable.IconCompat
+import net.vonforst.evmap.api.availability.ChargepointStatus
+import java.util.*
+import kotlin.math.roundToInt
+
+fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
+    val unknown = status.any { it == ChargepointStatus.UNKNOWN }
+    val available = status.count { it == ChargepointStatus.AVAILABLE }
+    val allFaulted = status.all { it == ChargepointStatus.FAULTED }
+
+    return if (unknown) {
+        CarColor.DEFAULT
+    } else if (available > 0) {
+        CarColor.GREEN
+    } else if (allFaulted) {
+        CarColor.RED
+    } else {
+        CarColor.BLUE
+    }
+}
+
+val CarContext.constraintManager
+    get() = getCarService(CarContext.CONSTRAINT_SERVICE) as ConstraintManager
+
+fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
+
+private const val kmPerMile = 1.609344
+private const val ftPerMile = 5280
+private const val ydPerMile = 1760
+
+fun getDefaultDistanceUnit(): Int {
+    return if (usesImperialUnits(Locale.getDefault())) {
+        CarUnit.MILE
+    } else {
+        CarUnit.KILOMETER
+    }
+}
+
+fun usesImperialUnits(locale: Locale): Boolean {
+    return locale.country in listOf("US", "GB", "MM", "LR")
+            || locale.country == "" && locale.language == "en"
+}
+
+fun getDefaultSpeedUnit(): Int {
+    return when (Locale.getDefault().country) {
+        "US", "GB", "MM", "LR" -> CarUnit.MILES_PER_HOUR
+        else -> CarUnit.KILOMETERS_PER_HOUR
+    }
+}
+
+fun formatCarUnitDistance(value: Float?, unit: Int?): String {
+    if (value == null) return ""
+    return when (unit ?: getDefaultDistanceUnit()) {
+        // distance units: base unit is meters
+        CarUnit.METER -> "%.0f m".format(value)
+        CarUnit.KILOMETER -> "%.1f km".format(value / 1000)
+        CarUnit.MILLIMETER -> "%.0f mm".format(value * 1000) // whoever uses that...
+        CarUnit.MILE -> "%.1f mi".format(value / 1000 / kmPerMile)
+        else -> ""
+    }
+}
+
+fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
+    if (value == null) return ""
+    return when (unit ?: getDefaultSpeedUnit()) {
+        // speed units: base unit is meters per second
+        CarUnit.METERS_PER_SEC -> "%.0f m/s".format(value)
+        CarUnit.KILOMETERS_PER_HOUR -> "%.0f km/h".format(value * 3.6)
+        CarUnit.MILES_PER_HOUR -> "%.0f mph".format(value * 3.6 / kmPerMile)
+        else -> ""
+    }
+}
+
+fun roundValueToDistance(value: Double, unit: Int? = null): Distance {
+    // value is in meters
+    when (unit ?: getDefaultDistanceUnit()) {
+        CarUnit.MILE -> {
+            // imperial system
+            val miles = value / 1000 / kmPerMile
+            val yards = miles * ydPerMile
+            val feet = miles * ftPerMile
+
+            return when (miles) {
+                in 0.0..0.1 -> if (Locale.getDefault().country == "UK") {
+                    Distance.create(roundToMultipleOf(yards, 10.0), Distance.UNIT_YARDS)
+                } else {
+                    Distance.create(roundToMultipleOf(feet, 10.0), Distance.UNIT_FEET)
+                }
+                in 0.1..10.0 -> Distance.create(
+                    roundToMultipleOf(miles, 0.1),
+                    Distance.UNIT_MILES_P1
+                )
+                else -> Distance.create(roundToMultipleOf(miles, 1.0), Distance.UNIT_MILES)
+            }
+        }
+        else -> {
+            // metric system
+            return when (value) {
+                in 0.0..999.0 -> Distance.create(
+                    roundToMultipleOf(value, 10.0),
+                    Distance.UNIT_METERS
+                )
+                in 1000.0..10000.0 -> Distance.create(
+                    roundToMultipleOf(value / 1000, 0.1),
+                    Distance.UNIT_KILOMETERS_P1
+                )
+                else -> Distance.create(
+                    roundToMultipleOf(value / 1000, 1.0),
+                    Distance.UNIT_KILOMETERS
+                )
+            }
+        }
+    }
+}
+
+private fun roundToMultipleOf(num: Double, step: Double): Double {
+    return (num / step).roundToInt() * step
+}
+
+fun getAndroidAutoVersion(ctx: Context): List<String> {
+    val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
+    return info.versionName.split(".")
+}
+
+fun supportsCarApiLevel3(ctx: CarContext): Boolean {
+    if (ctx.carAppApiLevel < CarAppApiLevels.LEVEL_3) return false
+    ctx.hostInfo?.let { hostInfo ->
+        if (hostInfo.packageName == "com.google.android.projection.gearhead") {
+            val version = getAndroidAutoVersion(ctx)
+            // Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
+            // but crashes when using it. See: https://issuetracker.google.com/issues/199509584
+            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
+                return false
+            }
+        }
+    }
+    return true
+}

app/src/google/java/net/vonforst/evmap/auto/VehicleDataScreen.kt

@@ -0,0 +1,215 @@
+package net.vonforst.evmap.auto
+
+import android.content.pm.PackageManager
+import android.os.Handler
+import android.os.Looper
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.hardware.info.Model
+import androidx.car.app.hardware.info.Speed
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.Gauge
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
+    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private var model: Model? = null
+    private var energyLevel: EnergyLevel? = null
+    private var speed: Speed? = null
+    private var gauge = Gauge((ctx.resources.displayMetrics.density * 128).roundToInt(), ctx)
+    private val maxSpeed = 160f / 3.6f // m/s, speed gauge will show max if speed is higher
+
+    private val permissions = listOf(
+        "com.google.android.gms.permission.CAR_FUEL",
+        "com.google.android.gms.permission.CAR_SPEED"
+    )
+
+    init {
+        lifecycle.addObserver(this)
+    }
+
+    override fun onGetTemplate(): Template {
+        if (!permissionsGranted()) {
+            Handler(Looper.getMainLooper()).post {
+                screenManager.pushForResult(
+                    PermissionScreen(
+                        carContext,
+                        R.string.auto_vehicle_data_permission_needed,
+                        permissions
+                    )
+                ) {
+                    setupListeners()
+                }
+            }
+        }
+
+        val energyLevel = energyLevel
+        val model = model
+        val speed = speed
+
+        return GridTemplate.Builder().apply {
+            setTitle(
+                if (model != null && model.manufacturer.value != null && model.name.value != null) {
+                    "${model.manufacturer.value} ${model.name.value}"
+                } else {
+                    carContext.getString(R.string.auto_vehicle_data)
+                }
+            )
+            setHeaderAction(Action.BACK)
+            if (!permissionsGranted()) {
+                setLoading(true)
+            } else {
+                setSingleList(
+                    ItemList.Builder().apply {
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_charging_level))
+                            if (energyLevel == null) {
+                                setLoading(true)
+                            } else if (energyLevel.batteryPercent.value != null && energyLevel.fuelPercent.value != null) {
+                                // both battery and fuel (Plug-in hybrid)
+                                setText(
+                                    "\uD83D\uDD0C %.0f %% ⛽ %.0f %%".format(
+                                        energyLevel.batteryPercent.value,
+                                        energyLevel.fuelPercent.value
+                                    )
+                                )
+                                setImage(
+                                    gauge.draw(
+                                        energyLevel.batteryPercent.value,
+                                        energyLevel.fuelPercent.value
+                                    ).asCarIcon()
+                                )
+                            } else if (energyLevel.batteryPercent.value != null) {
+                                // BEV
+                                setText("%.0f %%".format(energyLevel.batteryPercent.value))
+                                setImage(gauge.draw(energyLevel.batteryPercent.value).asCarIcon())
+                            } else if (energyLevel.fuelPercent.value != null) {
+                                // ICE
+                                setText("⛽ %.0f %%".format(energyLevel.fuelPercent.value))
+                                setImage(gauge.draw(energyLevel.fuelPercent.value).asCarIcon())
+                            } else {
+                                setText(carContext.getString(R.string.auto_no_data))
+                                setImage(gauge.draw(0f).asCarIcon())
+                            }
+                        }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_range))
+                            if (energyLevel == null) {
+                                setLoading(true)
+                            } else if (energyLevel.rangeRemainingMeters.value != null) {
+                                setText(
+                                    formatCarUnitDistance(
+                                        energyLevel.rangeRemainingMeters.value,
+                                        energyLevel.distanceDisplayUnit.value
+                                    )
+                                )
+                                setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_car
+                                        )
+                                    ).build()
+                                )
+                            } else {
+                                setText(carContext.getString(R.string.auto_no_data))
+                                setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_car
+                                        )
+                                    ).build()
+                                )
+                            }
+                        }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_speed))
+                            if (speed == null) {
+                                setLoading(true)
+                            } else {
+                                val rawSpeed = speed.rawSpeedMetersPerSecond.value
+                                val displaySpeed = speed.displaySpeedMetersPerSecond.value
+                                if (rawSpeed != null) {
+                                    setText(
+                                        formatCarUnitSpeed(
+                                            rawSpeed,
+                                            speed.speedDisplayUnit.value
+                                        )
+                                    )
+                                    setImage(
+                                        gauge.draw(min(rawSpeed / maxSpeed * 100, 100f)).asCarIcon()
+                                    )
+                                } else if (displaySpeed != null) {
+                                    setText(
+                                        formatCarUnitSpeed(
+                                            speed.displaySpeedMetersPerSecond.value,
+                                            speed.speedDisplayUnit.value
+                                        )
+                                    )
+                                    setImage(
+                                        gauge.draw(min(displaySpeed / maxSpeed * 100, 100f))
+                                            .asCarIcon()
+                                    )
+                                } else {
+                                    setText(carContext.getString(R.string.auto_no_data))
+                                    setImage(gauge.draw(0f).asCarIcon())
+                                }
+                            }
+                        }.build())
+                    }.build()
+                )
+            }
+        }.build()
+    }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        this.energyLevel = energyLevel
+        invalidate()
+    }
+
+    private fun onSpeedUpdated(speed: Speed) {
+        this.speed = speed
+        invalidate()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun setupListeners() {
+        if (!permissionsGranted()) return
+
+        println("Setting up energy level listener")
+
+        val exec = ContextCompat.getMainExecutor(carContext)
+        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        hardwareMan.carInfo.addSpeedListener(exec, ::onSpeedUpdated)
+
+        hardwareMan.carInfo.fetchModel(exec) {
+            this.model = it
+            invalidate()
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    private fun removeListeners() {
+        println("Removing energy level listener")
+        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        hardwareMan.carInfo.removeSpeedListener(::onSpeedUpdated)
+    }
+
+    private fun permissionsGranted(): Boolean =
+        permissions.all {
+            ContextCompat.checkSelfPermission(
+                carContext,
+                it
+            ) == PackageManager.PERMISSION_GRANTED
+        }
+}

app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt

@@ -0,0 +1,121 @@
+package net.vonforst.evmap.auto
+
+import android.Manifest
+import android.location.Location
+import android.os.Handler
+import android.os.Looper
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.*
+import androidx.core.graphics.drawable.IconCompat
+import net.vonforst.evmap.R
+
+/**
+ * Welcome screen with selection between favorites and nearby chargers
+ */
+class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
+    private var location: Location? = null
+
+    override fun onGetTemplate(): Template {
+        if (!session.locationPermissionGranted()) {
+            Handler(Looper.getMainLooper()).post {
+                screenManager.pushForResult(
+                    PermissionScreen(
+                        carContext,
+                        R.string.auto_location_permission_needed,
+                        listOf(
+                            Manifest.permission.ACCESS_FINE_LOCATION,
+                            Manifest.permission.ACCESS_COARSE_LOCATION
+                        )
+                    )
+                ) {
+                    session.bindLocationService()
+                }
+            }
+        }
+
+        session.mapScreen = this
+        return PlaceListMapTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.app_name))
+            if (!session.locationPermissionGranted()) {
+                setLoading(true)
+            } else {
+                location?.let {
+                    setAnchor(Place.Builder(CarLocation.create(it)).build())
+                }
+                setItemList(ItemList.Builder().apply {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.auto_chargers_closeby))
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_address
+                                    )
+                                )
+                                    .setTint(CarColor.DEFAULT).build()
+                            )
+                            .setBrowsable(true)
+                            .setOnClickListener {
+                                screenManager.push(
+                                    MapScreen(
+                                        carContext,
+                                        session,
+                                        favorites = false
+                                    )
+                                )
+                            }
+                            .build())
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.auto_favorites))
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_fav
+                                    )
+                                )
+                                    .setTint(CarColor.DEFAULT).build()
+                            )
+                            .setBrowsable(true)
+                            .setOnClickListener {
+                                screenManager.push(MapScreen(carContext, session, favorites = true))
+                            }
+                            .build())
+                    if (supportsCarApiLevel3(carContext)) {
+                        addItem(
+                            Row.Builder()
+                                .setTitle(carContext.getString(R.string.auto_vehicle_data))
+                                .setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(carContext, R.drawable.ic_car)
+                                    ).setTint(CarColor.DEFAULT).build()
+                                )
+                                .setBrowsable(true)
+                                .setOnClickListener {
+                                    session.mapScreen = null
+                                    screenManager.push(VehicleDataScreen(carContext))
+                                }
+                                .build()
+                        )
+                    }
+                }.build())
+                setCurrentLocationEnabled(true)
+            }
+            setHeaderAction(Action.APP_ICON)
+            build()
+        }.build()
+    }
+
+    override fun updateLocation(location: Location) {
+        if (location.latitude == this.location?.latitude
+            && location.longitude == this.location?.longitude
+        ) {
+            return
+        }
+        this.location = location
+        invalidate()
+    }
+}

app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt

@@ -1,33 +1,11 @@
 package net.vonforst.evmap.autocomplete
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.view.inputmethod.InputMethodManager
-import androidx.fragment.app.Fragment
-import com.car2go.maps.google.adapter.AnyMapAdapter
-import com.google.android.libraries.places.api.model.Place
-import com.google.android.libraries.places.widget.Autocomplete
-import com.google.android.libraries.places.widget.model.AutocompleteActivityMode
-import net.vonforst.evmap.fragment.REQUEST_AUTOCOMPLETE
-import net.vonforst.evmap.viewmodel.PlaceWithBounds
+import net.vonforst.evmap.storage.PreferenceDataSource
 
-fun launchAutocomplete(fragment: Fragment) {
-    val fields = listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)
-    val intent: Intent = Autocomplete.IntentBuilder(
-        AutocompleteActivityMode.OVERLAY, fields
-    )
-        .build(fragment.requireActivity())
-        .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-    fragment.startActivityForResult(intent, REQUEST_AUTOCOMPLETE)
-
-    // show keyboard
-    val imm = fragment.requireContext()
-        .getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.toggleSoftInput(0, 0)
-}
-
-fun handleAutocompleteResult(intent: Intent): PlaceWithBounds? {
-    val place = Autocomplete.getPlaceFromIntent(intent)
-    return PlaceWithBounds(AnyMapAdapter.adapt(place.latLng), AnyMapAdapter.adapt(place.viewport))
-}
+fun getAutocompleteProviders(context: Context) =
+    if (PreferenceDataSource(context).searchProvider == "google") {
+        listOf(GooglePlacesAutocompleteProvider(context), MapboxAutocompleteProvider(context))
+    } else {
+        listOf(MapboxAutocompleteProvider(context), GooglePlacesAutocompleteProvider(context))
+    }

app/src/google/java/net/vonforst/evmap/autocomplete/GooglePlacesAutocompleteProvider.kt

@@ -0,0 +1,112 @@
+package net.vonforst.evmap.autocomplete
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.style.CharacterStyle
+import android.text.style.StyleSpan
+import com.car2go.maps.google.adapter.AnyMapAdapter
+import com.car2go.maps.util.SphericalUtil
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.gms.tasks.Tasks.await
+import com.google.android.libraries.places.api.Places
+import com.google.android.libraries.places.api.model.AutocompleteSessionToken
+import com.google.android.libraries.places.api.model.Place
+import com.google.android.libraries.places.api.model.RectangularBounds
+import com.google.android.libraries.places.api.net.FetchPlaceRequest
+import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRequest
+import com.google.android.libraries.places.api.net.PlacesStatusCodes
+import kotlinx.coroutines.tasks.await
+import net.vonforst.evmap.R
+import java.util.concurrent.ExecutionException
+import kotlin.math.sqrt
+
+
+class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvider {
+    private var token = AutocompleteSessionToken.newInstance()
+    private val client = Places.createClient(context)
+    private val bold: CharacterStyle = StyleSpan(Typeface.BOLD)
+
+    override val id = "google"
+
+    override fun autocomplete(
+        query: String,
+        location: com.car2go.maps.model.LatLng?
+    ): List<AutocompletePlace> {
+        val request = FindAutocompletePredictionsRequest.builder().apply {
+            if (location != null) {
+                setLocationBias(calcLocationBias(location))
+                setOrigin(LatLng(location.latitude, location.longitude))
+            }
+            setSessionToken(token)
+            setQuery(query)
+        }.build()
+        try {
+            val result =
+                await(client.findAutocompletePredictions(request)).autocompletePredictions
+            return result.map {
+                AutocompletePlace(
+                    it.getPrimaryText(bold),
+                    it.getSecondaryText(bold),
+                    it.placeId,
+                    it.distanceMeters?.toDouble(),
+                    it.placeTypes.map { AutocompletePlaceType.valueOf(it.name) })
+            }
+        } catch (e: ExecutionException) {
+            val cause = e.cause
+            if (cause is ApiException) {
+                if (cause.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
+                    throw ApiUnavailableException()
+                }
+            }
+            throw e
+        }
+    }
+
+    override suspend fun getDetails(id: String): PlaceWithBounds {
+        val request =
+            FetchPlaceRequest.builder(id, listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)).build()
+        try {
+            val place = client.fetchPlace(request).await().place
+            token = AutocompleteSessionToken.newInstance()
+            return PlaceWithBounds(
+                AnyMapAdapter.adapt(place.latLng),
+                AnyMapAdapter.adapt(place.viewport)
+            )
+        } catch (e: ApiException) {
+            if (e.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
+                throw ApiUnavailableException()
+            } else {
+                throw e
+            }
+        }
+    }
+
+    override fun getAttributionString(): Int = R.string.places_powered_by_google
+
+    override fun getAttributionImage(dark: Boolean): Int =
+        if (dark) R.drawable.places_powered_by_google_dark else R.drawable.places_powered_by_google_light
+
+    private fun calcLocationBias(location: com.car2go.maps.model.LatLng): RectangularBounds {
+        val radius = 100e3 // meters
+        val northEast =
+            SphericalUtil.computeOffset(
+                location,
+                radius * sqrt(2.0),
+                45.0
+            )
+        val southWest =
+            SphericalUtil.computeOffset(
+                location,
+                radius * sqrt(2.0),
+                225.0
+            )
+        return RectangularBounds.newInstance(
+            LatLngBounds(
+                AnyMapAdapter.adapt(southWest),
+                AnyMapAdapter.adapt(northEast)
+            )
+        )
+    }
+}

app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -28,7 +27,7 @@ class DonateFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
@@ -36,14 +35,7 @@ class DonateFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
         binding.productsList.apply {
             adapter = DonationAdapter().apply {
@@ -54,6 +46,10 @@ class DonateFragment : Fragment() {
             layoutManager = LinearLayoutManager(context)
         }
 
+        vm.products.observe(viewLifecycleOwner) {
+            print(it)
+        }
+
         vm.purchaseSuccessful.observe(viewLifecycleOwner, Observer {
             Snackbar.make(view, R.string.donation_successful, Snackbar.LENGTH_LONG).show()
         })
@@ -61,4 +57,12 @@ class DonateFragment : Fragment() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         })
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }

app/src/google/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

@@ -0,0 +1,69 @@
+package net.vonforst.evmap.fragment
+
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import net.vonforst.evmap.databinding.FragmentOnboardingAndroidAutoBinding
+
+class OnboardingViewPagerAdapter(fragment: Fragment) :
+    FragmentStateAdapter(fragment) {
+    override fun getItemCount(): Int = 4
+
+    override fun createFragment(position: Int): Fragment = when (position) {
+        0 -> WelcomeFragment()
+        1 -> IconsFragment()
+        2 -> AndroidAutoFragment()
+        3 -> DataSourceSelectFragment()
+        else -> throw IllegalArgumentException()
+    }
+}
+
+class AndroidAutoFragment : OnboardingPageFragment() {
+    private lateinit var binding: FragmentOnboardingAndroidAutoBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentOnboardingAndroidAutoBinding.inflate(inflater, container, false)
+
+        binding.btnGetStarted.setOnClickListener {
+            parent.goToNext()
+        }
+        binding.imgAndroidAuto.alpha = 0f
+
+        return binding.root
+    }
+
+    @SuppressLint("Recycle")
+    override fun onResume() {
+        super.onResume()
+
+        val animators =
+            listOf(
+                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "translationY", -20f, 0f).apply {
+                    interpolator = DecelerateInterpolator()
+                },
+                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "alpha", 0f, 1f).apply {
+                    interpolator = DecelerateInterpolator()
+                }
+            )
+        AnimatorSet().apply {
+            playTogether(animators)
+            start()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        binding.imgAndroidAuto.alpha = 0f
+    }
+}

app/src/google/java/net/vonforst/evmap/ui/Gauge.kt

@@ -0,0 +1,74 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.graphics.*
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import net.vonforst.evmap.R
+import kotlin.math.max
+import kotlin.math.min
+
+class Gauge(val size: Int, ctx: Context) {
+    val arcPaint = Paint().apply {
+        style = Paint.Style.STROKE
+        strokeWidth = size * 0.15f
+    }
+    val gaugePaint = Paint()
+    val activeColor = ContextCompat.getColor(ctx, R.color.gauge_active)
+    val middleColor = ContextCompat.getColor(ctx, R.color.gauge_middle)
+    val inactiveColor = ContextCompat.getColor(ctx, R.color.gauge_inactive)
+
+    fun draw(valuePercent: Float?, secondValuePercent: Float? = null): Bitmap {
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
+
+        val angle = valuePercent?.let { 180f * it / 100 } ?: 0f
+        val secondAngle = secondValuePercent?.let { 180f * it / 100 }
+
+        drawArc(angle, secondAngle, canvas)
+        if (secondAngle != null) drawGauge(secondAngle, inactiveColor, canvas)
+        drawGauge(angle, Color.WHITE, canvas)
+        return bitmap
+    }
+
+    private fun drawGauge(angle: Float, @ColorInt color: Int, canvas: Canvas) {
+        gaugePaint.color = color
+        canvas.save()
+        canvas.rotate(angle - 90, size / 2f, 3 * size / 4f)
+        canvas.drawCircle(size / 2f, 3 * size / 4f, size * 0.1F, gaugePaint)
+        canvas.drawRect(size * 0.48f, 3 * size / 4f, size * 0.53f, size * 0.325f, gaugePaint)
+        canvas.restore()
+    }
+
+    private fun drawArc(angle: Float, secondAngle: Float?, canvas: Canvas) {
+        val (angle1, angle2) = if (secondAngle != null) {
+            min(angle, secondAngle) to max(angle, secondAngle)
+        } else {
+            angle to null
+        }
+
+        arcPaint.color = activeColor
+        val arcBounds = RectF(
+            arcPaint.strokeWidth / 2,
+            size / 4f + arcPaint.strokeWidth / 2,
+            size - arcPaint.strokeWidth / 2,
+            5 * size / 4f - arcPaint.strokeWidth / 2
+        )
+
+        canvas.drawArc(arcBounds, 180f, angle1, false, arcPaint)
+        if (angle2 != null) {
+            arcPaint.color = middleColor
+            canvas.drawArc(arcBounds, 180f + angle1, angle2 - angle1, false, arcPaint)
+        }
+        arcPaint.color = inactiveColor
+        canvas.drawArc(
+            arcBounds,
+            180f + (angle2 ?: angle1),
+            180f - (angle2 ?: angle1),
+            false,
+            arcPaint
+        )
+    }
+}

app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -54,12 +54,12 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
             .build()
         billingClient.querySkuDetailsAsync(params) { result, details ->
             if (result.responseCode == BillingClient.BillingResponseCode.OK && details != null) {
-                products.value = Resource.success(details
+                products.postValue(Resource.success(details
                     .sortedBy { it.priceAmountMicros }
                     .map { DonationItem(it) }
-                )
+                ))
             } else {
-                products.value = Resource.error(result.debugMessage, null)
+                products.postValue(Resource.error(result.debugMessage, null))
             }
         }
     }

app/src/google/res/drawable/ic_car.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
+</vector>

app/src/google/res/layout/fragment_donate.xml

@@ -51,7 +51,7 @@
             android:id="@+id/products_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="16dp"
             app:data="@{vm.products.data}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/google/res/layout/fragment_onboarding_android_auto.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/welcomeTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="@string/welcome_android_auto"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/welcomeText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="56dp"
+        android:breakStrategy="balanced"
+        android:gravity="center"
+        android:text="@string/welcome_android_auto_detail"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/btnGetStarted"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:text="@string/sounds_cool"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/img_android_auto"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_marginTop="28dp"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/circle_bg_logo"
+        android:backgroundTint="@color/android_auto_accent"
+        android:scaleType="center"
+        app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.7"
+        app:srcCompat="@drawable/android_auto" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout/item_donation.xml

@@ -25,8 +25,9 @@
 
             <TextView
                 android:id="@+id/textView15"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
                 android:text="@{item.sku.title}"
                 android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -34,7 +35,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="Spende" />
+                tools:text="Spende (extrem langer Beschreibungstext)" />
 
             <TextView
                 android:id="@+id/textView21"

app/src/google/res/values-de/values.xml

@@ -4,16 +4,33 @@
         <item>Google Maps</item>
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
-    <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 30% Gebühren ab.</string>
+    <string-array name="pref_search_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <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="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
     <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
     <string name="auto_no_favorites_found">Keine Favoriten gefunden</string>
     <string name="open_in_app">In App öffnen</string>
     <string name="opened_on_phone">Auf dem Telefon geöffnet</string>
     <string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
+    <string name="auto_vehicle_data_permission_needed">Für diese Funktion benötigt EVMap Zugriff auf Daten deines Fahrzeugs.</string>
     <string name="grant_on_phone">Auf Telefon zulassen</string>
     <string name="auto_chargers_closeby">In der Nähe</string>
     <string name="auto_favorites">Favoriten</string>
     <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
     <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
+    <string name="auto_prices">Preise</string>
+    <string name="auto_vehicle_data">Fahrzeugdaten</string>
+    <string name="auto_charging_level">Ladezustand</string>
+    <string name="auto_no_data">Nicht verfügbar</string>
+    <string name="auto_range">Reichweite</string>
+    <string name="auto_speed">Geschwindigkeit</string>
+    <string name="welcome_android_auto">Android Auto-Unterstützung</string>
+    <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
+    <string name="sounds_cool">klingt cool</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
+    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>

app/src/google/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="gauge_active">#00e676</color>
+    <color name="gauge_middle">#087f23</color>
+    <color name="gauge_inactive">#9e9e9e</color>
+    <color name="charger_100kw_dark">#fdd835</color>
+</resources>

app/src/google/res/values/values.xml

@@ -8,17 +8,39 @@
         <item>google</item>
         <item>mapbox</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>google</item>
+        <item>mapbox</item>
+    </string-array>
     <string name="pref_map_provider_default" translatable="false">google</string>
-    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 30% off every donation.</string>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
+    <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="auto_location_service">EVMap is running on Android Auto and using your location.</string>
     <string name="auto_no_chargers_found">No nearby chargers found</string>
     <string name="auto_no_favorites_found">No favorites found</string>
     <string name="open_in_app">Open in app</string>
     <string name="opened_on_phone">Opened on phone</string>
     <string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
+    <string name="auto_vehicle_data_permission_needed">For this feature, EVMap needs access to your vehicle data.</string>
     <string name="grant_on_phone">Grant on phone</string>
     <string name="auto_chargers_closeby">Nearby chargers</string>
     <string name="auto_favorites">Favorites</string>
     <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
     <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
+    <string name="auto_prices">Pricing</string>
+    <string name="auto_vehicle_data">Vehicle data</string>
+    <string name="auto_charging_level">Charging level</string>
+    <string name="auto_no_data">Unavailable</string>
+    <string name="auto_range">Range</string>
+    <string name="auto_speed">Speed</string>
+    <string name="welcome_android_auto">Android Auto support</string>
+    <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
+    <string name="sounds_cool">sounds cool</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
+    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="net.vonforst.evmap">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <queries>
@@ -31,8 +32,9 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/title_activity_maps"
-            android:theme="@style/AppTheme.LaunchScreen">
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.LaunchScreen"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -256,6 +258,16 @@
             </intent-filter>
         </activity>
 
+        <!-- Override services of the com.mapzen.android.lost library with exported:false
+             until https://github.com/lostzen/lost/pull/270 is merged -->
+        <service
+            android:name="com.mapzen.android.lost.internal.GeofencingIntentService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.mapzen.lost.action.ACTION_GEOFENCING_SERVICE" />
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

app/src/main/java/android/widget/Filter.java

@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2007 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 android.widget;
+
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+
+/**
+ * Copy of android.widget.Filter, exposing the hidden setDelayer() method.
+ *
+ * <p>A filter constrains data with a filtering pattern.</p>
+ *
+ * <p>Filters are usually created by {@link android.widget.Filterable}
+ * classes.</p>
+ *
+ * <p>Filtering operations performed by calling {@link #filter(CharSequence)} or
+ * {@link #filter(CharSequence, android.widget.Filter.FilterListener)} are
+ * performed asynchronously. When these methods are called, a filtering request
+ * is posted in a request queue and processed later. Any call to one of these
+ * methods will cancel any previous non-executed filtering request.</p>
+ *
+ * @see android.widget.Filterable
+ */
+public abstract class Filter {
+    private static final String LOG_TAG = "Filter";
+
+    private static final String THREAD_NAME = "Filter";
+    private static final int FILTER_TOKEN = 0xD0D0F00D;
+    private static final int FINISH_TOKEN = 0xDEADBEEF;
+
+    private Handler mThreadHandler;
+    private Handler mResultHandler;
+
+    private Delayer mDelayer;
+
+    private final Object mLock = new Object();
+
+    /**
+     * <p>Creates a new asynchronous filter.</p>
+     */
+    public Filter() {
+        mResultHandler = new ResultsHandler();
+    }
+
+    /**
+     * Provide an interface that decides how long to delay the message for a given query.  Useful
+     * for heuristics such as posting a delay for the delete key to avoid doing any work while the
+     * user holds down the delete key.
+     *
+     * @param delayer The delayer.
+     * @hide
+     */
+    public void setDelayer(Delayer delayer) {
+        synchronized (mLock) {
+            mDelayer = delayer;
+        }
+    }
+
+    /**
+     * <p>Starts an asynchronous filtering operation. Calling this method
+     * cancels all previous non-executed filtering requests and posts a new
+     * filtering request that will be executed later.</p>
+     *
+     * @param constraint the constraint used to filter the data
+     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
+     */
+    public final void filter(CharSequence constraint) {
+        filter(constraint, null);
+    }
+
+    /**
+     * <p>Starts an asynchronous filtering operation. Calling this method
+     * cancels all previous non-executed filtering requests and posts a new
+     * filtering request that will be executed later.</p>
+     *
+     * <p>Upon completion, the listener is notified.</p>
+     *
+     * @param constraint the constraint used to filter the data
+     * @param listener   a listener notified upon completion of the operation
+     * @see #filter(CharSequence)
+     * @see #performFiltering(CharSequence)
+     * @see #publishResults(CharSequence, android.widget.Filter.FilterResults)
+     */
+    public final void filter(CharSequence constraint, FilterListener listener) {
+        synchronized (mLock) {
+            if (mThreadHandler == null) {
+                HandlerThread thread = new HandlerThread(
+                        THREAD_NAME, android.os.Process.THREAD_PRIORITY_BACKGROUND);
+                thread.start();
+                mThreadHandler = new RequestHandler(thread.getLooper());
+            }
+
+            final long delay = (mDelayer == null) ? 0 : mDelayer.getPostingDelay(constraint);
+
+            Message message = mThreadHandler.obtainMessage(FILTER_TOKEN);
+
+            RequestArguments args = new RequestArguments();
+            // make sure we use an immutable copy of the constraint, so that
+            // it doesn't change while the filter operation is in progress
+            args.constraint = constraint != null ? constraint.toString() : null;
+            args.listener = listener;
+            message.obj = args;
+
+            mThreadHandler.removeMessages(FILTER_TOKEN);
+            mThreadHandler.removeMessages(FINISH_TOKEN);
+            mThreadHandler.sendMessageDelayed(message, delay);
+        }
+    }
+
+    /**
+     * <p>Invoked in a worker thread to filter the data according to the
+     * constraint. Subclasses must implement this method to perform the
+     * filtering operation. Results computed by the filtering operation
+     * must be returned as a {@link android.widget.Filter.FilterResults} that
+     * will then be published in the UI thread through
+     * {@link #publishResults(CharSequence,
+     * android.widget.Filter.FilterResults)}.</p>
+     *
+     * <p><strong>Contract:</strong> When the constraint is null, the original
+     * data must be restored.</p>
+     *
+     * @param constraint the constraint used to filter the data
+     * @return the results of the filtering operation
+     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
+     * @see #publishResults(CharSequence, android.widget.Filter.FilterResults)
+     * @see android.widget.Filter.FilterResults
+     */
+    protected abstract FilterResults performFiltering(CharSequence constraint);
+
+    /**
+     * <p>Invoked in the UI thread to publish the filtering results in the
+     * user interface. Subclasses must implement this method to display the
+     * results computed in {@link #performFiltering}.</p>
+     *
+     * @param constraint the constraint used to filter the data
+     * @param results    the results of the filtering operation
+     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
+     * @see #performFiltering(CharSequence)
+     * @see android.widget.Filter.FilterResults
+     */
+    protected abstract void publishResults(CharSequence constraint,
+                                           FilterResults results);
+
+    /**
+     * <p>Converts a value from the filtered set into a CharSequence. Subclasses
+     * should override this method to convert their results. The default
+     * implementation returns an empty String for null values or the default
+     * String representation of the value.</p>
+     *
+     * @param resultValue the value to convert to a CharSequence
+     * @return a CharSequence representing the value
+     */
+    public CharSequence convertResultToString(Object resultValue) {
+        return resultValue == null ? "" : resultValue.toString();
+    }
+
+    /**
+     * <p>Holds the results of a filtering operation. The results are the values
+     * computed by the filtering operation and the number of these values.</p>
+     */
+    protected static class FilterResults {
+        public FilterResults() {
+            // nothing to see here
+        }
+
+        /**
+         * <p>Contains all the values computed by the filtering operation.</p>
+         */
+        public Object values;
+
+        /**
+         * <p>Contains the number of values computed by the filtering
+         * operation.</p>
+         */
+        public int count;
+    }
+
+    /**
+     * <p>Listener used to receive a notification upon completion of a filtering
+     * operation.</p>
+     */
+    public static interface FilterListener {
+        /**
+         * <p>Notifies the end of a filtering operation.</p>
+         *
+         * @param count the number of values computed by the filter
+         */
+        public void onFilterComplete(int count);
+    }
+
+    /**
+     * <p>Worker thread handler. When a new filtering request is posted from
+     * {@link android.widget.Filter#filter(CharSequence, android.widget.Filter.FilterListener)},
+     * it is sent to this handler.</p>
+     */
+    private class RequestHandler extends Handler {
+        public RequestHandler(Looper looper) {
+            super(looper);
+        }
+
+        /**
+         * <p>Handles filtering requests by calling
+         * {@link Filter#performFiltering} and then sending a message
+         * with the results to the results handler.</p>
+         *
+         * @param msg the filtering request
+         */
+        public void handleMessage(Message msg) {
+            int what = msg.what;
+            Message message;
+            switch (what) {
+                case FILTER_TOKEN:
+                    RequestArguments args = (RequestArguments) msg.obj;
+                    try {
+                        args.results = performFiltering(args.constraint);
+                    } catch (Exception e) {
+                        args.results = new FilterResults();
+                        Log.w(LOG_TAG, "An exception occured during performFiltering()!", e);
+                    } finally {
+                        message = mResultHandler.obtainMessage(what);
+                        message.obj = args;
+                        message.sendToTarget();
+                    }
+
+                    synchronized (mLock) {
+                        if (mThreadHandler != null) {
+                            Message finishMessage = mThreadHandler.obtainMessage(FINISH_TOKEN);
+                            mThreadHandler.sendMessageDelayed(finishMessage, 3000);
+                        }
+                    }
+                    break;
+                case FINISH_TOKEN:
+                    synchronized (mLock) {
+                        if (mThreadHandler != null) {
+                            mThreadHandler.getLooper().quit();
+                            mThreadHandler = null;
+                        }
+                    }
+                    break;
+            }
+        }
+    }
+
+    /**
+     * <p>Handles the results of a filtering operation. The results are
+     * handled in the UI thread.</p>
+     */
+    private class ResultsHandler extends Handler {
+        /**
+         * <p>Messages received from the request handler are processed in the
+         * UI thread. The processing involves calling
+         * {@link Filter#publishResults(CharSequence,
+         * android.widget.Filter.FilterResults)}
+         * to post the results back in the UI and then notifying the listener,
+         * if any.</p>
+         *
+         * @param msg the filtering results
+         */
+        @Override
+        public void handleMessage(Message msg) {
+            RequestArguments args = (RequestArguments) msg.obj;
+
+            publishResults(args.constraint, args.results);
+            if (args.listener != null) {
+                int count = args.results != null ? args.results.count : -1;
+                args.listener.onFilterComplete(count);
+            }
+        }
+    }
+
+    /**
+     * <p>Holds the arguments of a filtering request as well as the results
+     * of the request.</p>
+     */
+    private static class RequestArguments {
+        /**
+         * <p>The constraint used to filter the data.</p>
+         */
+        CharSequence constraint;
+
+        /**
+         * <p>The listener to notify upon completion. Can be null.</p>
+         */
+        FilterListener listener;
+
+        /**
+         * <p>The results of the filtering operation.</p>
+         */
+        FilterResults results;
+    }
+
+    /**
+     * @hide
+     */
+    public interface Delayer {
+
+        /**
+         * @param constraint The constraint passed to {@link Filter#filter(CharSequence)}
+         * @return The delay that should be used for
+         * {@link Handler#sendMessageDelayed(android.os.Message, long)}
+         */
+        long getPostingDelay(CharSequence constraint);
+    }
+}

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

@@ -4,6 +4,11 @@ import android.app.Application
 import com.facebook.stetho.Stetho
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateNightMode
+import org.acra.config.dialog
+import org.acra.config.limiter
+import org.acra.config.mailSender
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
 
 class EvMapApplication : Application() {
     override fun onCreate() {
@@ -11,5 +16,28 @@ class EvMapApplication : Application() {
         updateNightMode(PreferenceDataSource(this))
         Stetho.initializeWithDefaults(this);
         init(applicationContext)
+
+        if (!BuildConfig.DEBUG) {
+            initAcra {
+                buildConfigClass = BuildConfig::class.java
+                reportFormat = StringFormat.KEY_VALUE_LIST
+
+                mailSender {
+                    mailTo = "evmap+crashreport@vonforst.net"
+                }
+
+                dialog {
+                    text = getString(R.string.crash_report_text)
+                    title = getString(R.string.app_name)
+                    commentPrompt = getString(R.string.crash_report_comment_prompt)
+                    resIcon = R.drawable.ic_launcher_foreground
+                    resTheme = R.style.AppTheme
+                }
+
+                limiter {
+                    enabled = true
+                }
+            }
+        }
     }
 }

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

@@ -1,27 +1,37 @@
 package net.vonforst.evmap
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.os.SystemClock
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
+import androidx.core.splashscreen.SplashScreen
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.car2go.maps.model.LatLng
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.fragment.MapFragment
+import net.vonforst.evmap.fragment.MapFragmentArgs
+import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.utils.LocaleContextWrapper
+import net.vonforst.evmap.utils.getLocationFromIntent
 
 
 const val REQUEST_LOCATION_PERMISSION = 1
@@ -29,7 +39,8 @@ const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
 
-class MapsActivity : AppCompatActivity() {
+class MapsActivity : AppCompatActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
     interface FragmentCallback {
         fun getRootView(): View
     }
@@ -49,13 +60,13 @@ class MapsActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        // set theme to AppTheme to end launch screen
-        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
+        val splashScreen = installSplashScreen()
 
         setContentView(R.layout.activity_maps)
 
         navController = findNavController(R.id.nav_host_fragment)
+        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.map,
@@ -67,7 +78,7 @@ class MapsActivity : AppCompatActivity() {
         )
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
-        
+
         val header = navView.getHeaderView(0)
         ViewCompat.setOnApplyWindowInsetsListener(header) { v, insets ->
             v.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
@@ -75,32 +86,56 @@ class MapsActivity : AppCompatActivity() {
         }
 
         prefs = PreferenceDataSource(this)
+        prefs.appStartCounter += 1
 
         checkPlayServices(this)
 
-        if (intent?.scheme == "geo") {
-            val pos = intent.data?.schemeSpecificPart?.split("?")?.get(0)
-            val query = intent.data?.query?.split("=")?.get(1)
-            val coords = pos?.split(",")?.map { it.toDoubleOrNull() }
+        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                // wait for splash screen animation to finish on first start
+                splashScreen.setKeepVisibleCondition(object : SplashScreen.KeepOnScreenCondition {
+                    var startTime: Long? = null
 
-            if (coords != null && coords.size == 2) {
+                    override fun shouldKeepOnScreen(): Boolean {
+                        val st = startTime
+                        if (st == null) {
+                            startTime = SystemClock.uptimeMillis()
+                            return true
+                        } else {
+                            return (SystemClock.uptimeMillis() - st) < 1000
+                        }
+                    }
+                })
+            }
+            navGraph.setStartDestination(R.id.onboarding)
+            navController.graph = navGraph
+            return
+        } else {
+            navGraph.setStartDestination(R.id.map)
+            navController.graph = navGraph
+        }
+
+
+        if (intent?.scheme == "geo") {
+            val query = intent.data?.query?.split("=")?.get(1)
+            val coords = getLocationFromIntent(intent)
+
+            if (coords != null) {
                 val lat = coords[0]
                 val lon = coords[1]
-                if (lat != null && lon != null && lat != 0.0 && lon != 0.0) {
-                    val deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragment.showLocation(lat, lon))
-                        .createPendingIntent()
-                    deepLink.send()
-                } else if (query != null && query.isNotEmpty()) {
-                    val deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragment.showLocationByName(query))
-                        .createPendingIntent()
-                    deepLink.send()
-                }
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
+                    .createPendingIntent()
+                deepLink.send()
+            } else if (query != null && query.isNotEmpty()) {
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragmentArgs(locationName = query).toBundle())
+                    .createPendingIntent()
+                deepLink.send()
             }
         } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
             val id = intent.data?.pathSegments?.last()?.toLongOrNull()
@@ -108,7 +143,7 @@ class MapsActivity : AppCompatActivity() {
                 val deepLink = navController.createDeepLink()
                     .setGraph(R.navigation.nav_graph)
                     .setDestination(R.id.map)
-                    .setArguments(MapFragment.showChargerById(id))
+                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
                     .createPendingIntent()
                 deepLink.send()
             }
@@ -116,11 +151,13 @@ class MapsActivity : AppCompatActivity() {
             navController.createDeepLink()
                 .setDestination(R.id.map)
                 .setArguments(
-                    MapFragment.showCharger(
-                        intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                        intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                        intent.getDoubleExtra(EXTRA_LON, 0.0)
-                    )
+                    MapFragmentArgs(
+                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                        latLng = LatLng(
+                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                            intent.getDoubleExtra(EXTRA_LON, 0.0)
+                        )
+                    ).toBundle()
                 )
                 .createPendingIntent()
                 .send()
@@ -164,7 +201,16 @@ class MapsActivity : AppCompatActivity() {
                     .build()
             )
             .build()
-        intent.launchUrl(this, Uri.parse(url))
+        try {
+            intent.launchUrl(this, Uri.parse(url))
+        } catch (e: ActivityNotFoundException) {
+            val cb = fragmentCallback ?: return
+            Snackbar.make(
+                cb.getRootView(),
+                R.string.no_browser_app_found,
+                Snackbar.LENGTH_SHORT
+            ).show()
+        }
     }
 
     fun shareUrl(url: String) {
@@ -174,4 +220,15 @@ class MapsActivity : AppCompatActivity() {
         }
         startActivity(intent)
     }
+
+    override fun onPreferenceStartFragment(
+        caller: PreferenceFragmentCompat,
+        pref: Preference
+    ): Boolean {
+        // Identify the Navigation Destination
+        val navDestination = navController.graph
+            .find { target -> target is FragmentNavigator.Destination && pref.fragment == target.className }
+        navDestination?.let { target -> navController.navigate(target.id) }
+        return true
+    }
 }

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

@@ -1,9 +1,17 @@
 package net.vonforst.evmap
 
+import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.*
 import android.text.style.StyleSpan
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import java.util.*
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -51,4 +59,57 @@ fun String.bold(): CharSequence {
             Spannable.SPAN_INCLUSIVE_EXCLUSIVE
         )
     }
+}
+
+fun <T> Collection<Iterable<T>>.cartesianProduct(): Set<Set<T>> =
+    /**
+    Returns all possible combinations of entries of a list
+     */
+    if (isEmpty()) emptySet()
+    else drop(1).fold(first().map(::setOf)) { acc, iterable ->
+        acc.flatMap { list -> iterable.map(list::plus) }
+    }.toSet()
+
+
+fun max(a: Int?, b: Int?): Int? {
+    /**
+     * Returns the maximum of two values of both are non-null,
+     * otherwise the non-null value or null
+     */
+    return if (a != null && b != null) {
+        max(a, b)
+    } else {
+        a ?: b
+    }
+}
+
+fun <T> List<T>.containsAny(vararg values: T) = values.any { this.contains(it) }
+
+public suspend fun <T> LiveData<T>.await(): T {
+    return withContext(Dispatchers.Main.immediate) {
+        suspendCancellableCoroutine { continuation ->
+            val observer = object : Observer<T> {
+                override fun onChanged(value: T) {
+                    removeObserver(this)
+                    continuation.resume(value, null)
+                }
+            }
+
+            observeForever(observer)
+
+            continuation.invokeOnCancellation {
+                removeObserver(observer)
+            }
+        }
+    }
+}
+
+fun Context.isDarkMode() =
+    (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
+
+const val kmPerMile = 1.609344
+const val meterPerFt = 0.3048
+
+fun shouldUseImperialUnits(): Boolean {
+    return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
 }

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -9,20 +9,22 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.chip.Chip
 import net.vonforst.evmap.BR
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.chargeprice.ChargePrice
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
 import net.vonforst.evmap.api.chargeprice.ChargepriceTag
-import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.databinding.ItemChargepriceBinding
+import net.vonforst.evmap.databinding.ItemChargepriceVehicleChipBinding
 import net.vonforst.evmap.databinding.ItemConnectorButtonBinding
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.ui.CheckableConstraintLayout
-import net.vonforst.evmap.viewmodel.FavoritesViewModel
 
 interface Equatable {
-    override fun equals(other: Any?): Boolean;
+    override fun equals(other: Any?): Boolean
 }
 
 abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
@@ -86,18 +88,6 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
 }
 
-
-class FavoritesAdapter(val vm: FavoritesViewModel) :
-    DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
-    init {
-        setHasStableIds(true)
-    }
-
-    override fun getItemViewType(position: Int): Int = R.layout.item_favorite
-
-    override fun getItemId(position: Int): Long = getItem(position).charger.id
-}
-
 class ChargepriceAdapter() :
     DataBindingAdapter<ChargePrice>() {
 
@@ -178,8 +168,10 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         }
         root.setOnCheckedChangeListener { v: View, checked: Boolean ->
             if (checked) {
-                checkedItem = position
-                notifyDataSetChanged()
+                checkedItem = holder.bindingAdapterPosition
+                root.post {
+                    notifyDataSetChanged()
+                }
                 onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
             }
         }
@@ -188,7 +180,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
     fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
 
     fun setCheckedItem(item: Chargepoint?) {
-        checkedItem = item?.let { currentList.indexOf(item) } ?: null
+        checkedItem = item?.let { currentList.indexOf(item) }
     }
 
     var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null
@@ -197,4 +189,38 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
 class ChargepriceTagsAdapter() :
     DataBindingAdapter<ChargepriceTag>() {
     override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_tag
+}
+
+class CheckableChargepriceCarAdapter : DataBindingAdapter<ChargepriceCar>() {
+    private var checkedItem: ChargepriceCar? = null
+
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_vehicle_chip
+
+    override fun onBindViewHolder(holder: ViewHolder<ChargepriceCar>, position: Int) {
+        val item = getItem(position)
+        super.bind(holder, item)
+        val binding = holder.binding as ItemChargepriceVehicleChipBinding
+        val root = binding.root as Chip
+        root.isChecked = checkedItem == item
+        root.setOnClickListener {
+            root.isChecked = true
+        }
+        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+            if (checked && item != checkedItem) {
+                checkedItem = item
+                root.post {
+                    notifyDataSetChanged()
+                }
+                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
+            }
+        }
+    }
+
+    fun getCheckedItem(): ChargepriceCar? = checkedItem
+
+    fun setCheckedItem(item: ChargepriceCar?) {
+        checkedItem = item
+    }
+
+    var onCheckedItemChangedListener: ((ChargepriceCar?) -> Unit)? = null
 }

app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt

@@ -3,12 +3,12 @@ package net.vonforst.evmap.adapter
 import android.content.Context
 import androidx.core.text.HtmlCompat
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.goingelectric.ChargeCard
-import net.vonforst.evmap.api.goingelectric.ChargeCardId
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.OpeningHoursDays
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
+import net.vonforst.evmap.model.ChargeCard
+import net.vonforst.evmap.model.ChargeCardId
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.OpeningHoursDays
 import net.vonforst.evmap.plus
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -18,7 +18,7 @@ class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
     data class Detail(
         val icon: Int,
         val contentDescription: Int,
-        val text: CharSequence,
+        val text: CharSequence?,
         val detailText: CharSequence? = null,
         val links: Boolean = true,
         val clickable: Boolean = false,
@@ -84,10 +84,10 @@ fun buildDetails(
                 loc.openinghours.getStatusText(ctx)
             else
                 loc.openinghours.description ?: "",
-            if (loc.openinghours.days != null) loc.openinghours.description else null,
+            if (loc.openinghours.days != null || loc.openinghours.twentyfourSeven) loc.openinghours.description else null,
             hoursDays = loc.openinghours.days
         ) else null,
-        if (loc.cost != null) DetailsAdapter.Detail(
+        if (loc.cost != null && !loc.cost.isEmpty) DetailsAdapter.Detail(
             R.drawable.ic_cost,
             R.string.cost,
             loc.cost.getStatusText(ctx),
@@ -119,7 +119,7 @@ fun buildDetails(
             loc.coordinates.formatDecimal(),
             links = false,
             clickable = true
-        )
+        ),
     )
 }
 

app/src/main/java/net/vonforst/evmap/adapter/FavoritesAdapter.kt

@@ -0,0 +1,39 @@
+package net.vonforst.evmap.adapter
+
+import android.annotation.SuppressLint
+import android.view.animation.AccelerateInterpolator
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.ItemFavoriteBinding
+import net.vonforst.evmap.viewmodel.FavoritesViewModel
+
+class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> Unit) :
+    DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun getItemViewType(position: Int): Int = R.layout.item_favorite
+
+    override fun getItemId(position: Int): Long = getItem(position).charger.id
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun bind(
+        holder: ViewHolder<FavoritesViewModel.FavoritesListItem>,
+        item: FavoritesViewModel.FavoritesListItem
+    ) {
+        super.bind(holder, item)
+
+        val binding = holder.binding as ItemFavoriteBinding
+        binding.foreground.translationX = 0f
+        binding.btnDelete.setOnClickListener {
+            binding.foreground.animate()
+                .translationX(binding.foreground.width.toFloat())
+                .setDuration(250)
+                .setInterpolator(AccelerateInterpolator())
+                .withEndAction {
+                    onDelete(item)
+                }
+                .start()
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/adapter/FiltersAdapter.kt

@@ -12,7 +12,7 @@ import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceBinding
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceLargeBinding
 import net.vonforst.evmap.databinding.ItemFilterSliderBinding
 import net.vonforst.evmap.fragment.MultiSelectDialog
-import net.vonforst.evmap.viewmodel.*
+import net.vonforst.evmap.model.*
 import kotlin.math.max
 
 class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {

app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt

@@ -2,7 +2,9 @@ package net.vonforst.evmap.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -11,19 +13,11 @@ import coil.load
 import coil.memory.MemoryCache
 import coil.size.OriginalSize
 import coil.size.SizeResolver
-import com.ortiz.touchview.TouchImageView
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.goingelectric.ChargerPhoto
+import net.vonforst.evmap.model.ChargerPhoto
 
 
-class GalleryAdapter(
-    context: Context,
-    val itemClickListener: ItemClickListener? = null,
-    val detailView: Boolean = false,
-    val pageToLoad: Int? = null,
-    val imageCacheKey: MemoryCache.Key? = null,
-    val loadedListener: (() -> Unit)? = null
-) :
+class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener? = null) :
     ListAdapter<ChargerPhoto, GalleryAdapter.ViewHolder>(ChargerPhotoDiffCallback()) {
     class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
 
@@ -38,106 +32,34 @@ class GalleryAdapter(
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        val view: ImageView
-        if (detailView) {
-            view = inflater.inflate(R.layout.gallery_item_fullscreen, parent, false) as ImageView
-            view.setOnTouchListener { v, event ->
-                var result = true
-                //can scroll horizontally checks if there's still a part of the image
-                //that can be scrolled until you reach the edge
-                if (event.pointerCount >= 2 || v.canScrollHorizontally(1) && v.canScrollHorizontally(
-                        -1
-                    )
-                ) {
-                    //multi-touch event
-                    result = when (event.action) {
-                        MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
-                            // Disallow RecyclerView to intercept touch events.
-                            parent.requestDisallowInterceptTouchEvent(true)
-                            // Disable touch on view
-                            false
-                        }
-                        MotionEvent.ACTION_UP -> {
-                            // Allow RecyclerView to intercept touch events.
-                            parent.requestDisallowInterceptTouchEvent(false)
-                            true
-                        }
-                        else -> true
-                    }
-                }
-                result
-            }
-        } else {
-            view = inflater.inflate(R.layout.gallery_item, parent, false) as ImageView
-        }
+        val view = inflater.inflate(R.layout.gallery_item, parent, false) as ImageView
         return ViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        if (detailView) {
-            (holder.view as TouchImageView).resetZoom()
-        }
         val id = getItem(position).id
-        val url = "https://api.goingelectric.de/chargepoints/photo/?key=${apikey}" +
-                "&id=$id" +
-                if (detailView) {
-                    "&size=1000"
-                } else {
-                    "&height=${holder.view.height}"
-                }
+        val url = getItem(position).getUrl(height = holder.view.height)
 
         holder.view.load(
             url
         ) {
-            if (pageToLoad == position && imageCacheKey != null) {
-                placeholderMemoryCacheKey(imageCacheKey)
-            }
             size(SizeResolver(OriginalSize))
             allowHardware(false)
             listener(
                 onSuccess = { _, metadata ->
                     memoryKeys[id] = metadata.memoryCacheKey
-                    if (pageToLoad == position) invokeLoadedListener(holder.view)
-                },
-                onError = { _, _ ->
-                    if (!loaded && loadedListener != null && pageToLoad == position) {
-                        loadedListener.invoke()
-                        loaded = true
-                    }
                 }
             )
         }
-        if (pageToLoad == position && imageCacheKey != null) {
-            // start transition immediately
-            if (pageToLoad == position) invokeLoadedListener(holder.view)
-        }
-        holder.view.transitionName = galleryTransitionName(position)
+
         if (itemClickListener != null) {
             holder.view.setOnClickListener {
                 itemClickListener.onItemClick(holder.view, position, memoryKeys[id])
             }
         }
     }
-
-    private fun invokeLoadedListener(
-        view: ImageView
-    ) {
-        if (!loaded && loadedListener != null) {
-            view.viewTreeObserver.addOnPreDrawListener(object :
-                ViewTreeObserver.OnPreDrawListener {
-                override fun onPreDraw(): Boolean {
-                    view.viewTreeObserver.removeOnPreDrawListener(this)
-                    loadedListener.invoke()
-                    return true
-                }
-            })
-            loaded = true
-        }
-    }
 }
 
-fun galleryTransitionName(position: Int) = "gallery_$position"
-
 class ChargerPhotoDiffCallback : DiffUtil.ItemCallback<ChargerPhoto>() {
     override fun areItemsTheSame(oldItem: ChargerPhoto, newItem: ChargerPhoto): Boolean {
         return oldItem.id == newItem.id

app/src/main/java/net/vonforst/evmap/adapter/PlaceAutocompleteAdapter.kt

@@ -0,0 +1,216 @@
+package net.vonforst.evmap.adapter
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.LiveData
+import com.car2go.maps.model.LatLng
+import net.vonforst.evmap.R
+import net.vonforst.evmap.autocomplete.*
+import net.vonforst.evmap.containsAny
+import net.vonforst.evmap.databinding.ItemAutocompleteResultBinding
+import net.vonforst.evmap.isDarkMode
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.storage.RecentAutocompletePlace
+import java.time.Instant
+
+class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatLng>) :
+    BaseAdapter(), Filterable {
+    private var resultList: List<AutocompletePlace>? = null
+    private val providers = getAutocompleteProviders(context)
+    private val typeItem = 0
+    private val typeAttribution = 1
+    private val maxItems = 6
+    private var currentProvider: AutocompleteProvider? = null
+    private val recents = AppDatabase.getInstance(context).recentAutocompletePlaceDao()
+    private var recentResults = mutableListOf<RecentAutocompletePlace>()
+
+    data class ViewHolder(val binding: ItemAutocompleteResultBinding)
+
+    override fun getCount(): Int {
+        return resultList?.let { it.size + 1 } ?: 0
+    }
+
+    override fun getItem(position: Int): AutocompletePlace? {
+        return if (position < resultList!!.size) resultList!![position] else null
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (position < resultList!!.size) typeItem else typeAttribution
+    }
+
+    override fun getViewTypeCount(): Int = 2
+
+    override fun getItemId(position: Int): Long {
+        return 0
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+        var view = convertView
+        if (getItemViewType(position) == typeItem) {
+            val viewHolder: ViewHolder
+            if (view == null) {
+                val binding: ItemAutocompleteResultBinding = DataBindingUtil.inflate(
+                    LayoutInflater.from(context),
+                    R.layout.item_autocomplete_result,
+                    parent,
+                    false
+                )
+                view = binding.root
+                viewHolder = ViewHolder(binding)
+                view.tag = viewHolder
+            } else {
+                viewHolder = view.tag as ViewHolder
+            }
+            val place = resultList!![position]
+            bindView(viewHolder, place)
+        } else if (getItemViewType(position) == typeAttribution) {
+            if (view == null) {
+                view = LayoutInflater.from(context)
+                    .inflate(R.layout.item_autocomplete_attribution, parent, false)
+            }
+            (view as ImageView).apply {
+                setImageResource(currentProvider?.getAttributionImage(context.isDarkMode()) ?: 0)
+                contentDescription = context.getString(currentProvider?.getAttributionString() ?: 0)
+            }
+
+        }
+        return view!!
+    }
+
+    private fun bindView(
+        viewHolder: ViewHolder,
+        place: AutocompletePlace
+    ) {
+        viewHolder.binding.item = place
+    }
+
+    override fun getFilter(): Filter {
+        return object : Filter() {
+            var delaySet = false
+
+            init {
+                if (PreferenceDataSource(context).searchProvider == "mapbox") {
+                    // set delay to 500 ms to reduce paid Mapbox API requests
+                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
+                }
+            }
+
+            override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+                resultList = results?.values as? List<AutocompletePlace>?
+                if (results != null && results.count > 0) {
+                    notifyDataSetChanged()
+                } else {
+                    notifyDataSetInvalidated()
+                }
+            }
+
+            override fun performFiltering(constraint: CharSequence?): FilterResults {
+                val query = constraint.toString()
+                var resultList: List<AutocompletePlace>? = null
+                if (constraint != null) {
+                    for (provider in providers) {
+                        try {
+                            recentResults.clear()
+                            currentProvider = provider
+
+                            // first search in recent places
+                            val recentPlaces = if (query.isEmpty()) {
+                                recents.getAll(provider.id, limit = maxItems)
+                            } else {
+                                recents.search(query, provider.id, limit = maxItems)
+                            }
+                            recentResults.addAll(recentPlaces)
+                            resultList = recentPlaces.map { it.asAutocompletePlace(location.value) }
+                            Handler(Looper.getMainLooper()).post {
+                                // publish intermediate results on main thread
+                                publishResults(constraint, resultList.asFilterResults())
+                            }
+
+                            // if we already have enough results or the query is short, stop here
+                            if (isShortQuery(query) || recentResults.size >= maxItems) break
+
+                            // then search online
+                            val recentIds = recentPlaces.map { it.id }
+                            resultList =
+                                (resultList!! + provider.autocomplete(query, location.value)
+                                    .filter { !recentIds.contains(it.id) }).take(maxItems)
+                            break
+                        } catch (e: ApiUnavailableException) {
+                            e.printStackTrace()
+                        }
+                    }
+                }
+
+
+                if (currentProvider is MapboxAutocompleteProvider && !delaySet) {
+                    // set delay to 500 ms to reduce paid Mapbox API requests
+                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
+                }
+
+                return resultList.asFilterResults()
+            }
+
+            private fun List<AutocompletePlace>?.asFilterResults(): FilterResults {
+                val result = FilterResults()
+                if (this != null) {
+                    result.values = this
+                    result.count = this.size
+                }
+                return result
+            }
+        }
+    }
+
+    private fun isShortQuery(query: CharSequence) = query.length < 3
+
+    suspend fun getDetails(id: String): PlaceWithBounds {
+        val provider = currentProvider!!
+        val result = resultList!!.find { it.id == id }!!
+
+        val recentPlace = recentResults.find { it.id == id }
+        if (recentPlace != null) return recentPlace.asPlaceWithBounds()
+
+        val details = provider.getDetails(id)
+
+        recents.insert(RecentAutocompletePlace(result, details, provider.id, Instant.now()))
+
+        return details
+    }
+
+}
+
+
+fun iconForPlaceType(types: List<AutocompletePlaceType>): Int =
+    when {
+        types.contains(
+            AutocompletePlaceType.RECENT
+        ) -> R.drawable.ic_history
+        types.containsAny(
+            AutocompletePlaceType.LIGHT_RAIL_STATION,
+            AutocompletePlaceType.BUS_STATION,
+            AutocompletePlaceType.TRAIN_STATION,
+            AutocompletePlaceType.TRANSIT_STATION
+        ) -> {
+            R.drawable.ic_place_type_train
+        }
+        types.contains(AutocompletePlaceType.AIRPORT) -> {
+            R.drawable.ic_place_type_airport
+        }
+        // TODO: extend this with icons for more place categories
+        else -> {
+            R.drawable.ic_place_type_default
+        }
+    }
+
+fun isSpecialPlace(types: List<AutocompletePlaceType>): Boolean =
+    !setOf(
+        R.drawable.ic_place_type_default,
+        R.drawable.ic_history
+    ).contains(iconForPlaceType(types))

app/src/main/java/net/vonforst/evmap/api/ChargepointApi.kt

@@ -0,0 +1,68 @@
+package net.vonforst.evmap.api
+
+import android.content.Context
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
+import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
+import net.vonforst.evmap.model.*
+import net.vonforst.evmap.viewmodel.Resource
+
+interface ChargepointApi<out T : ReferenceData> {
+    suspend fun getChargepoints(
+        referenceData: ReferenceData,
+        bounds: LatLngBounds,
+        zoom: Float,
+        filters: FilterValues?
+    ): Resource<List<ChargepointListItem>>
+
+    suspend fun getChargepointsRadius(
+        referenceData: ReferenceData,
+        location: LatLng,
+        radius: Int,
+        zoom: Float,
+        filters: FilterValues?
+    ): Resource<List<ChargepointListItem>>
+
+    suspend fun getChargepointDetail(
+        referenceData: ReferenceData,
+        id: Long
+    ): Resource<ChargeLocation>
+
+    suspend fun getReferenceData(): Resource<T>
+
+    fun getFilters(referenceData: ReferenceData, sp: StringProvider): List<Filter<FilterValue>>
+
+    fun getName(): String
+}
+
+interface StringProvider {
+    fun getString(id: Int): String
+}
+
+fun Context.stringProvider() = object : StringProvider {
+    override fun getString(id: Int): String {
+        return this@stringProvider.getString(id)
+    }
+}
+
+fun createApi(type: String, ctx: Context): ChargepointApi<ReferenceData> {
+    return when (type) {
+        "openchargemap" -> {
+            OpenChargeMapApiWrapper(
+                ctx.getString(
+                    R.string.openchargemap_key
+                )
+            )
+        }
+        "goingelectric" -> {
+            GoingElectricApiWrapper(
+                ctx.getString(
+                    R.string.goingelectric_key
+                )
+            )
+        }
+        else -> throw IllegalArgumentException()
+    }
+}

app/src/main/java/net/vonforst/evmap/api/Utils.kt

@@ -1,17 +1,17 @@
 package net.vonforst.evmap.api
 
-import android.content.Context
 import androidx.annotation.DrawableRes
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.model.Chargepoint
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Response
 import org.json.JSONArray
 import java.io.IOException
 import kotlin.coroutines.resumeWithException
+import kotlin.math.abs
 
 operator fun <T> JSONArray.iterator(): Iterator<T> =
     (0 until length()).asSequence().map {
@@ -45,9 +45,13 @@ suspend fun Call.await(): Response {
 
 private val plugNames = mapOf(
     Chargepoint.TYPE_1 to R.string.plug_type_1,
-    Chargepoint.TYPE_2 to R.string.plug_type_2,
+    Chargepoint.TYPE_2_UNKNOWN to R.string.plug_type_2,
+    Chargepoint.TYPE_2_PLUG to R.string.plug_type_2,
+    Chargepoint.TYPE_2_SOCKET to R.string.plug_type_2,
     Chargepoint.TYPE_3 to R.string.plug_type_3,
-    Chargepoint.CCS to R.string.plug_ccs,
+    Chargepoint.CCS_UNKNOWN to R.string.plug_ccs,
+    Chargepoint.CCS_TYPE_1 to R.string.plug_ccs,
+    Chargepoint.CCS_TYPE_2 to R.string.plug_ccs,
     Chargepoint.SCHUKO to R.string.plug_schuko,
     Chargepoint.CHADEMO to R.string.plug_chademo,
     Chargepoint.SUPERCHARGER to R.string.plug_supercharger,
@@ -56,22 +60,52 @@ private val plugNames = mapOf(
     Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc
 )
 
-fun nameForPlugType(ctx: Context, type: String): String =
+fun nameForPlugType(ctx: StringProvider, type: String): String =
     plugNames[type]?.let {
         ctx.getString(it)
     } ?: type
 
+fun equivalentPlugTypes(type: String): Set<String> {
+    return when (type) {
+        Chargepoint.CCS_TYPE_1 -> setOf(Chargepoint.CCS_UNKNOWN, Chargepoint.CCS_TYPE_1)
+        Chargepoint.CCS_TYPE_2 -> setOf(Chargepoint.CCS_UNKNOWN, Chargepoint.CCS_TYPE_2)
+        Chargepoint.CCS_UNKNOWN -> setOf(
+            Chargepoint.CCS_UNKNOWN,
+            Chargepoint.CCS_TYPE_1,
+            Chargepoint.CCS_TYPE_2
+        )
+        Chargepoint.TYPE_2_PLUG -> setOf(Chargepoint.TYPE_2_UNKNOWN, Chargepoint.TYPE_2_PLUG)
+        Chargepoint.TYPE_2_SOCKET -> setOf(Chargepoint.TYPE_2_UNKNOWN, Chargepoint.TYPE_2_SOCKET)
+        Chargepoint.TYPE_2_UNKNOWN -> setOf(
+            Chargepoint.TYPE_2_UNKNOWN,
+            Chargepoint.TYPE_2_PLUG,
+            Chargepoint.TYPE_2_SOCKET
+        )
+        else -> setOf(type)
+    }
+}
+
 @DrawableRes
 fun iconForPlugType(type: String): Int =
     when (type) {
-        Chargepoint.CCS -> R.drawable.ic_connector_ccs
+        Chargepoint.CCS_TYPE_2 -> R.drawable.ic_connector_ccs_typ2
+        Chargepoint.CCS_UNKNOWN -> R.drawable.ic_connector_ccs_typ2
+        Chargepoint.CCS_TYPE_1 -> R.drawable.ic_connector_ccs_typ1
         Chargepoint.CHADEMO -> R.drawable.ic_connector_chademo
         Chargepoint.SCHUKO -> R.drawable.ic_connector_schuko
         Chargepoint.SUPERCHARGER -> R.drawable.ic_connector_supercharger
-        Chargepoint.TYPE_2 -> R.drawable.ic_connector_typ2
+        Chargepoint.TYPE_2_UNKNOWN -> R.drawable.ic_connector_typ2
+        Chargepoint.TYPE_2_SOCKET -> R.drawable.ic_connector_typ2
+        Chargepoint.TYPE_2_PLUG -> R.drawable.ic_connector_typ2
         Chargepoint.CEE_BLAU -> R.drawable.ic_connector_cee_blau
         Chargepoint.CEE_ROT -> R.drawable.ic_connector_cee_rot
         Chargepoint.TYPE_1 -> R.drawable.ic_connector_typ1
         // TODO: add other connectors
         else -> 0
-    }
+    }
+
+val powerSteps = listOf(0, 2, 3, 7, 11, 22, 43, 50, 75, 100, 150, 200, 250, 300, 350)
+fun mapPower(i: Int) = powerSteps[i]
+fun mapPowerInverse(power: Int) = powerSteps
+    .mapIndexed { index, v -> abs(v - power) to index }
+    .minByOrNull { it.first }?.second ?: 0

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

@@ -6,12 +6,11 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.Chargepoint
-import net.vonforst.evmap.viewmodel.FilterValues
+import net.vonforst.evmap.api.equivalentPlugTypes
+import net.vonforst.evmap.cartesianProduct
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.viewmodel.Resource
-import net.vonforst.evmap.viewmodel.getMultipleChoiceValue
-import net.vonforst.evmap.viewmodel.getSliderValue
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -66,10 +65,21 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
+            var chargepoints = chargepoints
+
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
-            val geTypes = chargepoints.map { it.type }.distinct().toSet()
-            if (types != geTypes) throw AvailabilityDetectorException("chargepoints do not match")
+            val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
+            var geTypes = chargepoints.map { it.type }.distinct().toSet()
+            if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
+                    Chargepoint.SCHUKO
+                )) {
+                // If charger has household plugs and other plugs, try removing the household plugs
+                // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
+                geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
+                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
+            }
+            if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
                 // find connectors of this type
                 val connsOfType = connectors.filter { it.value.second == type }
@@ -77,13 +87,14 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                 val powers = connsOfType.map { it.value.first }.distinct().sorted()
                 // find corresponding powers in GE data
                 val gePowers =
-                    chargepoints.filter { it.type == type }.map { it.power }.distinct().sorted()
+                    chargepoints.filter { equivalentPlugTypes(it.type).any { it == type } }
+                        .map { it.power }.distinct().sorted()
 
                 // if the distinct number of powers is the same, try to match.
                 if (powers.size == gePowers.size) {
                     gePowers.zip(powers).map { (gePower, power) ->
                         val chargepoint =
-                            chargepoints.find { it.type == type && it.power == gePower }!!
+                            chargepoints.find { equivalentPlugTypes(it.type).any { it == type } && it.power == gePower }!!
                         val ids = connsOfType.filter { it.value.first == power }.keys
                         if (chargepoint.count != ids.size) {
                             throw AvailabilityDetectorException("chargepoints do not match")
@@ -91,7 +102,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumBy { it.count } == connsOfType.size
+                    && chargepoints.sumOf { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one
@@ -99,7 +110,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                     var i = 0
                     gePowers.map { gePower ->
                         val chargepoint =
-                            chargepoints.find { it.type == type && it.power == gePower }!!
+                            chargepoints.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
                         val ids = allIds.subList(i, i + chargepoint.count).toSet()
                         i += chargepoint.count
                         chargepoint to ids
@@ -117,14 +128,12 @@ data class ChargeLocationStatus(
     val status: Map<Chargepoint, List<ChargepointStatus>>,
     val source: String
 ) {
-    fun applyFilters(filters: FilterValues?): ChargeLocationStatus {
-        if (filters == null) return this
-
-        val connectorsVal = filters.getMultipleChoiceValue("connectors")
-        val minPower = filters.getSliderValue("min_power")
-
+    fun applyFilters(connectors: Set<String>?, minPower: Int?): ChargeLocationStatus {
         val statusFiltered = status.filterKeys {
-            (connectorsVal.all || it.type in connectorsVal.values) && it.power > minPower
+            (connectors == null || connectors.map {
+                equivalentPlugTypes(it)
+            }.any { equivalent -> it.type in equivalent })
+                    && (minPower == null || it.power > minPower)
         }
         return this.copy(status = statusFiltered)
     }

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

@@ -1,9 +1,9 @@
 package net.vonforst.evmap.api.availability
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.api.iterator
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
 import okhttp3.OkHttpClient
 import org.json.JSONObject
 import java.io.IOException
@@ -85,9 +85,9 @@ class ChargecloudAvailabilityDetector(
 
     private fun getType(string: String): String {
         return when (string) {
-            "IEC_62196_T2" -> Chargepoint.TYPE_2
+            "IEC_62196_T2" -> Chargepoint.TYPE_2_UNKNOWN
             "DOMESTIC_F" -> Chargepoint.SCHUKO
-            "IEC_62196_T2_COMBO" -> Chargepoint.CCS
+            "IEC_62196_T2_COMBO" -> Chargepoint.CCS_TYPE_2
             "CHADEMO" -> Chargepoint.CHADEMO
             else -> throw IllegalArgumentException("unrecognized type $string")
         }

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

@@ -1,8 +1,8 @@
 package net.vonforst.evmap.api.availability
 
 import com.squareup.moshi.JsonClass
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -141,11 +141,11 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
             val power = connector.electricalProperties.getPower()
             val type = when (connector.connectorType.toLowerCase(Locale.ROOT)) {
                 "type3" -> Chargepoint.TYPE_3
-                "type2" -> Chargepoint.TYPE_2
+                "type2" -> Chargepoint.TYPE_2_UNKNOWN
                 "type1" -> Chargepoint.TYPE_1
                 "domestic" -> Chargepoint.SCHUKO
-                "type1combo" -> Chargepoint.CCS  // US CCS, aka type1_combo
-                "type2combo" -> Chargepoint.CCS  // EU CCS, aka type2_combo
+                "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"

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

@@ -15,6 +15,7 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
+import java.util.*
 
 interface ChargepriceApi {
     @POST("charge_prices")
@@ -33,6 +34,9 @@ interface ChargepriceApi {
         private val cacheSize = 1L * 1024 * 1024 // 1MB
         val supportedLanguages = setOf("de", "en", "fr", "nl")
 
+        val DATA_SOURCE_GOINGELECTRIC = "going_electric"
+        val DATA_SOURCE_OPENCHARGEMAP = "open_charge_map"
+
         private val jsonApiAdapterFactory = ResourceAdapterFactory.builder()
             .add(ChargepriceRequest::class.java)
             .add(ChargepriceTariff::class.java)
@@ -74,5 +78,61 @@ interface ChargepriceApi {
                 .build()
             return retrofit.create(ChargepriceApi::class.java)
         }
+
+
+        fun getChargepriceLanguage(): String {
+            val locale = Locale.getDefault().language
+            return if (supportedLanguages.contains(locale)) {
+                locale
+            } else {
+                "en"
+            }
+        }
+
+        @JvmStatic
+        fun isCountrySupported(country: String, dataSource: String): Boolean = when (dataSource) {
+            // list of countries updated 2021/08/24
+            "goingelectric" -> country in listOf(
+                "Deutschland",
+                "Österreich",
+                "Schweiz",
+                "Frankreich",
+                "Belgien",
+                "Niederlande",
+                "Luxemburg",
+                "Dänemark",
+                "Norwegen",
+                "Schweden",
+                "Slowenien",
+                "Kroatien",
+                "Ungarn",
+                "Tschechien",
+                "Italien",
+                "Spanien",
+                "Großbritannien",
+                "Irland"
+            )
+            "openchargemap" -> country in listOf(
+                "DE",
+                "AT",
+                "CH",
+                "FR",
+                "BE",
+                "NE",
+                "LU",
+                "DK",
+                "NO",
+                "SE",
+                "SI",
+                "HR",
+                "HU",
+                "CZ",
+                "IT",
+                "ES",
+                "GB",
+                "IE"
+            )
+            else -> false
+        }
     }
 }

app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt

@@ -9,7 +9,9 @@ import moe.banana.jsonapi2.JsonApi
 import moe.banana.jsonapi2.Resource
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
+import net.vonforst.evmap.api.equivalentPlugTypes
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.ui.currency
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -33,19 +35,23 @@ data class ChargepriceStation(
     @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepoint>
 ) {
     companion object {
-        fun fromGoingelectric(
-            geCharger: ChargeLocation,
-            compatibleConnectors: List<String>
+        fun fromEvmap(
+            charger: ChargeLocation,
+            compatibleConnectors: List<String>,
         ): ChargepriceStation {
+            if (charger.chargepriceData == null) throw IllegalArgumentException()
+
+            val plugTypes =
+                charger.chargepriceData.plugTypes ?: charger.chargepoints.map { it.type }
             return ChargepriceStation(
-                geCharger.coordinates.lng,
-                geCharger.coordinates.lat,
-                geCharger.address.country,
-                geCharger.network,
-                geCharger.chargepoints.filter {
-                    it.type in compatibleConnectors
+                charger.coordinates.lng,
+                charger.coordinates.lat,
+                charger.chargepriceData.country,
+                charger.chargepriceData.network,
+                charger.chargepoints.zip(plugTypes).filter {
+                    equivalentPlugTypes(it.first.type).any { it in compatibleConnectors }
                 }.map {
-                    ChargepriceChargepoint(it.power, it.type)
+                    ChargepriceChargepoint(it.first.power, it.second)
                 }
             )
         }
@@ -112,7 +118,7 @@ class ChargepriceTariff() : Resource() {
 }
 
 @JsonApi(type = "car")
-class ChargepriceCar : Resource() {
+class ChargepriceCar : Resource(), Equatable {
     lateinit var name: String
     lateinit var brand: String
 
@@ -143,6 +149,26 @@ class ChargepriceCar : Resource() {
         result = 31 * result + manufacturer.hashCode()
         return result
     }
+
+    private val acConnectors = listOf(
+        Chargepoint.CEE_BLAU,
+        Chargepoint.CEE_ROT,
+        Chargepoint.SCHUKO,
+        Chargepoint.TYPE_1,
+        Chargepoint.TYPE_2_UNKNOWN,
+        Chargepoint.TYPE_2_SOCKET,
+        Chargepoint.TYPE_2_PLUG
+    )
+    private val plugMapping = mapOf(
+        "ccs" to Chargepoint.CCS_UNKNOWN,
+        "tesla_suc" to Chargepoint.SUPERCHARGER,
+        "tesla_ccs" to Chargepoint.CCS_UNKNOWN,
+        "chademo" to Chargepoint.CHADEMO
+    )
+    val compatibleEvmapConnectors: List<String>
+        get() = dcChargePorts.map {
+            plugMapping[it]
+        }.filterNotNull().plus(acConnectors)
 }
 
 @JsonApi(type = "brand")
@@ -179,6 +205,9 @@ class ChargePrice : Resource(), Equatable, Cloneable {
     @field:Json(name = "charge_point_prices")
     lateinit var chargepointPrices: List<ChargepointPrice>
 
+    @field:Json(name = "branding")
+    var branding: ChargepriceBranding? = null
+
     var tariff: HasOne<ChargepriceTariff>? = null
 
 
@@ -212,6 +241,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
         if (startTime != other.startTime) return false
         if (tags != other.tags) return false
         if (chargepointPrices != other.chargepointPrices) return false
+        if (branding != other.branding) return false
 
         return true
     }
@@ -230,6 +260,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
         result = 31 * result + startTime
         result = 31 * result + tags.hashCode()
         result = 31 * result + chargepointPrices.hashCode()
+        result = 31 * result + branding.hashCode()
         return result
     }
 
@@ -248,6 +279,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
             totalMonthlyFee = this@ChargePrice.totalMonthlyFee
             url = this@ChargePrice.url
             tariff = this@ChargePrice.tariff
+            branding = this@ChargePrice.branding
         }
     }
 }
@@ -302,6 +334,12 @@ data class ChargepointPrice(
     }
 }
 
+data class ChargepriceBranding(
+    @Json(name = "background_color") val backgroundColor: String,
+    @Json(name = "text_color") val textColor: String,
+    @Json(name = "logo_url") val logoUrl: String
+)
+
 data class PriceDistribution(val kwh: Double?, val session: Double?, val minute: Double?) {
     val isOnlyKwh =
         kwh != null && kwh > 0 && (session == null || session == 0.0) && (minute == null || minute == 0.0)
@@ -313,6 +351,19 @@ data class ChargepriceMeta(
     @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepointMeta>
 )
 
+enum class ChargepriceInclude {
+    @Json(name = "filter")
+    FILTER,
+    @Json(name = "always")
+    ALWAYS,
+    @Json(name = "exclusive")
+    EXCLUSIVE
+}
+
+data class ChargepriceRequestTariffMeta(
+    val include: ChargepriceInclude
+)
+
 data class ChargepriceChargepointMeta(
     val power: Double,
     val plug: String,

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt

@@ -13,7 +13,7 @@ internal class ChargepointListItemJsonAdapterFactory : JsonAdapter.Factory {
         annotations: MutableSet<out Annotation>,
         moshi: Moshi
     ): JsonAdapter<*>? {
-        if (Types.getRawType(type) == ChargepointListItem::class.java) {
+        if (Types.getRawType(type) == GEChargepointListItem::class.java) {
             return ChargepointListItemJsonAdapter(
                 moshi
             )
@@ -26,18 +26,18 @@ internal class ChargepointListItemJsonAdapterFactory : JsonAdapter.Factory {
 
 
 internal class ChargepointListItemJsonAdapter(val moshi: Moshi) :
-    JsonAdapter<ChargepointListItem>() {
+    JsonAdapter<GEChargepointListItem>() {
     private val clusterAdapter =
-        moshi.adapter<ChargeLocationCluster>(
-            ChargeLocationCluster::class.java
+        moshi.adapter<GEChargeLocationCluster>(
+            GEChargeLocationCluster::class.java
         )
 
-    private val locationAdapter = moshi.adapter<ChargeLocation>(
-        ChargeLocation::class.java
+    private val locationAdapter = moshi.adapter<GEChargeLocation>(
+        GEChargeLocation::class.java
     )
 
     @FromJson
-    override fun fromJson(reader: JsonReader): ChargepointListItem {
+    override fun fromJson(reader: JsonReader): GEChargepointListItem {
         var clustered = false
         reader.peekJson().use { peeked ->
             peeked.beginObject()
@@ -61,7 +61,7 @@ internal class ChargepointListItemJsonAdapter(val moshi: Moshi) :
         val CLUSTERED: JsonReader.Options = JsonReader.Options.of("clustered")
     }
 
-    override fun toJson(writer: JsonWriter, value: ChargepointListItem?) {
+    override fun toJson(writer: JsonWriter, value: GEChargepointListItem?) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
@@ -94,8 +94,8 @@ internal class JsonObjectOrFalseAdapter<T> private constructor(
         JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
             false -> null // Response was false
             else -> {
-                if (this.clazz == FaultReport::class.java) {
-                    FaultReport(null, null) as T
+                if (this.clazz == GEFaultReport::class.java) {
+                    GEFaultReport(null, null) as T
                 } else {
                     throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
                 }
@@ -126,20 +126,20 @@ internal class HoursAdapter {
     private val regex = Regex("from (.*) till (.*)")
 
     @FromJson
-    fun fromJson(str: String): Hours? {
+    fun fromJson(str: String): GEHours? {
         if (str == "closed") {
-            return Hours(null, null)
+            return GEHours(null, null)
         } else {
             val match = regex.find(str)
             if (match != null) {
-                return Hours(
+                return GEHours(
                     LocalTime.parse(match.groupValues[1]),
                     LocalTime.parse(match.groupValues[2])
                 )
             } else {
                 // I cannot reproduce this case, but it seems to occur once in a while
                 Log.e("GoingElectricApi", "invalid hours value: " + str)
-                return Hours(
+                return GEHours(
                     LocalTime.MIN, LocalTime.MIN
                 )
             }
@@ -147,7 +147,7 @@ internal class HoursAdapter {
     }
 
     @ToJson
-    fun toJson(value: Hours): String {
+    fun toJson(value: GEHours): String {
         if (value.start == null || value.end == null) {
             return "closed"
         } else {

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -1,9 +1,21 @@
 package net.vonforst.evmap.api.goingelectric
 
 import android.content.Context
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.withContext
 import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.*
+import net.vonforst.evmap.model.*
+import net.vonforst.evmap.ui.cluster
+import net.vonforst.evmap.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.getClusterDistance
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import retrofit2.Response
@@ -11,6 +23,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Query
+import java.io.IOException
 
 interface GoingElectricApi {
     @GET("chargepoints/")
@@ -31,7 +44,7 @@ interface GoingElectricApi {
         @Query("open_twentyfourseven") open247: Boolean = false,
         @Query("barrierfree") barrierfree: Boolean = false,
         @Query("exclude_faults") excludeFaults: Boolean = false
-    ): Response<ChargepointList>
+    ): Response<GEChargepointList>
 
     @GET("chargepoints/")
     suspend fun getChargepointsRadius(
@@ -52,24 +65,24 @@ interface GoingElectricApi {
         @Query("open_twentyfourseven") open247: Boolean = false,
         @Query("barrierfree") barrierfree: Boolean = false,
         @Query("exclude_faults") excludeFaults: Boolean = false
-    ): Response<ChargepointList>
+    ): Response<GEChargepointList>
 
     @GET("chargepoints/")
-    suspend fun getChargepointDetail(@Query("ge_id") id: Long): Response<ChargepointList>
+    suspend fun getChargepointDetail(@Query("ge_id") id: Long): Response<GEChargepointList>
 
     @GET("chargepoints/pluglist/")
-    suspend fun getPlugs(): Response<StringList>
+    suspend fun getPlugs(): Response<GEStringList>
 
     @GET("chargepoints/networklist/")
-    suspend fun getNetworks(): Response<StringList>
+    suspend fun getNetworks(): Response<GEStringList>
 
     @GET("chargepoints/chargecardlist/")
-    suspend fun getChargeCards(): Response<ChargeCardList>
+    suspend fun getChargeCards(): Response<GEChargeCardList>
 
     companion object {
         private val cacheSize = 10L * 1024 * 1024 // 10MB
 
-        val moshi = Moshi.Builder()
+        private val moshi = Moshi.Builder()
             .add(ChargepointListItemJsonAdapterFactory())
             .add(JsonObjectOrFalseAdapter.Factory())
             .add(HoursAdapter())
@@ -106,3 +119,364 @@ interface GoingElectricApi {
         }
     }
 }
+
+class GoingElectricApiWrapper(
+    val apikey: String,
+    baseurl: String = "https://api.goingelectric.de",
+    context: Context? = null
+) : ChargepointApi<GEReferenceData> {
+    val api = GoingElectricApi.create(apikey, baseurl, context)
+
+    override fun getName() = "GoingElectric.de"
+
+    override suspend fun getChargepoints(
+        referenceData: ReferenceData,
+        bounds: LatLngBounds,
+        zoom: Float,
+        filters: FilterValues?
+    ): Resource<List<ChargepointListItem>> {
+        val freecharging = filters?.getBooleanValue("freecharging")
+        val freeparking = filters?.getBooleanValue("freeparking")
+        val open247 = filters?.getBooleanValue("open_247")
+        val barrierfree = filters?.getBooleanValue("barrierfree")
+        val excludeFaults = filters?.getBooleanValue("exclude_faults")
+        val minPower = filters?.getSliderValue("min_power")
+        val minConnectors = filters?.getSliderValue("min_connectors")
+
+        var connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
+        }
+        val connectors = formatMultipleChoice(connectorsVal)
+
+        val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
+        if (chargeCardsVal != null && chargeCardsVal.values.isEmpty() && !chargeCardsVal.all) {
+            // no chargeCards chosen
+            return Resource.success(emptyList())
+        }
+        val chargeCards = formatMultipleChoice(chargeCardsVal)
+
+        val networksVal = filters?.getMultipleChoiceValue("networks")
+        if (networksVal != null && networksVal.values.isEmpty() && !networksVal.all) {
+            // no networks chosen
+            return Resource.success(emptyList())
+        }
+        val networks = formatMultipleChoice(networksVal)
+
+        val categoriesVal = filters?.getMultipleChoiceValue("categories")
+        if (categoriesVal != null && categoriesVal.values.isEmpty() && !categoriesVal.all) {
+            // no categories chosen
+            return Resource.success(emptyList())
+        }
+        val categories = formatMultipleChoice(categoriesVal)
+
+        // do not use clustering if filters need to be applied locally.
+        val useClustering = zoom < 13
+        val geClusteringAvailable = minConnectors == null || minConnectors <= 1
+        val useGeClustering = useClustering && geClusteringAvailable
+        val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
+
+        var startkey: Int? = null
+        val data = mutableListOf<GEChargepointListItem>()
+        do {
+            // load all pages of the response
+            try {
+                val response = api.getChargepoints(
+                    bounds.southwest.latitude,
+                    bounds.southwest.longitude,
+                    bounds.northeast.latitude,
+                    bounds.northeast.longitude,
+                    clustering = useGeClustering,
+                    zoom = zoom,
+                    clusterDistance = clusterDistance,
+                    freecharging = freecharging ?: false,
+                    minPower = minPower ?: 0,
+                    freeparking = freeparking ?: false,
+                    open247 = open247 ?: false,
+                    barrierfree = barrierfree ?: false,
+                    excludeFaults = excludeFaults ?: false,
+                    plugs = connectors,
+                    chargecards = chargeCards,
+                    networks = networks,
+                    categories = categories,
+                    startkey = startkey
+                )
+                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                    return Resource.error(response.message(), null)
+                } else {
+                    val body = response.body()!!
+                    data.addAll(body.chargelocations)
+                    startkey = body.startkey
+                }
+            } catch (e: IOException) {
+                return Resource.error(e.message, null)
+            }
+        } while (startkey != null && startkey < 10000)
+
+        var result = postprocessResult(data, minPower, connectorsVal, minConnectors, zoom)
+
+        return Resource.success(result)
+    }
+
+    private fun formatMultipleChoice(value: MultipleChoiceFilterValue?) =
+        if (value == null || value.all) null else value.values.joinToString(",")
+
+    override suspend fun getChargepointsRadius(
+        referenceData: ReferenceData,
+        location: LatLng,
+        radius: Int,
+        zoom: Float,
+        filters: FilterValues?
+    ): Resource<List<ChargepointListItem>> {
+        val freecharging = filters?.getBooleanValue("freecharging")
+        val freeparking = filters?.getBooleanValue("freeparking")
+        val open247 = filters?.getBooleanValue("open_247")
+        val barrierfree = filters?.getBooleanValue("barrierfree")
+        val excludeFaults = filters?.getBooleanValue("exclude_faults")
+        val minPower = filters?.getSliderValue("min_power")
+        val minConnectors = filters?.getSliderValue("min_connectors")
+
+        var connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
+        }
+        val connectors = formatMultipleChoice(connectorsVal)
+
+        val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
+        if (chargeCardsVal != null && chargeCardsVal.values.isEmpty() && !chargeCardsVal.all) {
+            // no chargeCards chosen
+            return Resource.success(emptyList())
+        }
+        val chargeCards = formatMultipleChoice(chargeCardsVal)
+
+        val networksVal = filters?.getMultipleChoiceValue("networks")
+        if (networksVal != null && networksVal.values.isEmpty() && !networksVal.all) {
+            // no networks chosen
+            return Resource.success(emptyList())
+        }
+        val networks = formatMultipleChoice(networksVal)
+
+        val categoriesVal = filters?.getMultipleChoiceValue("categories")
+        if (categoriesVal != null && categoriesVal.values.isEmpty() && !categoriesVal.all) {
+            // no categories chosen
+            return Resource.success(emptyList())
+        }
+        val categories = formatMultipleChoice(categoriesVal)
+
+        // do not use clustering if filters need to be applied locally.
+        val useClustering = zoom < 13
+        val geClusteringAvailable = minConnectors == null || minConnectors <= 1
+        val useGeClustering = useClustering && geClusteringAvailable
+        val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
+
+        var startkey: Int? = null
+        val data = mutableListOf<GEChargepointListItem>()
+        do {
+            // load all pages of the response
+            try {
+                val response = api.getChargepointsRadius(
+                    location.latitude, location.longitude, radius,
+                    clustering = useGeClustering,
+                    zoom = zoom,
+                    clusterDistance = clusterDistance,
+                    freecharging = freecharging ?: false,
+                    minPower = minPower ?: 0,
+                    freeparking = freeparking ?: false,
+                    open247 = open247 ?: false,
+                    barrierfree = barrierfree ?: false,
+                    excludeFaults = excludeFaults ?: false,
+                    plugs = connectors,
+                    chargecards = chargeCards,
+                    networks = networks,
+                    categories = categories,
+                    startkey = startkey
+                )
+                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                    return Resource.error(response.message(), null)
+                } else {
+                    val body = response.body()!!
+                    data.addAll(body.chargelocations)
+                    startkey = body.startkey
+                }
+            } catch (e: IOException) {
+                return Resource.error(e.message, null)
+            }
+        } while (startkey != null && startkey < 10000)
+
+        val result = postprocessResult(data, minPower, connectorsVal, minConnectors, zoom)
+        return Resource.success(result)
+    }
+
+    private fun postprocessResult(
+        chargers: List<GEChargepointListItem>,
+        minPower: Int?,
+        connectorsVal: MultipleChoiceFilterValue?,
+        minConnectors: Int?,
+        zoom: Float
+    ): List<ChargepointListItem> {
+        // apply filters which GoingElectric does not support natively
+        var result = chargers.filter { it ->
+            if (it is GEChargeLocation) {
+                it.chargepoints
+                    .filter { it.power >= (minPower ?: 0) }
+                    .filter { if (connectorsVal != null && !connectorsVal.all) it.type in connectorsVal.values else true }
+                    .sumOf { it.count } >= (minConnectors ?: 0)
+            } else {
+                true
+            }
+        }.map { it.convert(apikey) }
+
+        // apply clustering
+        val useClustering = zoom < 13
+        val geClusteringAvailable = minConnectors == null || minConnectors <= 1
+        val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
+        if (!geClusteringAvailable && useClustering) {
+            // apply local clustering if server side clustering is not available
+            Dispatchers.IO.run {
+                result = cluster(result, zoom, clusterDistance!!)
+            }
+        }
+        return result
+    }
+
+    override suspend fun getChargepointDetail(
+        referenceData: ReferenceData,
+        id: Long
+    ): Resource<ChargeLocation> {
+        try {
+            val response = api.getChargepointDetail(id)
+            return if (response.isSuccessful && response.body()!!.status == "ok" && response.body()!!.chargelocations.size == 1) {
+                Resource.success(
+                    (response.body()!!.chargelocations[0] as GEChargeLocation).convert(
+                        apikey
+                    )
+                )
+            } else {
+                Resource.error(response.message(), null)
+            }
+        } catch (e: IOException) {
+            return Resource.error(e.message, null)
+        }
+    }
+
+    override suspend fun getReferenceData(): Resource<GEReferenceData> =
+        withContext(Dispatchers.IO) {
+            supervisorScope {
+                try {
+                    val plugs = async { api.getPlugs() }
+                    val chargeCards = async { api.getChargeCards() }
+                    val networks = async { api.getNetworks() }
+
+                    val plugsResponse = plugs.await()
+                    val chargeCardsResponse = chargeCards.await()
+                    val networksResponse = networks.await()
+
+                    val responses = listOf(plugsResponse, chargeCardsResponse, networksResponse)
+
+                    if (responses.map { it.isSuccessful }.all { it }) {
+                        Resource.success(
+                            GEReferenceData(
+                                plugsResponse.body()!!.result,
+                                networksResponse.body()!!.result,
+                                chargeCardsResponse.body()!!.result
+                            )
+                        )
+                    } else {
+                        Resource.error(responses.find { !it.isSuccessful }!!.message(), null)
+                    }
+                } catch (e: IOException) {
+                    Resource.error(e.message, null)
+                }
+            }
+        }
+
+    override fun getFilters(
+        referenceData: ReferenceData,
+        sp: StringProvider
+    ): List<Filter<FilterValue>> {
+        val referenceData = referenceData as GEReferenceData
+        val plugs = referenceData.plugs
+        val networks = referenceData.networks
+        val chargeCards = referenceData.chargecards
+
+        val plugMap = plugs.map { plug ->
+            plug to nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
+        }.toMap()
+        val networkMap = networks.map { it to it }.toMap()
+        val chargecardMap = chargeCards.map { it.id.toString() to it.name }.toMap()
+        val categoryMap = mapOf(
+            "Autohaus" to sp.getString(R.string.category_car_dealership),
+            "Autobahnraststätte" to sp.getString(R.string.category_service_on_motorway),
+            "Autohof" to sp.getString(R.string.category_service_off_motorway),
+            "Bahnhof" to sp.getString(R.string.category_railway_station),
+            "Behörde" to sp.getString(R.string.category_public_authorities),
+            "Campingplatz" to sp.getString(R.string.category_camping),
+            "Einkaufszentrum" to sp.getString(R.string.category_shopping_mall),
+            "Ferienwohnung" to sp.getString(R.string.category_holiday_home),
+            "Flughafen" to sp.getString(R.string.category_airport),
+            "Freizeitpark" to sp.getString(R.string.category_amusement_park),
+            "Hotel" to sp.getString(R.string.category_hotel),
+            "Kino" to sp.getString(R.string.category_cinema),
+            "Kirche" to sp.getString(R.string.category_church),
+            "Krankenhaus" to sp.getString(R.string.category_hospital),
+            "Museum" to sp.getString(R.string.category_museum),
+            "Parkhaus" to sp.getString(R.string.category_parking_multi),
+            "Parkplatz" to sp.getString(R.string.category_parking),
+            "Privater Ladepunkt" to sp.getString(R.string.category_private_charger),
+            "Rastplatz" to sp.getString(R.string.category_rest_area),
+            "Restaurant" to sp.getString(R.string.category_restaurant),
+            "Schwimmbad" to sp.getString(R.string.category_swimming_pool),
+            "Supermarkt" to sp.getString(R.string.category_supermarket),
+            "Tankstelle" to sp.getString(R.string.category_petrol_station),
+            "Tiefgarage" to sp.getString(R.string.category_parking_underground),
+            "Tierpark" to sp.getString(R.string.category_zoo),
+            "Wohnmobilstellplatz" to sp.getString(R.string.category_caravan_site)
+        )
+        return listOf(
+            BooleanFilter(sp.getString(R.string.filter_free), "freecharging"),
+            BooleanFilter(sp.getString(R.string.filter_free_parking), "freeparking"),
+            BooleanFilter(sp.getString(R.string.filter_open_247), "open_247"),
+            SliderFilter(
+                sp.getString(R.string.filter_min_power), "min_power",
+                powerSteps.size - 1,
+                mapping = ::mapPower,
+                inverseMapping = ::mapPowerInverse,
+                unit = "kW"
+            ),
+            MultipleChoiceFilter(
+                sp.getString(R.string.filter_connectors), "connectors",
+                plugMap,
+                commonChoices = listOf(
+                    Chargepoint.TYPE_2_UNKNOWN,
+                    Chargepoint.CCS_UNKNOWN,
+                    Chargepoint.CHADEMO
+                ).map { GEChargepoint.convertTypeToGE(it)!! }.toSet(),
+                manyChoices = true
+            ),
+            SliderFilter(
+                sp.getString(R.string.filter_min_connectors),
+                "min_connectors",
+                10,
+                min = 1
+            ),
+            MultipleChoiceFilter(
+                sp.getString(R.string.filter_networks), "networks",
+                networkMap, manyChoices = true
+            ),
+            MultipleChoiceFilter(
+                sp.getString(R.string.categories), "categories",
+                categoryMap,
+                manyChoices = true
+            ),
+            BooleanFilter(sp.getString(R.string.filter_barrierfree), "barrierfree"),
+            MultipleChoiceFilter(
+                sp.getString(R.string.filter_chargecards), "chargecards",
+                chargecardMap, manyChoices = true
+            ),
+            BooleanFilter(sp.getString(R.string.filter_exclude_faults), "exclude_faults")
+        )
+    }
+}
+

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt

@@ -1,58 +1,47 @@
 package net.vonforst.evmap.api.goingelectric
 
-import android.content.Context
-import android.os.Parcelable
-import androidx.core.text.HtmlCompat
-import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.R
-import net.vonforst.evmap.adapter.Equatable
-import java.time.DayOfWeek
+import net.vonforst.evmap.model.*
 import java.time.Instant
-import java.time.LocalDate
 import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
-import java.util.*
-import kotlin.math.abs
-import kotlin.math.floor
 
 @JsonClass(generateAdapter = true)
-data class ChargepointList(
+data class GEChargepointList(
     val status: String,
-    val chargelocations: List<ChargepointListItem>,
+    val chargelocations: List<GEChargepointListItem>,
     @JsonObjectOrFalse val startkey: Int?
 )
 
 @JsonClass(generateAdapter = true)
-data class StringList(
+data class GEStringList(
     val status: String,
     val result: List<String>
 )
 
 @JsonClass(generateAdapter = true)
-data class ChargeCardList(
+data class GEChargeCardList(
     val status: String,
-    val result: List<ChargeCard>
+    val result: List<GEChargeCard>
 )
 
-sealed class ChargepointListItem
+sealed class GEChargepointListItem {
+    abstract fun convert(apikey: String): ChargepointListItem
+}
 
 @JsonClass(generateAdapter = true)
-@Entity
-data class ChargeLocation(
-    @Json(name = "ge_id") @PrimaryKey val id: Long,
+data class GEChargeLocation(
+    @Json(name = "ge_id") val id: Long,
     val name: String,
-    @Embedded val coordinates: Coordinate,
-    @Embedded val address: Address,
-    val chargepoints: List<Chargepoint>,
+    val coordinates: GECoordinate,
+    val address: GEAddress,
+    val chargepoints: List<GEChargepoint>,
     @JsonObjectOrFalse val network: String?,
     val url: String,
-    @Embedded(prefix = "fault_report_") @JsonObjectOrFalse @Json(name = "fault_report") val faultReport: FaultReport?,
+    @JsonObjectOrFalse @Json(name = "fault_report") val faultReport: GEFaultReport?,
     val verified: Boolean,
     @Json(name = "barrierfree") val barrierFree: Boolean?,
     // only shown in details:
@@ -60,260 +49,201 @@ data class ChargeLocation(
     @JsonObjectOrFalse @Json(name = "general_information") val generalInformation: String?,
     @JsonObjectOrFalse @Json(name = "ladeweile") val amenities: String?,
     @JsonObjectOrFalse @Json(name = "location_description") val locationDescription: String?,
-    val photos: List<ChargerPhoto>?,
-    @JsonObjectOrFalse val chargecards: List<ChargeCardId>?,
-    @Embedded val openinghours: OpeningHours?,
-    @Embedded val cost: Cost?
-) : ChargepointListItem(), Equatable {
-    /**
-     * maximum power available from this charger.
-     */
-    val maxPower: Double
-        get() {
-            return maxPower()
-        }
-
-    /**
-     * Gets the maximum power available from certain connectors of this charger.
-     */
-    fun maxPower(connectors: Set<String>? = null): Double {
-        return chargepoints.filter { connectors?.contains(it.type) ?: true }
-            .map { it.power }.maxOrNull() ?: 0.0
-    }
-
-    fun isMulti(filteredConnectors: Set<String>? = null): Boolean {
-        var chargepoints = chargepointsMerged
-            .filter { filteredConnectors?.contains(it.type) ?: true }
-        if (maxPower(filteredConnectors) >= 43) {
-            // fast charger -> only count fast chargers
-            chargepoints = chargepoints.filter { it.power >= 43 }
-        }
-        val connectors = chargepoints.map { it.type }.distinct().toSet()
-
-        // check if there is more than one plug for any connector type
-        val chargepointsPerConnector =
-            connectors.map { conn -> chargepoints.filter { it.type == conn }.sumBy { it.count } }
-        return chargepointsPerConnector.any { it > 1 }
-    }
-
-    /**
-     * Merges chargepoints if they have the same plug and power
-     *
-     * This occurs e.g. for Type2 sockets and plugs, which are distinct on the GE website, but not
-     * separable in the API
-     */
-    val chargepointsMerged: List<Chargepoint>
-        get() {
-            val variants = chargepoints.distinctBy { it.power to it.type }
-            return variants.map { variant ->
-                val count = chargepoints
-                    .filter { it.type == variant.type && it.power == variant.power }
-                    .sumBy { it.count }
-                Chargepoint(variant.type, variant.power, count)
-            }
-        }
-
-    val totalChargepoints: Int
-        get() = chargepoints.sumBy { it.count }
-
-    fun formatChargepoints(): String {
-        return chargepointsMerged.map {
-            "${it.count} × ${it.type} ${it.formatPower()}"
-        }.joinToString(" · ")
-    }
+    val photos: List<GEChargerPhoto>?,
+    @JsonObjectOrFalse val chargecards: List<GEChargeCardId>?,
+    val openinghours: GEOpeningHours?,
+    val cost: GECost?
+) : GEChargepointListItem() {
+    override fun convert(apikey: String) = ChargeLocation(
+        id,
+        "goingelectric",
+        name,
+        coordinates.convert(),
+        address.convert(),
+        chargepoints.map { it.convert() },
+        network,
+        "https:${url}",
+        "https:${url}edit/",
+        faultReport?.convert(),
+        verified,
+        barrierFree,
+        operator,
+        generalInformation,
+        amenities,
+        locationDescription,
+        photos?.map { it.convert(apikey) },
+        chargecards?.map { it.convert() },
+        openinghours?.convert(),
+        cost?.convert(),
+        null,
+        ChargepriceData(address.country, network, chargepoints.map { it.type })
+    )
 }
 
 @JsonClass(generateAdapter = true)
-data class Cost(
+data class GECost(
     val freecharging: Boolean,
     val freeparking: Boolean,
     @JsonObjectOrFalse @Json(name = "description_short") val descriptionShort: String?,
     @JsonObjectOrFalse @Json(name = "description_long") val descriptionLong: String?
 ) {
-    fun getStatusText(ctx: Context, emoji: Boolean = false): CharSequence {
-        val charging =
-            if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
-        val parking =
-            if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
-        return if (emoji) {
-            "⚡ $charging · \uD83C\uDD7F️ $parking"
-        } else {
-            HtmlCompat.fromHtml(ctx.getString(R.string.cost_detail, charging, parking), 0)
-        }
-    }
+    fun convert() = Cost(
+        // In GE, freecharging = false can either mean "paid charging" or "no information
+        // available", only freecharging = true provides useful information. Therefore convert
+        // false to null. Same for freeparking.
+        if (freecharging) freecharging else null,
+        if (freeparking) freeparking else null,
+        descriptionShort, descriptionLong
+    )
 }
 
 @JsonClass(generateAdapter = true)
-data class OpeningHours(
+data class GEOpeningHours(
     @Json(name = "24/7") val twentyfourSeven: Boolean,
     @JsonObjectOrFalse val description: String?,
-    @Embedded val days: OpeningHoursDays?
+    val days: GEOpeningHoursDays?
 ) {
-    val isEmpty: Boolean
-        get() = description == "Leider noch keine Informationen zu Öffnungszeiten vorhanden."
-                && days == null && !twentyfourSeven
-
-    fun getStatusText(ctx: Context): CharSequence {
-        if (twentyfourSeven) {
-            return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
-        } else if (days != null) {
-            val hours = days.getHoursForDate(LocalDate.now())
-            if (hours.start == null || hours.end == null) {
-                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
-            }
-
-            val now = LocalTime.now()
-            if (hours.start.isBefore(now) && hours.end.isAfter(now)) {
-                return HtmlCompat.fromHtml(
-                    ctx.getString(
-                        R.string.open_closesat,
-                        hours.end.toString()
-                    ), 0
-                )
-            } else if (hours.end.isBefore(now)) {
-                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
-            } else {
-                return HtmlCompat.fromHtml(
-                    ctx.getString(
-                        R.string.closed_opensat,
-                        hours.start.toString()
-                    ), 0
-                )
-            }
-        } else {
-            return ""
-        }
-    }
+    fun convert() = OpeningHours(twentyfourSeven, description, days?.convert())
 }
 
 @JsonClass(generateAdapter = true)
-data class OpeningHoursDays(
-    @Embedded(prefix = "mo") val monday: Hours,
-    @Embedded(prefix = "tu") val tuesday: Hours,
-    @Embedded(prefix = "we") val wednesday: Hours,
-    @Embedded(prefix = "th") val thursday: Hours,
-    @Embedded(prefix = "fr") val friday: Hours,
-    @Embedded(prefix = "sa") val saturday: Hours,
-    @Embedded(prefix = "su") val sunday: Hours,
-    @Embedded(prefix = "ho") val holiday: Hours
+data class GEOpeningHoursDays(
+    val monday: GEHours,
+    val tuesday: GEHours,
+    val wednesday: GEHours,
+    val thursday: GEHours,
+    val friday: GEHours,
+    val saturday: GEHours,
+    val sunday: GEHours,
+    val holiday: GEHours
 ) {
-    fun getHoursForDate(date: LocalDate): Hours {
-        // TODO: check for holidays
-        return getHoursForDayOfWeek(date.dayOfWeek)
-    }
-
-    fun getHoursForDayOfWeek(dayOfWeek: DayOfWeek?): Hours {
-        @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
-        return when (dayOfWeek) {
-            DayOfWeek.MONDAY -> monday
-            DayOfWeek.TUESDAY -> tuesday
-            DayOfWeek.WEDNESDAY -> wednesday
-            DayOfWeek.THURSDAY -> thursday
-            DayOfWeek.FRIDAY -> friday
-            DayOfWeek.SATURDAY -> saturday
-            DayOfWeek.SUNDAY -> sunday
-            null -> holiday
-        }
-    }
+    fun convert() = OpeningHoursDays(
+        monday.convert(),
+        tuesday.convert(),
+        wednesday.convert(),
+        thursday.convert(),
+        friday.convert(),
+        saturday.convert(),
+        sunday.convert(),
+        holiday.convert()
+    )
 }
 
-data class Hours(
+data class GEHours(
     val start: LocalTime?,
     val end: LocalTime?
 ) {
-    override fun toString(): String {
-        if (start != null && end != null) {
-            val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-            return "${start.format(fmt)} - ${end.format(fmt)}"
-        } else {
-            return "closed"
-        }
-    }
+    fun convert() = if (start != null && end != null) Hours(start, end) else null
 }
 
 @JsonClass(generateAdapter = true)
+data class GEChargerPhoto(val id: String) {
+    fun convert(apikey: String): ChargerPhoto = GEChargerPhotoAdapter(id, apikey)
+}
+
 @Parcelize
-data class ChargerPhoto(val id: String) : Parcelable
-
 @JsonClass(generateAdapter = true)
-data class ChargeLocationCluster(
-    val clusterCount: Int,
-    val coordinates: Coordinate
-) : ChargepointListItem()
-
-@JsonClass(generateAdapter = true)
-data class Coordinate(val lat: Double, val lng: Double) {
-    fun formatDMS(): String {
-        return "${dms(lat, false)}, ${dms(lng, true)}"
-    }
-
-    private fun dms(value: Double, lon: Boolean): String {
-        val hemisphere = if (lon) {
-            if (value >= 0) "E" else "W"
-        } else {
-            if (value >= 0) "N" else "S"
-        }
-        val d = abs(value)
-        val degrees = floor(d).toInt()
-        val minutes = floor((d - degrees) * 60).toInt()
-        val seconds = ((d - degrees) * 60 - minutes) * 60
-        return "%d°%02d'%02.1f\"%s".format(Locale.ENGLISH, degrees, minutes, seconds, hemisphere)
-    }
-
-    fun formatDecimal(): String {
-        return "%.6f, %.6f".format(Locale.ENGLISH, lat, lng)
+class GEChargerPhotoAdapter(override val id: String, val apikey: String) :
+    ChargerPhoto(id) {
+    override fun getUrl(height: Int?, width: Int?, size: Int?): String {
+        return "https://api.goingelectric.de/chargepoints/photo/?key=${apikey}&id=$id" +
+                when {
+                    size != null -> "&size=$size"
+                    height != null -> "&height=$height"
+                    width != null -> "&width=$width"
+                    else -> ""
+                }
     }
 }
 
 @JsonClass(generateAdapter = true)
-data class Address(
+data class GEChargeLocationCluster(
+    val clusterCount: Int,
+    val coordinates: GECoordinate
+) : GEChargepointListItem() {
+    override fun convert(apikey: String) =
+        ChargeLocationCluster(clusterCount, coordinates.convert())
+}
+
+@JsonClass(generateAdapter = true)
+data class GECoordinate(val lat: Double, val lng: Double) {
+    fun convert() = Coordinate(lat, lng)
+}
+
+@JsonClass(generateAdapter = true)
+data class GEAddress(
     @JsonObjectOrFalse val city: String?,
     @JsonObjectOrFalse val country: String?,
     @JsonObjectOrFalse val postcode: String?,
     @JsonObjectOrFalse val street: String?
 ) {
-    override fun toString(): String {
-        return "${street ?: ""}, ${postcode ?: ""} ${city ?: ""}"
-    }
+    fun convert() = Address(city, country, postcode, street)
 }
 
 @JsonClass(generateAdapter = true)
-data class Chargepoint(val type: String, val power: Double, val count: Int) : Equatable {
-    fun formatPower(): String {
-        val powerFmt = if (power - power.toInt() == 0.0) {
-            "%.0f".format(power)
-        } else {
-            "%.1f".format(power)
-        }
-        return "$powerFmt kW"
-    }
+data class GEChargepoint(val type: String, val power: Double, val count: Int) {
+    fun convert() = Chargepoint(convertTypeFromGE(type), power, count)
 
     companion object {
-        const val TYPE_1 = "Typ1"
-        const val TYPE_2 = "Typ2"
-        const val TYPE_3 = "Typ3"
-        const val CCS = "CCS"
-        const val SCHUKO = "Schuko"
-        const val CHADEMO = "CHAdeMO"
-        const val SUPERCHARGER = "Tesla Supercharger"
-        const val CEE_BLAU = "CEE Blau"
-        const val CEE_ROT = "CEE Rot"
-        const val TESLA_ROADSTER_HPC = "Tesla HPC"
+        fun convertTypeToGE(type: String): String? {
+            return when (type) {
+                Chargepoint.TYPE_1 -> "Typ1"
+                Chargepoint.TYPE_2_UNKNOWN -> "Typ2"
+                Chargepoint.TYPE_3 -> "Typ3"
+                Chargepoint.CCS_UNKNOWN -> "CCS"
+                Chargepoint.CCS_TYPE_2 -> "Typ2"
+                Chargepoint.SCHUKO -> "Schuko"
+                Chargepoint.CHADEMO -> "CHAdeMO"
+                Chargepoint.SUPERCHARGER -> "Tesla Supercharger"
+                Chargepoint.CEE_BLAU -> "CEE Blau"
+                Chargepoint.CEE_ROT -> "CEE Rot"
+                Chargepoint.TESLA_ROADSTER_HPC -> "Tesla HPC"
+                else -> null
+            }
+        }
+
+        fun convertTypeFromGE(type: String): String {
+            return when (type) {
+                "Typ1" -> Chargepoint.TYPE_1
+                "Typ2" -> Chargepoint.TYPE_2_UNKNOWN
+                "Typ3" -> Chargepoint.TYPE_3
+                "CCS" -> Chargepoint.CCS_UNKNOWN
+                "Schuko" -> Chargepoint.SCHUKO
+                "CHAdeMO" -> Chargepoint.CHADEMO
+                "Tesla Supercharger" -> Chargepoint.SUPERCHARGER
+                "CEE Blau" -> Chargepoint.CEE_BLAU
+                "CEE Rot" -> Chargepoint.CEE_ROT
+                "Tesla HPC" -> Chargepoint.TESLA_ROADSTER_HPC
+                else -> type
+            }
+        }
     }
 }
 
 @JsonClass(generateAdapter = true)
-data class FaultReport(val created: Instant?, val description: String?)
+data class GEFaultReport(val created: Instant?, val description: String?) {
+    fun convert() = FaultReport(created, description)
+}
 
-@Entity
 @JsonClass(generateAdapter = true)
-data class ChargeCard(
+@Entity
+data class GEChargeCard(
     @Json(name = "card_id") @PrimaryKey val id: Long,
     val name: String,
     val url: String
-)
+) {
+    fun convert() = ChargeCard(id, name, url)
+}
 
 @JsonClass(generateAdapter = true)
-data class ChargeCardId(
+data class GEChargeCardId(
     val id: Long
-)
+) {
+    fun convert() = ChargeCardId(id)
+}
+
+data class GEReferenceData(
+    val plugs: List<String>,
+    val networks: List<String>,
+    val chargecards: List<GEChargeCard>
+) : ReferenceData()

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapAdapters.kt

@@ -0,0 +1,15 @@
+package net.vonforst.evmap.api.openchargemap
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.ZonedDateTime
+
+internal class ZonedDateTimeAdapter {
+    @FromJson
+    fun fromJson(value: String?): ZonedDateTime? = value?.let {
+        ZonedDateTime.parse(value)
+    }
+
+    @ToJson
+    fun toJson(value: ZonedDateTime?): String? = value?.toString()
+}

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt

@@ -0,0 +1,328 @@
+package net.vonforst.evmap.api.openchargemap
+
+import android.content.Context
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
+import com.facebook.stetho.okhttp3.StethoInterceptor
+import com.squareup.moshi.Moshi
+import kotlinx.coroutines.Dispatchers
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.*
+import net.vonforst.evmap.model.*
+import net.vonforst.evmap.ui.cluster
+import net.vonforst.evmap.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.getClusterDistance
+import okhttp3.Cache
+import okhttp3.OkHttpClient
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.GET
+import retrofit2.http.Query
+import java.io.IOException
+
+interface OpenChargeMapApi {
+    @GET("poi/")
+    suspend fun getChargepoints(
+        @Query("boundingbox") boundingbox: OCMBoundingBox,
+        @Query("connectiontypeid") plugs: String? = null,
+        @Query("minpowerkw") minPower: Double? = null,
+        @Query("operatorid") operators: String? = null,
+        @Query("statustypeid") statusType: String? = null,
+        @Query("maxresults") maxresults: Int = 500,
+        @Query("compact") compact: Boolean = true,
+        @Query("verbose") verbose: Boolean = false
+    ): Response<List<OCMChargepoint>>
+
+    @GET("poi/")
+    suspend fun getChargepointsRadius(
+        @Query("latitude") latitude: Double,
+        @Query("longitude") longitude: Double,
+        @Query("distance") distance: Double,
+        @Query("distanceunit") distanceUnit: String = "KM",
+        @Query("connectiontypeid") plugs: String? = null,
+        @Query("minpowerkw") minPower: Double? = null,
+        @Query("operatorid") operators: String? = null,
+        @Query("statustypeid") statusType: String? = null,
+        @Query("maxresults") maxresults: Int = 500,
+        @Query("compact") compact: Boolean = true,
+        @Query("verbose") verbose: Boolean = false
+    ): Response<List<OCMChargepoint>>
+
+    @GET("poi/")
+    suspend fun getChargepointDetail(
+        @Query("chargepointid") id: Long,
+        @Query("includecomments") includeComments: Boolean = true,
+        @Query("compact") compact: Boolean = false,
+        @Query("verbose") verbose: Boolean = false
+    ): Response<List<OCMChargepoint>>
+
+    @GET("referencedata/")
+    suspend fun getReferenceData(): Response<OCMReferenceData>
+
+    companion object {
+        private val cacheSize = 10L * 1024 * 1024 // 10MB
+
+        private val moshi = Moshi.Builder()
+            .add(ZonedDateTimeAdapter())
+            .build()
+
+        fun create(
+            apikey: String,
+            baseurl: String = "https://api.openchargemap.io/v3/",
+            context: Context? = null
+        ): OpenChargeMapApi {
+            val client = OkHttpClient.Builder().apply {
+                addInterceptor { chain ->
+                    // add API key to every request
+                    val original = chain.request()
+                    val new = original.newBuilder()
+                        .header("X-API-Key", apikey)
+                        .build()
+                    chain.proceed(new)
+                }
+                if (BuildConfig.DEBUG) {
+                    addNetworkInterceptor(StethoInterceptor())
+                }
+                if (context != null) {
+                    cache(Cache(context.cacheDir, cacheSize))
+                }
+            }.build()
+
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseurl)
+                .addConverterFactory(MoshiConverterFactory.create(moshi))
+                .client(client)
+                .build()
+            return retrofit.create(OpenChargeMapApi::class.java)
+        }
+    }
+}
+
+class OpenChargeMapApiWrapper(
+    apikey: String,
+    baseurl: String = "https://api.openchargemap.io/v3/",
+    context: Context? = null
+) : ChargepointApi<OCMReferenceData> {
+    val api = OpenChargeMapApi.create(apikey, baseurl, context)
+
+    override fun getName() = "OpenChargeMap.org"
+
+    private fun formatMultipleChoice(value: MultipleChoiceFilterValue?) =
+        if (value == null || value.all) null else value.values.joinToString(",")
+
+    override suspend fun getChargepoints(
+        referenceData: ReferenceData,
+        bounds: LatLngBounds,
+        zoom: Float,
+        filters: FilterValues?,
+    ): Resource<List<ChargepointListItem>> {
+        val referenceData = referenceData as OCMReferenceData
+
+        val minPower = filters?.getSliderValue("min_power")?.toDouble()
+        val minConnectors = filters?.getSliderValue("min_connectors")
+        val excludeFaults = filters?.getBooleanValue("exclude_faults")
+
+        val connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
+        }
+        val connectors = formatMultipleChoice(connectorsVal)
+
+        val operatorsVal = filters?.getMultipleChoiceValue("operators")!!
+        if (operatorsVal != null && operatorsVal.values.isEmpty() && !operatorsVal.all) {
+            // no operators chosen
+            return Resource.success(emptyList())
+        }
+        val operators = formatMultipleChoice(operatorsVal)
+
+        try {
+            val response = api.getChargepoints(
+                OCMBoundingBox(
+                    bounds.southwest.latitude, bounds.southwest.longitude,
+                    bounds.northeast.latitude, bounds.northeast.longitude
+                ),
+                minPower = minPower,
+                plugs = connectors,
+                operators = operators,
+                statusType = if (excludeFaults == true) noFaultStatuses.joinToString(",") else null
+            )
+            if (!response.isSuccessful) {
+                return Resource.error(response.message(), null)
+            }
+
+            var result = postprocessResult(
+                response.body()!!,
+                minPower,
+                connectorsVal,
+                minConnectors,
+                referenceData,
+                zoom
+            )
+            return Resource.success(result)
+        } catch (e: IOException) {
+            return Resource.error(e.message, null)
+        }
+    }
+
+    override suspend fun getChargepointsRadius(
+        referenceData: ReferenceData,
+        location: LatLng,
+        radius: Int,
+        zoom: Float,
+        filters: FilterValues?
+    ): Resource<List<ChargepointListItem>> {
+        val referenceData = referenceData as OCMReferenceData
+
+        val minPower = filters?.getSliderValue("min_power")?.toDouble()
+        val minConnectors = filters?.getSliderValue("min_connectors")
+        val excludeFaults = filters?.getBooleanValue("exclude_faults")
+
+        val connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
+        }
+        val connectors = formatMultipleChoice(connectorsVal)
+
+        val operatorsVal = filters?.getMultipleChoiceValue("operators")
+        if (operatorsVal != null && operatorsVal.values.isEmpty() && !operatorsVal.all) {
+            // no operators chosen
+            return Resource.success(emptyList())
+        }
+        val operators = formatMultipleChoice(operatorsVal)
+
+        try {
+            val response = api.getChargepointsRadius(
+                location.latitude, location.longitude,
+                radius.toDouble(),
+                minPower = minPower,
+                plugs = connectors,
+                operators = operators,
+                statusType = if (excludeFaults == true) noFaultStatuses.joinToString(",") else null
+            )
+            if (!response.isSuccessful) {
+                return Resource.error(response.message(), null)
+            }
+
+            val result = postprocessResult(
+                response.body()!!,
+                minPower,
+                connectorsVal,
+                minConnectors,
+                referenceData,
+                zoom
+            )
+            return Resource.success(result)
+        } catch (e: IOException) {
+            return Resource.error(e.message, null)
+        }
+    }
+
+    private fun postprocessResult(
+        chargers: List<OCMChargepoint>,
+        minPower: Double?,
+        connectorsVal: MultipleChoiceFilterValue?,
+        minConnectors: Int?,
+        referenceData: OCMReferenceData,
+        zoom: Float
+    ): List<ChargepointListItem> {
+        // apply filters which OCM does not support natively
+        var result = chargers.filter { it ->
+            it.connections
+                .filter { it.power == null || it.power >= (minPower ?: 0.0) }
+                .filter { if (connectorsVal != null && !connectorsVal.all) it.connectionTypeId in connectorsVal.values.map { it.toLong() } else true }
+                .sumOf { it.quantity ?: 1 } >= (minConnectors ?: 0)
+        }.map { it.convert(referenceData) }.distinct() as List<ChargepointListItem>
+
+        // apply clustering
+        val useClustering = zoom < 13
+        if (useClustering) {
+            val clusterDistance = getClusterDistance(zoom)
+            Dispatchers.IO.run {
+                result = cluster(result, zoom, clusterDistance!!)
+            }
+        }
+        return result
+    }
+
+    override suspend fun getChargepointDetail(
+        referenceData: ReferenceData,
+        id: Long
+    ): Resource<ChargeLocation> {
+        val referenceData = referenceData as OCMReferenceData
+        try {
+            val response = api.getChargepointDetail(id)
+            if (response.isSuccessful && response.body()?.size == 1) {
+                return Resource.success(response.body()!![0].convert(referenceData))
+            } else {
+                return Resource.error(response.message(), null)
+            }
+        } catch (e: IOException) {
+            return Resource.error(e.message, null)
+        }
+    }
+
+    override suspend fun getReferenceData(): Resource<OCMReferenceData> {
+        try {
+            val response = api.getReferenceData()
+            if (response.isSuccessful) {
+                return Resource.success(response.body()!!)
+            } else {
+                return Resource.error(response.message(), null)
+            }
+        } catch (e: IOException) {
+            return Resource.error(e.message, null)
+        }
+    }
+
+    override fun getFilters(
+        referenceData: ReferenceData,
+        sp: StringProvider
+    ): List<Filter<FilterValue>> {
+        val referenceData = referenceData as OCMReferenceData
+
+        val operatorsMap = referenceData.operators.map { it.id.toString() to it.title }.toMap()
+        val plugMap = referenceData.connectionTypes.map { it.id.toString() to it.title }.toMap()
+
+        return listOf(
+            // supported by OCM API
+            SliderFilter(
+                sp.getString(R.string.filter_min_power), "min_power",
+                powerSteps.size - 1,
+                mapping = ::mapPower,
+                inverseMapping = ::mapPowerInverse,
+                unit = "kW"
+            ),
+            MultipleChoiceFilter(
+                sp.getString(R.string.filter_connectors), "connectors",
+                plugMap,
+                commonChoices = setOf(
+                    "1", // Type 1 (J1772)
+                    "25", // Type 2 (Socket only)
+                    "1036", // Type 2 (Tethered connector)
+                    "32", // CCS (Type 1)
+                    "33", // CCS (Type 2)
+                    "2" // CHAdeMO
+                ),
+                manyChoices = true
+            ),
+            MultipleChoiceFilter(
+                sp.getString(R.string.filter_operators), "operators",
+                operatorsMap, manyChoices = true
+            ),
+            BooleanFilter(sp.getString(R.string.filter_exclude_faults), "exclude_faults"),
+
+            // local filters
+            SliderFilter(
+                sp.getString(R.string.filter_min_connectors),
+                "min_connectors",
+                10,
+                min = 1
+            ),
+        )
+    }
+
+}

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt

@@ -0,0 +1,261 @@
+package net.vonforst.evmap.api.openchargemap
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import kotlinx.parcelize.Parcelize
+import net.vonforst.evmap.max
+import net.vonforst.evmap.model.*
+import java.time.ZonedDateTime
+
+// Unknown, Currently Available, Currently In Use, Operational
+val noFaultStatuses = listOf(0, 10, 20, 50)
+
+// Temporarily Unavailable, Partly Operational, Not Operational, Planned For Future Date, Removed (Decommissioned)
+val faultStatuses = listOf(30L, 75L, 100L, 150L, 200L)
+val faultReportCommentType = 1000L
+
+data class OCMBoundingBox(
+    val sw_lat: Double, val sw_lng: Double,
+    val ne_lat: Double, val ne_lng: Double
+) {
+    override fun toString(): String {
+        return "($sw_lat,$sw_lng),($ne_lat,$ne_lng)"
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class OCMChargepoint(
+    @Json(name = "ID") val id: Long,
+    @Json(name = "IsRecentlyVerified") val recentlyVerified: Boolean,
+    @Json(name = "DateLastVerified") val dateLastVerified: ZonedDateTime?,
+    @Json(name = "UsageCost") val cost: String?,
+    @Json(name = "AddressInfo") val addressInfo: OCMAddressInfo,
+    @Json(name = "Connections") val connections: List<OCMConnection>,
+    @Json(name = "NumberOfPoints") val numPoints: Int?,
+    @Json(name = "GeneralComments") val generalComments: String?,
+    @Json(name = "OperatorInfo") val operatorInfo: OCMOperator?,
+    @Json(name = "OperatorID") val operatorId: Long?,
+    @Json(name = "DataProvider") val dataProvider: OCMDataProvider?,
+    @Json(name = "MediaItems") val mediaItems: List<OCMMediaItem>?,
+    @Json(name = "StatusTypeID") val statusTypeId: Long?,
+    @Json(name = "StatusType") val statusType: OCMStatusType?,
+    @Json(name = "UserComments") val userComments: List<OCMUserComment>?,
+    @Json(name = "DateLastStatusUpdate") val lastStatusUpdateDate: ZonedDateTime?
+) {
+    fun convert(refData: OCMReferenceData) = ChargeLocation(
+        id,
+        "openchargemap",
+        addressInfo.title,
+        Coordinate(addressInfo.latitude, addressInfo.longitude),
+        addressInfo.toAddress(refData),
+        connections.map { it.convert(refData) },
+        operatorInfo?.title,
+        "https://openchargemap.org/site/poi/details/$id",
+        "https://openchargemap.org/site/poi/edit/$id",
+        convertFaultReport(),
+        recentlyVerified,
+        null,
+        null,
+        generalComments,
+        null,
+        addressInfo.accessComments,
+        mediaItems?.mapNotNull { it.convert() },
+        null,
+        null,
+        cost?.let { Cost(descriptionShort = it) },
+        dataProvider?.let { "© ${it.title}" + if (it.license != null) ". ${it.license}" else "" },
+        ChargepriceData(
+            addressInfo.countryISOCode(refData),
+            operatorId?.toString(),
+            connections.map { "${it.connectionTypeId},${it.currentTypeId}" })
+    )
+
+    private fun convertFaultReport(): FaultReport? {
+        if (statusTypeId in faultStatuses || connections.any { it.statusTypeId in faultStatuses }) {
+            if (userComments != null) {
+                val comment = userComments.filter { it.commentTypeId == faultReportCommentType }
+                    .maxByOrNull { it.dateCreated }
+                if (comment != null) {
+                    return FaultReport(comment.dateCreated.toInstant(), comment.comment ?: "")
+                }
+            }
+            if (statusType != null && statusType.id in faultStatuses) {
+                return FaultReport(lastStatusUpdateDate?.toInstant(), statusType.title)
+            } else if (connections.any { it.statusType != null && it.statusTypeId in faultStatuses }) {
+                return FaultReport(
+                    lastStatusUpdateDate?.toInstant(),
+                    connections.first { it.statusType != null && it.statusTypeId in faultStatuses }.statusType!!.title
+                )
+            }
+            return FaultReport(null, null)
+        } else {
+            return null
+        }
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class OCMAddressInfo(
+    @Json(name = "Title") val title: String,
+    @Json(name = "AddressLine1") val addressLine1: String?,
+    @Json(name = "AddressLine2") val addressLine2: String?,
+    @Json(name = "Town") val town: String?,
+    @Json(name = "StateOrProvince") val stateOrProvince: String?,
+    @Json(name = "Postcode") val postcode: String?,
+    @Json(name = "CountryID") val countryId: Long,
+    @Json(name = "Latitude") val latitude: Double,
+    @Json(name = "Longitude") val longitude: Double,
+    @Json(name = "ContactTelephone1") val contactTelephone1: String?,
+    @Json(name = "ContactTelephone2") val contactTelephone2: String?,
+    @Json(name = "ContactEmail") val contactEmail: String?,
+    @Json(name = "AccessComments") val accessComments: String?,
+    @Json(name = "RelatedURL") val relatedUrl: String?
+) {
+    fun toAddress(refData: OCMReferenceData) = Address(
+        town,
+        refData.countries.find { it.id == countryId }?.title,
+        postcode,
+        listOfNotNull(addressLine1, addressLine2).joinToString(", ")
+    )
+
+    fun countryISOCode(refData: OCMReferenceData) =
+        refData.countries.find { it.id == countryId }?.isoCode
+}
+
+@JsonClass(generateAdapter = true)
+data class OCMConnection(
+    @Json(name = "ConnectionTypeID") val connectionTypeId: Long,
+    @Json(name = "CurrentTypeID") val currentTypeId: Long?,
+    @Json(name = "Amps") val amps: Int?,
+    @Json(name = "Voltage") val voltage: Int?,
+    @Json(name = "PowerKW") val power: Double?,
+    @Json(name = "Quantity") val quantity: Int?,
+    @Json(name = "Comments") val comments: String?,
+    @Json(name = "StatusTypeID") val statusTypeId: Long?,
+    @Json(name = "StatusType") val statusType: OCMStatusType?
+) {
+    fun convert(refData: OCMReferenceData) = Chargepoint(
+        convertConnectionTypeFromOCM(connectionTypeId, refData),
+        power ?: 0.0,
+        quantity ?: 1
+    )
+
+    companion object {
+        fun convertConnectionTypeFromOCM(id: Long, refData: OCMReferenceData): String {
+            val title = refData.connectionTypes.find { it.id == id }?.title
+            return when (id) {
+                32L -> Chargepoint.CCS_TYPE_1
+                33L -> Chargepoint.CCS_TYPE_2
+                2L -> Chargepoint.CHADEMO
+                16L -> Chargepoint.CEE_BLAU
+                17L -> Chargepoint.CEE_ROT
+                28L -> Chargepoint.SCHUKO
+                8L -> Chargepoint.TESLA_ROADSTER_HPC
+                27L -> Chargepoint.SUPERCHARGER
+                25L -> Chargepoint.TYPE_2_SOCKET
+                1036L -> Chargepoint.TYPE_2_PLUG
+                1L -> Chargepoint.TYPE_1
+                36L -> Chargepoint.TYPE_3
+                26L -> Chargepoint.TYPE_3
+                else -> title ?: ""
+            }
+        }
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class OCMReferenceData(
+    @Json(name = "ConnectionTypes") val connectionTypes: List<OCMConnectionType>,
+    @Json(name = "Countries") val countries: List<OCMCountry>,
+    @Json(name = "Operators") val operators: List<OCMOperator>
+) : ReferenceData()
+
+@JsonClass(generateAdapter = true)
+@Entity
+data class OCMConnectionType(
+    @Json(name = "ID") @PrimaryKey val id: Long,
+    @Json(name = "Title") val title: String,
+    @Json(name = "FormalName") val formalName: String?,
+    @Json(name = "IsDiscontinued") val discontinued: Boolean?,
+    @Json(name = "IsObsolete") val obsolete: Boolean?
+)
+
+@JsonClass(generateAdapter = true)
+@Entity
+data class OCMCountry(
+    @Json(name = "ID") @PrimaryKey val id: Long,
+    @Json(name = "ISOCode") val isoCode: String,
+    @Json(name = "ContinentCode") val continentCode: String?,
+    @Json(name = "Title") val title: String
+)
+
+@JsonClass(generateAdapter = true)
+data class OCMDataProvider(
+    @Json(name = "ID") val id: Long,
+    @Json(name = "WebsiteURL") val websiteUrl: String?,
+    @Json(name = "Title") val title: String,
+    @Json(name = "License") val license: String?
+)
+
+@JsonClass(generateAdapter = true)
+@Entity
+data class OCMOperator(
+    @Json(name = "ID") @PrimaryKey val id: Long,
+    @Json(name = "WebsiteURL") val websiteUrl: String?,
+    @Json(name = "Title") val title: String,
+    @Json(name = "ContactEmail") val contactEmail: String?,
+    @Json(name = "PhonePrimaryContact") val contactTelephone1: String?,
+    @Json(name = "PhoneSecondaryContact") val contactTelephone2: String?,
+)
+
+@JsonClass(generateAdapter = true)
+data class OCMMediaItem(
+    @Json(name = "ID") val id: Long,
+    @Json(name = "ItemURL") val url: String,
+    @Json(name = "ItemThumbnailURL") val thumbUrl: String,
+    @Json(name = "IsVideo") val isVideo: Boolean,
+    @Json(name = "IsExternalResource") val isExternalResource: Boolean,
+    @Json(name = "Comment") val comment: String?
+) {
+    fun convert(): ChargerPhoto? {
+        if (isVideo or isExternalResource) return null
+
+        return OCMChargerPhotoAdapter(id.toString(), url, thumbUrl)
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class OCMUserComment(
+    @Json(name = "ID") val id: Long,
+    @Json(name = "CommentTypeID") val commentTypeId: Long,
+    @Json(name = "Comment") val comment: String?,
+    @Json(name = "UserName") val userName: String,
+    @Json(name = "DateCreated") val dateCreated: ZonedDateTime
+)
+
+@JsonClass(generateAdapter = true)
+data class OCMStatusType(
+    @Json(name = "ID") val id: Long,
+    @Json(name = "Title") val title: String
+)
+
+@Parcelize
+@JsonClass(generateAdapter = true)
+class OCMChargerPhotoAdapter(
+    override val id: String,
+    val largeUrl: String,
+    val thumbUrl: String
+) : ChargerPhoto(id) {
+    override fun getUrl(height: Int?, width: Int?, size: Int?): String {
+        val maxSize = size ?: max(height, width)
+        val mediumUrl = thumbUrl.replace(".thmb.", ".medi.")
+        return when (maxSize) {
+            0 -> mediumUrl
+            in 1..100 -> thumbUrl
+            in 101..400 -> mediumUrl
+            else -> largeUrl
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/autocomplete/AutocompleteProvider.kt

@@ -0,0 +1,189 @@
+package net.vonforst.evmap.autocomplete
+
+import android.os.Parcelable
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
+import kotlinx.parcelize.Parcelize
+
+interface AutocompleteProvider {
+    val id: String
+
+    fun autocomplete(query: String, location: LatLng?): List<AutocompletePlace>
+    suspend fun getDetails(id: String): PlaceWithBounds
+
+    @StringRes
+    fun getAttributionString(): Int
+
+    @DrawableRes
+    fun getAttributionImage(dark: Boolean): Int
+}
+
+data class AutocompletePlace(
+    val primaryText: CharSequence,
+    val secondaryText: CharSequence,
+    val id: String,
+    val distanceMeters: Double?,
+    val types: List<AutocompletePlaceType>
+)
+
+class ApiUnavailableException : Exception()
+
+enum class AutocompletePlaceType {
+    // based on Google Places Place.Type enum
+    OTHER,
+    ACCOUNTING,
+    ADMINISTRATIVE_AREA_LEVEL_1,
+    ADMINISTRATIVE_AREA_LEVEL_2,
+    ADMINISTRATIVE_AREA_LEVEL_3,
+    ADMINISTRATIVE_AREA_LEVEL_4,
+    ADMINISTRATIVE_AREA_LEVEL_5,
+    AIRPORT,
+    AMUSEMENT_PARK,
+    AQUARIUM,
+    ARCHIPELAGO,
+    ART_GALLERY,
+    ATM,
+    BAKERY,
+    BANK,
+    BAR,
+    BEAUTY_SALON,
+    BICYCLE_STORE,
+    BOOK_STORE,
+    BOWLING_ALLEY,
+    BUS_STATION,
+    CAFE,
+    CAMPGROUND,
+    CAR_DEALER,
+    CAR_RENTAL,
+    CAR_REPAIR,
+    CAR_WASH,
+    CASINO,
+    CEMETERY,
+    CHURCH,
+    CITY_HALL,
+    CLOTHING_STORE,
+    COLLOQUIAL_AREA,
+    CONTINENT,
+    CONVENIENCE_STORE,
+    COUNTRY,
+    COURTHOUSE,
+    DENTIST,
+    DEPARTMENT_STORE,
+    DOCTOR,
+    DRUGSTORE,
+    ELECTRICIAN,
+    ELECTRONICS_STORE,
+    EMBASSY,
+    ESTABLISHMENT,
+    FINANCE,
+    FIRE_STATION,
+    FLOOR,
+    FLORIST,
+    FOOD,
+    FUNERAL_HOME,
+    FURNITURE_STORE,
+    GAS_STATION,
+    GENERAL_CONTRACTOR,
+    GEOCODE,
+    GROCERY_OR_SUPERMARKET,
+    GYM,
+    HAIR_CARE,
+    HARDWARE_STORE,
+    HEALTH,
+    HINDU_TEMPLE,
+    HOME_GOODS_STORE,
+    HOSPITAL,
+    INSURANCE_AGENCY,
+    INTERSECTION,
+    JEWELRY_STORE,
+    LAUNDRY,
+    LAWYER,
+    LIBRARY,
+    LIGHT_RAIL_STATION,
+    LIQUOR_STORE,
+    LOCAL_GOVERNMENT_OFFICE,
+    LOCALITY,
+    LOCKSMITH,
+    LODGING,
+    MEAL_DELIVERY,
+    MEAL_TAKEAWAY,
+    MOSQUE,
+    MOVIE_RENTAL,
+    MOVIE_THEATER,
+    MOVING_COMPANY,
+    MUSEUM,
+    NATURAL_FEATURE,
+    NEIGHBORHOOD,
+    NIGHT_CLUB,
+    PAINTER,
+    PARK,
+    PARKING,
+    PET_STORE,
+    PHARMACY,
+    PHYSIOTHERAPIST,
+    PLACE_OF_WORSHIP,
+    PLUMBER,
+    PLUS_CODE,
+    POINT_OF_INTEREST,
+    POLICE,
+    POLITICAL,
+    POST_BOX,
+    POST_OFFICE,
+    POSTAL_CODE_PREFIX,
+    POSTAL_CODE_SUFFIX,
+    POSTAL_CODE,
+    POSTAL_TOWN,
+    PREMISE,
+    PRIMARY_SCHOOL,
+    REAL_ESTATE_AGENCY,
+    RESTAURANT,
+    ROOFING_CONTRACTOR,
+    ROOM,
+    ROUTE,
+    RV_PARK,
+    SCHOOL,
+    SECONDARY_SCHOOL,
+    SHOE_STORE,
+    SHOPPING_MALL,
+    SPA,
+    STADIUM,
+    STORAGE,
+    STORE,
+    STREET_ADDRESS,
+    STREET_NUMBER,
+    SUBLOCALITY_LEVEL_1,
+    SUBLOCALITY_LEVEL_2,
+    SUBLOCALITY_LEVEL_3,
+    SUBLOCALITY_LEVEL_4,
+    SUBLOCALITY_LEVEL_5,
+    SUBLOCALITY,
+    SUBPREMISE,
+    SUBWAY_STATION,
+    SUPERMARKET,
+    SYNAGOGUE,
+    TAXI_STAND,
+    TOURIST_ATTRACTION,
+    TOWN_SQUARE,
+    TRAIN_STATION,
+    TRANSIT_STATION,
+    TRAVEL_AGENCY,
+    UNIVERSITY,
+    VETERINARY_CARE,
+    ZOO,
+    RECENT;
+
+    companion object {
+        fun valueOfOrNull(value: String): AutocompletePlaceType? {
+            try {
+                return valueOf(value)
+            } catch (e: IllegalArgumentException) {
+                return null
+            }
+        }
+    }
+}
+
+@Parcelize
+data class PlaceWithBounds(val latLng: LatLng, val viewport: LatLngBounds?) : Parcelable

app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt

@@ -0,0 +1,127 @@
+package net.vonforst.evmap.autocomplete
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.CharacterStyle
+import android.text.style.StyleSpan
+import androidx.core.os.ConfigurationCompat
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
+import com.car2go.maps.util.SphericalUtil
+import com.mapbox.api.geocoding.v5.GeocodingCriteria
+import com.mapbox.api.geocoding.v5.MapboxGeocoding
+import com.mapbox.api.geocoding.v5.models.CarmenFeature
+import com.mapbox.geojson.BoundingBox
+import com.mapbox.geojson.Point
+import net.vonforst.evmap.R
+import java.io.IOException
+
+class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
+    private val bold: CharacterStyle = StyleSpan(Typeface.BOLD)
+    private val results = HashMap<String, CarmenFeature>()
+
+    override val id = "mapbox"
+
+    override fun autocomplete(query: String, location: LatLng?): List<AutocompletePlace> {
+        val result = MapboxGeocoding.builder().apply {
+            location?.let {
+                proximity(Point.fromLngLat(location.longitude, location.latitude))
+            }
+            languages(ConfigurationCompat.getLocales(context.resources.configuration)[0].language)
+            accessToken(context.getString(R.string.mapbox_key))
+            autocomplete(true)
+            this.query(query)
+        }.build().executeCall()
+        if (!result.isSuccessful) {
+            throw IOException(result.message())
+        }
+        return result.body()!!.features().map { feature ->
+            results[feature.id()!!] = feature
+            var secondaryText = (feature.matchingPlaceName() ?: feature.placeName())!!
+
+            val matchingText = (feature.matchingText() ?: feature.text())!!
+            val primaryText =
+                if (feature.address() != null && secondaryText.startsWith(feature.address() + " " + matchingText)) {
+                    // countries where house number comes in front of road ("10 Downing Street")
+                    feature.address() + " " + matchingText
+                } else {
+                    // countries where house number comes after road ("Willy-Brandt-Str. 1")
+                    matchingText + (feature.address()?.let { " $it" } ?: "")
+                }
+
+            secondaryText = secondaryText.replace("$primaryText, ", "")
+            AutocompletePlace(
+                highlightMatch(primaryText, query),
+                secondaryText,
+                feature.id()!!,
+                location?.let { location ->
+                    SphericalUtil.computeDistanceBetween(
+                        feature.center()!!.toLatLng(), location
+                    )
+                },
+                getPlaceTypes(feature)
+            )
+        }
+    }
+
+    private fun getPlaceTypes(feature: CarmenFeature): List<AutocompletePlaceType> {
+        val types = feature.placeType()?.mapNotNull {
+            when (it) {
+                GeocodingCriteria.TYPE_COUNTRY -> AutocompletePlaceType.COUNTRY
+                GeocodingCriteria.TYPE_REGION -> AutocompletePlaceType.ADMINISTRATIVE_AREA_LEVEL_1
+                GeocodingCriteria.TYPE_POSTCODE -> AutocompletePlaceType.POSTAL_CODE
+                GeocodingCriteria.TYPE_DISTRICT -> AutocompletePlaceType.ADMINISTRATIVE_AREA_LEVEL_2
+                GeocodingCriteria.TYPE_PLACE -> AutocompletePlaceType.ADMINISTRATIVE_AREA_LEVEL_3
+                GeocodingCriteria.TYPE_LOCALITY -> AutocompletePlaceType.LOCALITY
+                GeocodingCriteria.TYPE_NEIGHBORHOOD -> AutocompletePlaceType.NEIGHBORHOOD
+                GeocodingCriteria.TYPE_ADDRESS -> AutocompletePlaceType.STREET_ADDRESS
+                GeocodingCriteria.TYPE_POI -> AutocompletePlaceType.POINT_OF_INTEREST
+                GeocodingCriteria.TYPE_POI_LANDMARK -> AutocompletePlaceType.POINT_OF_INTEREST
+                else -> null
+            }
+        } ?: emptyList()
+        val categories = feature.properties()?.get("category")?.asString?.split(", ")?.mapNotNull {
+            // Place categories are defined at https://docs.mapbox.com/api/search/geocoding/#point-of-interest-category-coverage
+            // We try to find a matching entry in the enum.
+            // TODO: map categories that are not named the same
+            AutocompletePlaceType.valueOfOrNull(it.uppercase().replace(" ", "_"))
+        } ?: emptyList()
+        return types + categories
+    }
+
+    private fun highlightMatch(text: String, query: String): CharSequence {
+        val result = SpannableString(text)
+
+        val startPos = text.lowercase().indexOf(query.lowercase())
+        if (startPos > -1) {
+            val endPos = startPos + query.length
+            result.setSpan(bold, startPos, endPos, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+        return result
+    }
+
+    override suspend fun getDetails(id: String): PlaceWithBounds {
+        val place = results[id]!!
+        results.clear()
+        return PlaceWithBounds(
+            place.center()!!.toLatLng(),
+            place.geometry()?.bbox()?.toLatLngBounds()
+        )
+    }
+
+    override fun getAttributionString(): Int = R.string.powered_by_mapbox
+
+    override fun getAttributionImage(dark: Boolean): Int =
+        if (dark) R.drawable.mapbox_logo_icon else R.drawable.mapbox_logo
+}
+
+private fun BoundingBox.toLatLngBounds(): LatLngBounds {
+    return LatLngBounds(
+        southwest().toLatLng(),
+        northeast().toLatLng()
+    )
+}
+
+private fun Point.toLatLng(): LatLng = LatLng(this.latitude(), this.longitude())

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

@@ -6,12 +6,12 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -19,11 +19,12 @@ import com.google.android.material.snackbar.Snackbar
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.ChargepriceAdapter
+import net.vonforst.evmap.adapter.CheckableChargepriceCarAdapter
 import net.vonforst.evmap.adapter.CheckableConnectorAdapter
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.Chargepoint
-import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
+import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.databinding.FragmentChargepriceBinding
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.viewmodel.ChargepriceViewModel
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -51,7 +52,7 @@ class ChargepriceFragment : DialogFragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(
             inflater,
             R.layout.fragment_chargeprice, container, false
@@ -79,21 +80,27 @@ class ChargepriceFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
-        val jsonAdapter = GoingElectricApi.moshi.adapter(ChargeLocation::class.java)
-        val charger = jsonAdapter.fromJson(requireArguments().getString(ARG_CHARGER)!!)!!
+        val fragmentArgs: ChargepriceFragmentArgs by navArgs()
+        val charger = fragmentArgs.charger
+        val dataSource = fragmentArgs.dataSource
         vm.charger.value = charger
+        vm.dataSource.value = dataSource
         if (vm.chargepoint.value == null) {
             vm.chargepoint.value = charger.chargepointsMerged.get(0)
         }
 
+        val vehicleAdapter = CheckableChargepriceCarAdapter()
+        binding.vehicleSelection.adapter = vehicleAdapter
+        val vehicleObserver: Observer<ChargepriceCar> = Observer {
+            vehicleAdapter.setCheckedItem(it)
+        }
+        vm.vehicle.observe(viewLifecycleOwner, vehicleObserver)
+        vehicleAdapter.onCheckedItemChangedListener = {
+            vm.vehicle.removeObserver(vehicleObserver)
+            vm.vehicle.value = it
+            vm.vehicle.observe(viewLifecycleOwner, vehicleObserver)
+        }
+
         val chargepriceAdapter = ChargepriceAdapter().apply {
             onClickListener = {
                 (requireActivity() as MapsActivity).openUrl(it.url)
@@ -131,8 +138,9 @@ class ChargepriceFragment : DialogFragment() {
             vm.chargepoint.observe(viewLifecycleOwner, observer)
         }
 
-        vm.vehicleCompatibleConnectors.observe(viewLifecycleOwner) {
-            connectorsAdapter.enabledConnectors = it
+        vm.vehicleCompatibleConnectors.observe(viewLifecycleOwner) { plugs ->
+            connectorsAdapter.enabledConnectors =
+                plugs?.flatMap { plug -> equivalentPlugTypes(plug) }
         }
 
         binding.connectorsList.apply {
@@ -141,11 +149,11 @@ class ChargepriceFragment : DialogFragment() {
         }
 
         binding.imgChargepriceLogo.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=going_electric")
+            (requireActivity() as MapsActivity).openUrl("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=${dataSource}")
         }
 
         binding.btnSettings.setOnClickListener {
-            navController.navigate(R.id.action_chargeprice_to_settingsFragment)
+            findNavController().navigate(R.id.action_chargeprice_to_settingsFragment)
         }
 
         binding.batteryRange.setLabelFormatter { value: Float ->
@@ -167,6 +175,10 @@ class ChargepriceFragment : DialogFragment() {
                     dismiss()
                     true
                 }
+                R.id.menu_help -> {
+                    (activity as? MapsActivity)?.openUrl(getString(R.string.chargeprice_faq_link))
+                    true
+                }
                 else -> false
             }
         }
@@ -197,16 +209,12 @@ class ChargepriceFragment : DialogFragment() {
         }
     }
 
-    companion object {
-        val ARG_CHARGER = "charger"
-
-        fun showCharger(charger: ChargeLocation): Bundle {
-            return Bundle().apply {
-                putString(
-                    ARG_CHARGER,
-                    GoingElectricApi.moshi.adapter(ChargeLocation::class.java).toJson(charger)
-                )
-            }
-        }
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
     }
+
 }

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

@@ -0,0 +1,85 @@
+package net.vonforst.evmap.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatDialogFragment
+import net.vonforst.evmap.databinding.DialogDataSourceSelectBinding
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.*
+
+class DataSourceSelectDialog : AppCompatDialogFragment() {
+    private lateinit var binding: DialogDataSourceSelectBinding
+    var okListener: ((String) -> Unit)? = null
+
+    companion object {
+        fun getInstance(
+            cancelEnabled: Boolean
+        ): DataSourceSelectDialog {
+            val dialog = DataSourceSelectDialog()
+            dialog.arguments = args(cancelEnabled)
+            return dialog
+        }
+
+        fun args(cancelEnabled: Boolean) = Bundle().apply {
+            putBoolean("cancel_enabled", cancelEnabled)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = DialogDataSourceSelectBinding.inflate(inflater, container, false)
+        prefs = PreferenceDataSource(requireContext())
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        // dialog with 95% screen height
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            (resources.displayMetrics.heightPixels * 0.95).toInt()
+        )
+    }
+
+    private lateinit var prefs: PreferenceDataSource
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val args = requireArguments()
+        binding.btnCancel.visibility =
+            if (args.getBoolean("cancel_enabled")) View.VISIBLE else View.GONE
+
+        if (prefs.dataSourceSet) {
+            when (prefs.dataSource) {
+                "goingelectric" -> binding.rgDataSource.rbGoingElectric.isChecked = true
+                "openchargemap" -> binding.rgDataSource.rbOpenChargeMap.isChecked = true
+            }
+        }
+
+        binding.btnCancel.setOnClickListener {
+            dismiss()
+        }
+        binding.btnOK.setOnClickListener {
+            val result = if (binding.rgDataSource.rbGoingElectric.isChecked) {
+                "goingelectric"
+            } else if (binding.rgDataSource.rbOpenChargeMap.isChecked) {
+                "openchargemap"
+            } else {
+                return@setOnClickListener
+            }
+            prefs.dataSource = result
+            prefs.filterStatus = FILTERS_DISABLED
+            okListener?.let { listener ->
+                listener(result)
+            }
+            prefs.dataSourceSet = true
+            dismiss()
+        }
+    }
+}

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

@@ -1,33 +1,42 @@
 package net.vonforst.evmap.fragment
 
-import android.Manifest
-import android.content.pm.PackageManager
+import android.graphics.Canvas
 import android.os.Bundle
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
+import android.widget.FrameLayout
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.car2go.maps.model.LatLng
+import com.google.android.material.snackbar.Snackbar
 import com.mapzen.android.lost.api.LocationServices
 import com.mapzen.android.lost.api.LostApiClient
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.DataBindingAdapter
 import net.vonforst.evmap.adapter.FavoritesAdapter
 import net.vonforst.evmap.databinding.FragmentFavoritesBinding
+import net.vonforst.evmap.databinding.ItemFavoriteBinding
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
 class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
     private lateinit var binding: FragmentFavoritesBinding
-    private lateinit var locationClient: LostApiClient
+    private var locationClient: LostApiClient? = null
+    private var toDelete: ChargeLocation? = null
+    private var deleteSnackbar: Snackbar? = null
+    private lateinit var adapter: FavoritesAdapter
 
     private val vm: FavoritesViewModel by viewModels(factoryProducer = {
         viewModelFactory {
@@ -38,11 +47,17 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
     })
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        locationClient = LostApiClient.Builder(requireContext())
+            .addConnectionCallbacks(this).build()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(
             inflater,
             R.layout.fragment_favorites, container, false
@@ -50,29 +65,27 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         binding.lifecycleOwner = this
         binding.vm = vm
 
-        locationClient = LostApiClient.Builder(requireContext())
-            .addConnectionCallbacks(this).build()
-
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
 
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
-        val favAdapter = FavoritesAdapter(vm).apply {
+        adapter = FavoritesAdapter(onDelete = {
+            delete(it.charger)
+        }).apply {
             onClickListener = {
-                navController.navigate(R.id.action_favs_to_map, MapFragment.showCharger(it.charger))
+                findNavController().navigate(
+                    R.id.action_favs_to_map,
+                    MapFragmentArgs(
+                        chargerId = it.charger.id,
+                        latLng = LatLng(it.charger.coordinates.lat, it.charger.coordinates.lng)
+                    ).toBundle()
+                )
             }
         }
         binding.favsList.apply {
-            adapter = favAdapter
+            adapter = this@FavoritesFragment.adapter
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
             addItemDecoration(
@@ -81,18 +94,15 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
                 )
             )
         }
+        createTouchHelper().attachToRecyclerView(binding.favsList)
 
-        locationClient.connect()
+        locationClient!!.connect()
     }
 
     override fun onConnected() {
         val context = this.context ?: return
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED
-        ) {
-            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
+        if (context.checkAnyLocationPermission()) {
+            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient!!)
             if (location != null) {
                 vm.location.value = LatLng(location.latitude, location.longitude)
             }
@@ -102,4 +112,151 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
     override fun onConnectionSuspended() {
 
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        locationClient?.let {
+            if (it.isConnected) it.disconnect()
+        }
+    }
+
+    fun delete(fav: ChargeLocation) {
+        val position = vm.listData.value?.indexOfFirst { it.charger == fav } ?: return
+        // if there is already a profile to delete, delete it now
+        actuallyDelete()
+        deleteSnackbar?.dismiss()
+
+        toDelete = fav
+
+        view?.let {
+            val snackbar = Snackbar.make(
+                it,
+                getString(R.string.deleted_filterprofile, fav.name),
+                Snackbar.LENGTH_LONG
+            ).setAction(R.string.undo) {
+                toDelete = null
+                adapter.notifyItemChanged(position)
+            }.addCallback(object : Snackbar.Callback() {
+                override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
+                    // if undo was not clicked, actually delete
+                    if (event == DISMISS_EVENT_TIMEOUT || event == DISMISS_EVENT_SWIPE) {
+                        actuallyDelete()
+                    }
+                }
+            })
+            deleteSnackbar = snackbar
+            snackbar.show()
+        } ?: run {
+            actuallyDelete()
+        }
+    }
+
+    private fun actuallyDelete() {
+        toDelete?.let { vm.deleteFavorite(it) }
+        toDelete = null
+    }
+
+    private fun createTouchHelper(): ItemTouchHelper {
+        return ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
+            0,
+            ItemTouchHelper.RIGHT or ItemTouchHelper.LEFT
+        ) {
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                return false
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                val fav = vm.favorites.value?.find { it.id == viewHolder.itemId }
+                fav?.let { delete(it) }
+            }
+
+            override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+                if (viewHolder != null && actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+                    val binding =
+                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                    getDefaultUIUtil().onSelected(binding.foreground)
+                } else {
+                    super.onSelectedChanged(viewHolder, actionState)
+                }
+            }
+
+            override fun onChildDrawOver(
+                c: Canvas, recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float,
+                actionState: Int, isCurrentlyActive: Boolean
+            ) {
+                if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+                    val binding =
+                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                    getDefaultUIUtil().onDrawOver(
+                        c, recyclerView, binding.foreground, dX, dY,
+                        actionState, isCurrentlyActive
+                    )
+                    val lp = (binding.deleteIcon.layoutParams as FrameLayout.LayoutParams)
+                    lp.gravity = Gravity.CENTER_VERTICAL or if (dX > 0) {
+                        Gravity.START
+                    } else {
+                        Gravity.END
+                    }
+                    binding.deleteIcon.layoutParams = lp
+                } else {
+                    super.onChildDrawOver(
+                        c,
+                        recyclerView,
+                        viewHolder,
+                        dX,
+                        dY,
+                        actionState,
+                        isCurrentlyActive
+                    )
+                }
+            }
+
+            override fun clearView(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder
+            ) {
+                val binding =
+                    (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                getDefaultUIUtil().clearView(binding.foreground)
+            }
+
+            override fun onChildDraw(
+                c: Canvas, recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float,
+                actionState: Int, isCurrentlyActive: Boolean
+            ) {
+                if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+                    val binding =
+                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                    getDefaultUIUtil().onDraw(
+                        c, recyclerView, binding.foreground, dX, dY,
+                        actionState, isCurrentlyActive
+                    )
+                } else {
+                    super.onChildDraw(
+                        c,
+                        recyclerView,
+                        viewHolder,
+                        dX,
+                        dY,
+                        actionState,
+                        isCurrentlyActive
+                    )
+                }
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }