Release 0.7.3

fix typo in README

.gitignore

@@ -8,5 +8,8 @@
 .externalNativeBuild
 .cxx
 apikeys.xml
-/app/release/app-release.aab
-/_img/connectors/*.ai
+/app/**/*.aab
+/app/**/*.apk
+/_img/connectors/*.ai
+api-7125266970515251116-798419-8e2dda660c80.json
+output-metadata.json

.travis.yml

@@ -1,17 +1,26 @@
-language: android
+language: java
 dist: trusty
-android:
-  components:
-    - build-tools-29.0.3
-    - android-29
 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=
+    - 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
+install:
+  # Download and unzip the Android command line tools (if not already there thanks to the cache mechanism)
+  # Latest version of this file available here: https://developer.android.com/studio/#command-tools
+  - if test ! -e $HOME/android-cmdline-tools/cmdline-tools.zip ; then curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip ; fi
+  - unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools
+  # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)
+  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools' > /dev/null
+  # Latest version of build-tools available here: https://developer.android.com/studio/releases/build-tools.html
+  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3' > /dev/null
+  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-29' > /dev/null
 script:
-  - "./gradlew lintDebug testDebugUnitTest"
+  - "./gradlew lintFossDebug testFossDebugUnitTest lintGoogleDebug testGoogleDebugUnitTest"
   - "./gradlew assembleRelease"
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -21,11 +30,15 @@ cache:
     - "$HOME/.gradle/caches/"
     - "$HOME/.gradle/wrapper/"
     - "$HOME/.android/build-cache"
+    - "$HOME/android-cmdline-tools"
+    - "$HOME/android-sdk"
 deploy:
   provider: releases
   api_key:
-    secure: B+V5Fz8k9HbpecyMjpJuLr8aVBrdwtDBDkQh4YQ8nu+Da4AiYwEJZseWXhOWs+oms0gNen9bBxsakQQKu7GKYDs8gIXZZtANWsc0gse8xo+cYT7NqEM3jP6mM3ytAv7VNRX3N2cdL7xazELK3/5+mghfORAAdXXYKUFGG5eTKoML8zgdPVN8E9QFqiusLXqoKhxOMCSE4NS+Di7CGlUmnidRTWg6yxhE085zljmYv2owS0NRbr5a4/zW6Z9xZPALGAqsOvIvpZHuOC2s0eMJWMmYGkK/Ws/LAVxfj4U+YkFp9hlZC0zEg/JoS19Gf57QmEu+vsoQ3uOBYBFv9NPI/R9kVH6o0hcOxId3J0u+ewSGWuceGLRpizXuMxKIvLTS5j6GWkxdSieWjwh/OuVB+ciAHNM31B7GP4FWnfz0ZaEVxI/tPenNipZdl9oXdyyBQQ00vPlYp0jT80XhaMh5rDwWMUPaEjRafvymcNyqZ0iVOr0rq1CbdT92STMSmA1U3/rmhtCMD5IGD0b+gQl+VpPKe1QXViYftVxCGL+s4ke4DUZD7HR20fGs8zu61Elnwci1HufbetKFL5TmxoKSLkWFSkzrtBaJnEruZIxhNUMkUL2UPynaOcPNzLoumjHXrUb3m3s0yE4OFelmJ6mJfXswP38sS8kj3wB7R/gC4rw=
-  file: app/build/outputs/apk/release/app-release.apk
+    secure: "XQR4GUrGkPKYVV0xMbJifX/ewKAnenBPlM/pPacQ9irAmYNYa/yEkySz4x1K6MP8cEnuJbxHFakcDqhNRCqD7Cq2NcnCi3qtTEXHK6ApLoVl/92eyiWxu/bYlidOEZb+YPcVNtTR253NiI8GYda+CrhLd4uCmsAgES+XPFJd/t2esMlDOSAp7xalZv/zFhhlB9+SevfPFMc6kkrqeHpKnMs9SK8ltVQmh3nch2KjtDvqgDW6d3nuwn7/HAer6/HY86hmA4Rh6Mo2cV6OloX0bdJ7hvA1GOT4p3+K3lWbTRxzE0o1DXAtT7+D158iKvxHFPuF3h+CTjSlLeiss6kQZL9nFjw/KhAvu+GJOp37PcMoI++mpMiFoWPlzKpp17BVKIDinYbgi8kiU4zG+QHhe2cY85SbfAplXUaysq7uzxEZwEUYHSAHNahshVooXRqvuzkthcH0/nvinfeXrzx2xDvQ3if1NENMRgttwewU0kvU61iKUwpcf/UN2bHK3DaPes0VzSH4PTHAGjoRpksDfqUwb7S8YxbYr+44aMbSPYN8Lbjda0BxPSKWwHM5/pi7FBJN1a1w3t7sV/EiACWUWr8OovmX4ljyCybbR0w9cPzRC1zAYeSUHslLXMTW2Pp9h594RnYh3q3VfeYlFCikFvuvrafwXmTkz35uhLb+2ws="
+  file:
+    - app/build/outputs/apk/foss/release/app-foss-release.apk
+    - app/build/outputs/apk/google/release/app-google-release.apk
   on:
     repo: johan12345/EVMap
     tags: true

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile.lock

@@ -0,0 +1,178 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atomos (0.1.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.354.0)
+    aws-sdk-core (3.104.3)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.36.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.78.0)
+      aws-sdk-core (~> 3, >= 3.104.3)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.3)
+    claide (1.0.3)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    digest-crc (0.6.1)
+      rake (~> 13.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
+    emoji_regex (3.0.0)
+    excon (0.76.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fastimage (2.2.0)
+    fastlane (2.156.1)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.37.0, < 0.39.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    gh_inspector (1.1.3)
+    google-api-client (0.38.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.3.3)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.27.0)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.13.1)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.14)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.4.0)
+    json (2.3.1)
+    jwt (2.2.1)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    multi_json (1.15.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
+    naturally (2.2.0)
+    os (1.1.1)
+    plist (3.5.0)
+    public_suffix (4.0.5)
+    rake (13.0.1)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    rubyzip (2.3.0)
+    security (0.1.3)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.8)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7-x64-mingw32)
+    unicode-display_width (1.7.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.18.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.1.2

LICENSE

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

README.md

@@ -1,12 +1,14 @@
 EVMap [![Build Status](https://travis-ci.org/johan12345/EVMap.svg?branch=master)](https://travis-ci.org/johan12345/EVMap)
 =====
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/appicon_cropped.svg?sanitize=true" width=80 alt="Logo"/>
+<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.
 
 <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>
+<a href="https://f-droid.org/repository/browse/?fdid=net.vonforst.evmap" target="_blank">
+<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"/></a>
 
 Features
 --------
@@ -16,8 +18,11 @@ Features
 - Realtime availability information (beta)
 - Search places
 - Favorites list, also with availability information
+- Charging price comparison, powered by [Chargeprice.app](https://chargeprice.app)
+- Android Auto integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
+- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
 
 Screenshots
 -----------
@@ -29,10 +34,11 @@ Development setup
 
 The App is developed using Android Studio.
 
-For testing the app, you need to obtain API Keys for the 
-[GoingElectric API](https://www.goingelectric.de/stromtankstellen/api/)
+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). These APIs need to be put into the
+("Maps SDK for Android" and "Places API" need to be activated) and/or [Mapbox](https://www.mapbox.com/). These API keys 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:
 
@@ -41,8 +47,14 @@ following content:
     <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>
 ```

_img/feature_graphic.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 1024 500"
-	style="enable-background:new 0 0 1024 500;" xml:space="preserve">
+<?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_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	viewBox="0 0 1024 500" style="enable-background:new 0 0 1024 500;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#E6E6E6;}
 	.st1{fill:#DCDCDC;}
@@ -15,7 +15,7 @@
 	.st10{fill:#666666;}
 	.st11{fill:#D1D1D1;}
 	.st12{opacity:0.2;fill:#808080;enable-background:new    ;}
-	.st13{opacity:0.5;}
+	.st13{opacity:0.5;enable-background:new    ;}
 	.st14{fill:#FFB300;}
 	.st15{fill:#90A4AE;}
 	.st16{fill:#546E7A;}
@@ -23,10 +23,9 @@
 	.st18{fill:#FFFFFF;fill-opacity:0.2;}
 	.st19{fill:#3E2723;fill-opacity:0.2;}
 	.st20{opacity:0.45;enable-background:new    ;}
-	.st21{font-family:'Roboto-Light';}
-	.st22{font-size:136.5333px;}
+	.st21{enable-background:new    ;}
 </style>
-	<g id="Ebene_1">
+	<g id="Ebene_1_1_">
 	<rect y="-34.4" class="st0" width="1024" height="568.9" />
 		<g>
 		<path class="st1"
@@ -35,25 +34,25 @@
 				d="M145.4,335.9L38.1,228.7c-6-6-6-15.4,0-21.3L91,154.1c5.7-5.7,15.4-5.7,21.3,0l107.2,107.2" />
 			<path class="st2" d="M131.7,209.9L93.6,248c-2.8,2.8-7.7,2.8-10.5,0l-24.7-24.7c-2.8-2.8-2.8-7.7,0-10.5l38.1-38.1
 			c2.8-2.8,7.7-2.8,10.5,0l24.7,24.7C134.8,202.2,134.5,207,131.7,209.9z" />
-			<path class="st3" d="M223.3,265.1c-2,2-5.4,2-7.4,0l-107.2-107c-3.7-3.7-10.2-4-13.9,0L41.8,211c-3.7,3.7-3.7,10,0,13.9L149,332.2
-			c2,2,2,5.4,0,7.4c-2,2-5.4,2-7.4,0L34.4,232.4c-8-8-8-20.8,0-28.7l52.9-53.2c8-8,20.8-8,28.7,0l107.2,107.2
+			<path class="st3" d="M223.3,265.1c-2,2-5.4,2-7.4,0l-107.2-107c-3.7-3.7-10.2-4-13.9,0l-53,52.9c-3.7,3.7-3.7,10,0,13.9L149,332.2
+			c2,2,2,5.4,0,7.4s-5.4,2-7.4,0L34.4,232.4c-8-8-8-20.8,0-28.7l52.9-53.2c8-8,20.8-8,28.7,0l107.2,107.2
 			C225.3,260,225.3,263.1,223.3,265.1z" />
 			<path class="st4" d="M131.7,209.9L93.6,248c-2.8,2.8-7.7,2.8-10.5,0l-24.7-24.7c-2.8-2.8-2.8-7.7,0-10.5l38.1-38.1
 			c2.8-2.8,7.7-2.8,10.5,0l24.7,24.7C134.8,202.2,134.5,207,131.7,209.9z" />
-			<path class="st3" d="M135.4,213.6l-38.1,38.1c-4.8,4.8-13.1,4.8-17.9,0L54.6,227c-4.8-4.8-4.8-13.1,0-17.9l38.1-38.1
+			<path class="st3" d="M135.4,213.6l-38.1,38.1c-4.8,4.8-13.1,4.8-17.9,0L54.6,227c-4.8-4.8-4.8-13.1,0-17.9L92.7,171
 			c4.8-4.8,13.1-4.8,17.9,0l24.7,24.7C140.5,200.5,140.5,208.5,135.4,213.6z M62,216.4c-0.9,0.9-0.9,2.3,0,3.1l24.7,24.7
 			c0.9,0.9,2.3,0.9,3.1,0l38.1-38.1c0.9-0.9,0.9-2.3,0-3.1l-24.7-24.7c-0.9-0.9-2.3-0.9-3.1,0L62,216.4z M233.8,254.6l-95.3,95.3
-			c-2,2-5.4,2-7.4,0c-2-2-2-5.4,0-7.4l95.3-95.3c2-2,5.4-2,7.4,0S235.8,252.6,233.8,254.6z M228.4,238.3c-4.8,4.8-13.1,4.8-17.9,0
-			l-43-42.7c-0.9-0.9-2.3-0.9-3.1,0l-5.4,5.4c-2,2-5.4,2-7.4,0c-2-2-2-5.4,0-7.4l5.4-5.4c4.8-4.8,13.1-4.8,17.9,0l43,43
-			c0.9,0.9,2.3,0.9,3.1,0c0.9-0.9,0.9-2.3,0-3.1l-58.9-59.2c-2-2-2-5.4,0-7.4c2-2,5.4-2,7.4,0l58.9,58.9
+			c-2,2-5.4,2-7.4,0s-2-5.4,0-7.4l95.3-95.3c2-2,5.4-2,7.4,0S235.8,252.6,233.8,254.6z M228.4,238.3c-4.8,4.8-13.1,4.8-17.9,0
+			l-43-42.7c-0.9-0.9-2.3-0.9-3.1,0L159,201c-2,2-5.4,2-7.4,0s-2-5.4,0-7.4l5.4-5.4c4.8-4.8,13.1-4.8,17.9,0l43,43
+			c0.9,0.9,2.3,0.9,3.1,0c0.9-0.9,0.9-2.3,0-3.1l-58.9-59.2c-2-2-2-5.4,0-7.4s5.4-2,7.4,0l58.9,58.9
 			C233.2,225.3,233.2,233.5,228.4,238.3z" />
-			<path class="st3" d="M174.6,163.8l-10.5,10.5c-2,2-5.4,2-7.4,0l-21.6-21.6c-2-2-2-5.4,0-7.4l1.7-1.7l-4.8-4.6c-2-2-2-5.4,0-7.4
-			c2-2,5.4-2,7.4,0l4.8,4.8l1.4-1.4c2-2,5.4-2,7.4,0l21.3,21.3C176.4,158.4,176.6,161.8,174.6,163.8z M160.4,163.2l3.1-3.1
-			l-13.9-13.9l-3.1,3.1L160.4,163.2z" />
+			<path class="st3" d="M174.6,163.8l-10.5,10.5c-2,2-5.4,2-7.4,0l-21.6-21.6c-2-2-2-5.4,0-7.4l1.7-1.7L132,139c-2-2-2-5.4,0-7.4
+			s5.4-2,7.4,0l4.8,4.8l1.4-1.4c2-2,5.4-2,7.4,0l21.3,21.3C176.4,158.4,176.6,161.8,174.6,163.8z M160.4,163.2l3.1-3.1l-13.9-13.9
+			l-3.1,3.1L160.4,163.2z" />
 			<g>
 			<path class="st5" d="M163.8,290.1c-0.6,0.6-1.4,1.1-2.6,1.4c-2.8,0.6-5.7-1.1-6.3-3.7l-3.7-16.2l-3.7,5.4c-1.1,1.7-3.1,2.6-5.1,2
-				c-2-0.6-3.7-2-4-4l-6.5-27c-0.6-2.8,1.1-5.7,3.7-6.3c2.8-0.6,5.7,1.1,6.3,3.7l3.7,16.2l3.7-5.4c1.1-1.7,3.1-2.6,5.1-2
-				c2,0.6,3.7,2,4,4l6.3,27C165.5,287.3,165,289,163.8,290.1z" />
+				s-3.7-2-4-4l-6.5-27c-0.6-2.8,1.1-5.7,3.7-6.3c2.8-0.6,5.7,1.1,6.3,3.7l3.7,16.2l3.7-5.4c1.1-1.7,3.1-2.6,5.1-2s3.7,2,4,4l6.3,27
+				C165.5,287.3,165,289,163.8,290.1z" />
 		</g>
 	</g>
 		<g>
@@ -66,11 +65,11 @@
 			<path class="st3" d="M156.4,462.5l-40.1,40.1c-4.6,4.6-11.7,4.6-16.2,0l-68.3-68.3c-4.6-4.6-4.6-11.7,0-16.2L72,378
 			c4.6-4.6,11.7-4.6,16.2,0l68.3,68.3C161,450.8,161,457.9,156.4,462.5z M37.8,424.4c-1.1,1.1-1.1,2.8,0,4l68.3,68.3
 			c1.1,1.1,2.8,1.1,4,0l40.1-40.1c1.1-1.1,1.1-2.8,0-4l-68.3-68.3c-1.1-1.1-2.8-1.1-4,0L37.8,424.4z" />
-			<path class="st2" d="M111.2,487.5c-1.7,1.7-4.3,1.7-6,0l-25-25c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l25,25
+			<path class="st2" d="M111.2,487.5c-1.7,1.7-4.3,1.7-6,0l-25-25c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l25,25
 			C112.9,483.2,112.9,485.8,111.2,487.5z M71.1,447.4c-0.9,0.9-2,1.4-3.1,1.1c-1.1,0-2.3-0.3-3.1-1.1c-0.9-0.9-1.4-2-1.1-3.1
 			c0-0.3,0-0.6,0-0.9s0-0.6,0.3-0.9s0.3-0.6,0.3-0.9c0.9-1.1,2-2,3.4-2c1.1,0,2.3,0.3,3.1,1.1c0.3,0.3,0.3,0.3,0.6,0.6
-			c0.3,0.3,0.3,0.6,0.3,0.9c0,0.3,0.3,0.6,0.3,0.9s0,0.6,0,0.9C72.2,445.4,71.7,446.6,71.1,447.4z" />
-			<path class="st3" d="M68,393.9c-1.7,1.7-4.3,1.7-6,0l-9.1-9.1L39,398.8l1.1,1.1c1.7,1.7,1.7,4.3,0,6c-1.7,1.7-4.3,1.7-6,0l-4-4
+			c0.3,0.3,0.3,0.6,0.3,0.9s0.3,0.6,0.3,0.9s0,0.6,0,0.9C72.2,445.4,71.7,446.6,71.1,447.4z" />
+			<path class="st3" d="M68,393.9c-1.7,1.7-4.3,1.7-6,0l-9.1-9.1l-13.9,14l1.1,1.1c1.7,1.7,1.7,4.3,0,6s-4.3,1.7-6,0l-4-4
 			c-1.7-1.7-1.7-4.3,0-6l20.2-20.2c1.7-1.7,4.3-1.7,6,0l11.9,11.9C69.7,389.7,69.7,392.2,68,393.9z" />
 	</g>
 		<g>
@@ -78,35 +77,35 @@
 			C390.3,425.8,354.1,476.4,333.4,497.2z" />
 			<path class="st5" d="M293.5,387.7l48.1-11.7c1.7-0.3,2.6,1.7,1.1,2.6l-28.4,18.8l9.7,9.7c0.9,0.9,0.3,2.3-0.9,2.3l-43.8,6.8
 			c-1.4,0.3-2.3-1.7-1.1-2.6l23.6-14.5l-9.4-9.4C292.4,389.1,292.7,388,293.5,387.7z" />
-			<path class="st3" d="M374.6,440l-15.1-15.1c-7.1-7.1-7.1-18.8,0-26.2l8-8c1.7-1.7,4.3-1.7,6,0c1.7,1.7,1.7,4.3,0,6l-8,8
-			c-4,4-4,10.2,0,13.9l15.1,15.1c1.7,1.7,1.7,4.3,0,6C378.9,441.4,376,441.4,374.6,440z" />
+			<path class="st3" d="M374.6,440l-15.1-15.1c-7.1-7.1-7.1-18.8,0-26.2l8-8c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-8,8
+			c-4,4-4,10.2,0,13.9l15.1,15.1c1.7,1.7,1.7,4.3,0,6S376,441.4,374.6,440z" />
 			<path class="st3" d="M327.4,503.2L226.7,402.5c-1.7-1.7-1.7-4.3,0-6l73.4-73.4c7.1-7.1,18.8-7.1,26.2,0l70.3,70.3l0,0l8,8
-			c1.7,1.7,1.7,4.3,0,6c-1.7,1.7-4.3,1.7-6,0l-2.3-2.3c-8.2,31.3-41.5,76.2-60,94.7l-3.1,3.1C331.7,504.9,328.8,504.9,327.4,503.2z
+			c1.7,1.7,1.7,4.3,0,6s-4.3,1.7-6,0l-2.3-2.3c-8.2,31.3-41.5,76.2-60,94.7l-3.1,3.1C331.7,504.9,328.8,504.9,327.4,503.2z
 			 M235.8,399.6l94.4,94.4c21.6-21.6,54.6-69.1,58.9-96.1l-68.8-68.8c-4-4-10.2-4-13.9,0C306.1,329.4,235.8,399.6,235.8,399.6z" />
-			<path class="st3" d="M327.4,503.2L222.7,398.5c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l104.7,104.7c1.7,1.7,1.7,4.3,0,6
+			<path class="st3" d="M327.4,503.2L222.7,398.5c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l104.7,104.7c1.7,1.7,1.7,4.3,0,6
 			C331.7,504.9,328.8,504.9,327.4,503.2z" />
 			<path class="st2" d="M251.2,410.1c-5.4-5.4-13.9-5.4-19.3,0s-5.4,13.9,0,19.3l0,0c5.4,5.4,13.9,5.4,19.3,0
-			S256.6,415.3,251.2,410.1L251.2,410.1z M315.4,474.4c-5.4-5.4-13.9-5.4-19.3,0c-5.4,5.4-5.4,13.9,0,19.3l0,0
-			c5.4,5.4,13.9,5.4,19.3,0S320.9,479.8,315.4,474.4L315.4,474.4z" />
-			<path class="st3" d="M228.7,432.3c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0c6.8,6.8,6.8,18.5,0,25.3
-			C247.2,439.4,235.8,439.4,228.7,432.3z M248,413c-3.7-3.7-9.7-3.7-13.4,0c-3.7,3.7-3.7,9.7,0,13.4s9.7,3.7,13.4,0
+			S256.6,415.3,251.2,410.1L251.2,410.1z M315.4,474.4c-5.4-5.4-13.9-5.4-19.3,0s-5.4,13.9,0,19.3l0,0c5.4,5.4,13.9,5.4,19.3,0
+			S320.9,479.8,315.4,474.4L315.4,474.4z" />
+			<path class="st3" d="M228.7,432.3c-7.1-7.1-6.8-18.5,0-25.3s18.5-6.8,25.3,0c6.8,6.8,6.8,18.5,0,25.3
+			C247.2,439.4,235.8,439.4,228.7,432.3z M248,413c-3.7-3.7-9.7-3.7-13.4,0s-3.7,9.7,0,13.4s9.7,3.7,13.4,0
 			C251.7,422.7,251.7,416.7,248,413z" />
 			<g>
-			<path class="st3" d="M293.3,496.6c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0c7.1,7.1,6.8,18.5,0,25.3
+			<path class="st3" d="M293.3,496.6c-7.1-7.1-6.8-18.5,0-25.3s18.5-6.8,25.3,0c7.1,7.1,6.8,18.5,0,25.3
 				C311.5,503.7,300.1,503.7,293.3,496.6z M312.6,477.6c-3.7-3.7-9.7-3.7-13.4,0c-3.7,3.7-3.7,9.7,0,13.4s9.7,3.7,13.4,0
 				C316.3,487.2,316.3,481.3,312.6,477.6z" />
 		</g>
 			<g>
-			<path class="st3" d="M293.3,496.6l-84.5-84.5c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l84.5,84.5c1.7,1.7,1.7,4.3,0,6
+			<path class="st3" d="M293.3,496.6l-84.5-84.5c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l84.5,84.5c1.7,1.7,1.7,4.3,0,6
 				C297.5,498.3,295,498.3,293.3,496.6z" />
 		</g>
 			<g>
-			<path class="st3" d="M194.6,398.2c-0.3-0.3-0.3-0.3-0.6-0.6c-0.3-0.3-0.3-0.6-0.3-0.9c0-0.3-0.3-0.6-0.3-0.9s0-0.6,0-0.9
-				c0-0.3,0-0.6,0-0.9c0-0.3,0-0.6,0.3-0.9c0.3,0,0.3-0.3,0.6-0.6s0.3-0.6,0.6-0.6c0.3,0,0.3-0.3,0.6-0.6c0.3-0.3,0.6-0.3,0.9-0.3
-				c0.3,0,0.6,0,0.9-0.3c0.3-0.3,0.6,0,0.9,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9,0.3c0.3,0,0.6,0.3,0.9,0.3c0.6,0.3,0.9,0.6,1.1,1.1
-				c0.3,0.3,0.3,0.6,0.3,0.9c0,0.3,0.3,0.6,0.3,0.9c0,0.3,0,0.6,0,0.9s0,0.6,0,0.9c0,0.3,0,0.6-0.3,0.9c-0.3,0.3-0.3,0.6-0.3,0.9
-				c-0.3,0.3-0.3,0.6-0.6,0.6s-0.3,0.3-0.6,0.6c-0.3,0.3-0.6,0.3-0.9,0.3c-0.3,0-0.6,0.3-0.9,0.3s-0.6,0-0.9,0c-0.3,0-0.6,0-0.9,0
-				c-0.3,0-0.6,0-0.9-0.3c-0.3,0-0.6-0.3-0.9-0.3C195.1,398.8,194.8,398.5,194.6,398.2z" />
+			<path class="st3" d="M194.6,398.2c-0.3-0.3-0.3-0.3-0.6-0.6c-0.3-0.3-0.3-0.6-0.3-0.9s-0.3-0.6-0.3-0.9s0-0.6,0-0.9s0-0.6,0-0.9
+				s0-0.6,0.3-0.9c0.3,0,0.3-0.3,0.6-0.6s0.3-0.6,0.6-0.6s0.3-0.3,0.6-0.6c0.3-0.3,0.6-0.3,0.9-0.3c0.3,0,0.6,0,0.9-0.3
+				c0.3-0.3,0.6,0,0.9,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9,0.3c0.3,0,0.6,0.3,0.9,0.3c0.6,0.3,0.9,0.6,1.1,1.1
+				c0.3,0.3,0.3,0.6,0.3,0.9s0.3,0.6,0.3,0.9s0,0.6,0,0.9s0,0.6,0,0.9s0,0.6-0.3,0.9s-0.3,0.6-0.3,0.9c-0.3,0.3-0.3,0.6-0.6,0.6
+				s-0.3,0.3-0.6,0.6c-0.3,0.3-0.6,0.3-0.9,0.3c-0.3,0-0.6,0.3-0.9,0.3s-0.6,0-0.9,0c-0.3,0-0.6,0-0.9,0c-0.3,0-0.6,0-0.9-0.3
+				c-0.3,0-0.6-0.3-0.9-0.3C195.1,398.8,194.8,398.5,194.6,398.2z" />
 		</g>
 	</g>
 		<g>
@@ -121,46 +120,43 @@
 			l0.3,0.3C940.1,42.4,940.1,60.8,928.7,72.2z M893.2,36.7c-8,8-8,21,0,29.3l0.3,0.3c8,8,21,8,29.3,0c8-8,8-21,0-29.3l-0.3-0.3
 			C914.2,28.7,901.1,28.7,893.2,36.7z" />
 			<path class="st3" d="M896.9,55.2c-2,2-2,5.1,0,7.1c2,2,5.1,2,7.1,0l0,0c2-2,2-5.1,0-7.1C902.3,53.2,898.8,53.2,896.9,55.2
-			L896.9,55.2z M911.4,40.6c-2,2-2,5.1,0,7.1c2,2,5.1,2,7.1,0l0,0c2-2,2-5.1,0-7.1C916.8,38.7,913.4,38.7,911.4,40.6L911.4,40.6z" />
+			L896.9,55.2z M911.4,40.6c-2,2-2,5.1,0,7.1s5.1,2,7.1,0l0,0c2-2,2-5.1,0-7.1C916.8,38.7,913.4,38.7,911.4,40.6L911.4,40.6z" />
 			<path class="st2"
 				d="M971.9,88.7l10.8,10.8c7.4,7.4,7.4,19.3,0,26.7l0,0c-7.4,7.4-19.3,7.4-26.7,0l-10.8-10.8L971.9,88.7z" />
-			<path class="st3" d="M985.9,129.4c-9.1,9.1-23.6,9.1-32.7,0l-8.8-8.8c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l8.8,8.8
-			c5.7,5.7,15.1,5.7,20.8,0c5.7-5.7,5.7-15.1,0-20.8l-8.8-8.8c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l8.8,8.8
-			C995,105.8,995,120.3,985.9,129.4z" />
-			<path class="st3" d="M953.2,112.9c-1.7,1.7-4.3,1.7-6,0l-9.4-9.4c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l9.4,9.4
-			C954.9,108.6,954.9,111.2,953.2,112.9z M969.4,97c-1.7,1.7-4.3,1.7-6,0l-9.4-9.4c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0
-			l9.4,9.4C971.1,92.4,971.1,95.3,969.4,97z" />
-			<path class="st3" d="M978.8,88.2l-34.1,34.1c-1.7,1.7-4.3,1.7-6,0c-1.7-1.7-1.7-4.3,0-6l34.1-34.1c1.7-1.7,4.3-1.7,6,0
-			C980.5,83.9,980.5,86.4,978.8,88.2z M994.4,137.9c-1.7,1.7-4.3,1.7-6,0l-8.5-8.5c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0
-			l8.5,8.5C995.8,133.4,996.1,136.2,994.4,137.9z" />
+			<path class="st3" d="M985.9,129.4c-9.1,9.1-23.6,9.1-32.7,0l-8.8-8.8c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l8.8,8.8
+			c5.7,5.7,15.1,5.7,20.8,0s5.7-15.1,0-20.8l-8.8-8.8c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l8.8,8.8C995,105.8,995,120.3,985.9,129.4z" />
+			<path class="st3" d="M953.2,112.9c-1.7,1.7-4.3,1.7-6,0l-9.4-9.4c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l9.4,9.4
+			C954.9,108.6,954.9,111.2,953.2,112.9z M969.4,97c-1.7,1.7-4.3,1.7-6,0l-9.4-9.4c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l9.4,9.4
+			C971.1,92.4,971.1,95.3,969.4,97z" />
+			<path class="st3" d="M978.8,88.2l-34.1,34.1c-1.7,1.7-4.3,1.7-6,0s-1.7-4.3,0-6l34.1-34.1c1.7-1.7,4.3-1.7,6,0
+			C980.5,83.9,980.5,86.4,978.8,88.2z M994.4,137.9c-1.7,1.7-4.3,1.7-6,0l-8.5-8.5c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l8.5,8.5
+			C995.8,133.4,996.1,136.2,994.4,137.9z" />
 			<g>
-			<path class="st5" d="M966.5,110.1c-1.4,1.4-1.4,4,0,5.4c1.4,1.4,4,1.4,5.4,0l0,0c1.4-1.4,1.4-4,0-5.4
-				C970.5,108.6,968,108.6,966.5,110.1L966.5,110.1z" />
+			<path class="st5" d="M966.5,110.1c-1.4,1.4-1.4,4,0,5.4s4,1.4,5.4,0l0,0c1.4-1.4,1.4-4,0-5.4C970.5,108.6,968,108.6,966.5,110.1
+				L966.5,110.1z" />
 		</g>
 	</g>
 		<g>
-		<path class="st7" d="M486.4,389.4l97.6,97.6l10.8-10.8c6-6,6-15.6,0-21.6l-38.7-38.7l-1.7-0.6c-6.5-2.3-8.5-10.5-3.7-15.6
-			l-3.4-3.4C529.9,378.6,509.4,379.4,486.4,389.4" />
+		<path class="st7" d="M486.4,389.4L584,487l10.8-10.8c6-6,6-15.6,0-21.6l-38.7-38.7l-1.7-0.6c-6.5-2.3-8.5-10.5-3.7-15.6l-3.4-3.4
+			C529.9,378.6,509.4,379.4,486.4,389.4" />
 			<path class="st8" d="M517.7,382.6C517.4,382.6,517.4,382.6,517.7,382.6c-1.1-0.3-2-0.3-2.8-0.3c-8.8,0.3-18.2,2.8-28.2,6.8l0,0
 			l31,31C527.9,410.1,527.9,393.1,517.7,382.6 M599.3,465c-10.2-7.7-25-6.8-34.7,2.6l19.3,19.3l10.8-10.8
 			C597.9,473,599.3,469,599.3,465" />
 			<path class="st3" d="M581.1,490.1l-97.6-97.8c-1.1-1.1-1.4-2.3-1.1-3.7c0.3-1.4,1.1-2.6,2.6-3.1c27.9-11.9,48.6-9.4,65.7,8
 			l0.3,0.3c1.7,1.7,1.7,4.3,0,6s-4.3,1.7-6,0l-0.3-0.3c-13.4-13.4-29.3-16.2-50.6-8.2L584,481l8-8c4.3-4.3,4.3-11.4,0-15.6
-			l-34.4-34.4c-1.1-1.1-1.4-2.3-1.1-3.7l1.7-10.8c0.3-2.3,2.6-4,4.8-3.4c2.3,0.3,4,2.6,3.4,4.8l-1.4,8.5l33,33
+			L557.6,423c-1.1-1.1-1.4-2.3-1.1-3.7l1.7-10.8c0.3-2.3,2.6-4,4.8-3.4c2.3,0.3,4,2.6,3.4,4.8l-1.4,8.5l33,33
 			c7.7,7.7,7.7,20.2,0,27.9l-10.8,10.8C585.4,491.8,582.8,491.5,581.1,490.1z" />
-			<path class="st2" d="M509.4,390.5c-6-6-15.6-6-21.6,0c-6,6-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0
-			C515.7,406.4,515.7,396.8,509.4,390.5L509.4,390.5z M565.8,434.6c-3.4-3.4-8.8-3.4-11.9,0c-3.1,3.4-3.4,8.8,0,11.9
-			c3.4,3.1,8.8,3.4,11.9,0C569.2,443.4,569.2,438,565.8,434.6z" />
-			<path class="st3" d="M484.7,415.3c-7.7-7.7-7.7-20.2,0-27.9s20.2-7.7,27.9,0c7.7,7.7,7.7,20.2,0,27.9
-			C504.9,422.9,492.4,422.9,484.7,415.3z M506.6,393.6c-4.3-4.3-11.4-4.3-15.6,0c-4.3,4.3-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0
-			C510.9,405,510.9,397.9,506.6,393.6z" />
+			<path class="st2" d="M509.4,390.5c-6-6-15.6-6-21.6,0s-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0C515.7,406.4,515.7,396.8,509.4,390.5
+			L509.4,390.5z M565.8,434.6c-3.4-3.4-8.8-3.4-11.9,0c-3.1,3.4-3.4,8.8,0,11.9s8.8,3.4,11.9,0C569.2,443.4,569.2,438,565.8,434.6z" />
+			<path class="st3" d="M484.7,415.3c-7.7-7.7-7.7-20.2,0-27.9s20.2-7.7,27.9,0s7.7,20.2,0,27.9C504.9,422.9,492.4,422.9,484.7,415.3
+			z M506.6,393.6c-4.3-4.3-11.4-4.3-15.6,0c-4.3,4.3-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0C510.9,405,510.9,397.9,506.6,393.6z" />
 			<path class="st2" d="M594.5,475.6c-6-6-15.6-6-21.6,0s-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0S600.5,481.5,594.5,475.6L594.5,475.6z
 			" />
 			<path class="st3" d="M569.7,500.3c-7.7-7.7-7.7-20.2,0-27.9s20.2-7.7,27.9,0s7.7,20.2,0,27.9C589.9,508,577.4,508,569.7,500.3z
 			 M591.4,478.4c-4.3-4.3-11.4-4.3-15.6,0s-4.3,11.4,0,15.6s11.4,4.3,15.6,0S595.6,483,591.4,478.4z" />
-			<path class="st3" d="M569.7,500.3l-98.1-98.1c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l98.1,98.1c1.7,1.7,1.7,4.3,0,6
-			C574,502,571.4,502,569.7,500.3z M459.7,390.2c-0.9-0.9-1.4-2-1.1-3.1c0-1.1,0.3-2.3,1.1-3.1c0.9-0.9,2-1.4,3.1-1.1
-			c2.3,0,4.3,2,4.3,4.3c0,1.1-0.3,2.3-1.1,3.1c-0.9,0.9-2,1.4-3.1,1.1C461.4,391.4,460.5,391.1,459.7,390.2z" />
+			<path class="st3" d="M569.7,500.3l-98.1-98.1c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l98.1,98.1c1.7,1.7,1.7,4.3,0,6
+			S571.4,502,569.7,500.3z M459.7,390.2c-0.9-0.9-1.4-2-1.1-3.1c0-1.1,0.3-2.3,1.1-3.1c0.9-0.9,2-1.4,3.1-1.1c2.3,0,4.3,2,4.3,4.3
+			c0,1.1-0.3,2.3-1.1,3.1c-0.9,0.9-2,1.4-3.1,1.1C461.4,391.4,460.5,391.1,459.7,390.2z" />
 	</g>
 		<g>
 		<path class="st2" d="M306.9,39.8l-35-35.3c-7.7-7.7-19.9-8.2-28.2-1.7L218.2,23l70.3,70.3L308.6,68
@@ -174,17 +170,16 @@
 			<path class="st3" d="M196.8,64.3c-1.7-1.7-1.7-4.3,0-6L215,40.1c4-4,4-10.2,0-13.9c-4-4-10.2-4-13.9,0l-18.2,18.2
 			c-1.7,1.7-4.3,1.7-6,0s-1.7-4.3,0-6l18.2-18.2c7.1-7.1,18.8-7.1,26.2,0s7.1,18.8,0,26.2l-18.2,18.2C201.1,66,198.5,66,196.8,64.3z
 			 M267.1,134.5c-1.7-1.7-1.7-4.3,0-6l18.2-18.2c4-4,4-10.2,0-13.9c-4-3.7-10.2-4-13.9,0l-18.2,18.2c-1.7,1.7-4.3,1.7-6,0
-			c-1.7-1.7-1.7-4.3,0-6l18.2-18.2c7.1-7.1,18.8-7.1,26.2,0c7.1,7.1,7.1,18.8,0,26.2l-18.2,18.2
-			C271.6,136.2,268.8,136.2,267.1,134.5z" />
+			s-1.7-4.3,0-6l18.2-18.2c7.1-7.1,18.8-7.1,26.2,0c7.1,7.1,7.1,18.8,0,26.2l-18.2,18.2C271.6,136.2,268.8,136.2,267.1,134.5z" />
 			<path class="st3" d="M289.6,90.1l-0.3-0.3c-19.1-25.9-41.8-48.6-67.4-67.7c-1.7-1.4-2.3-4-0.9-6c1.4-1.7,4-2.3,6-0.9
 			c26.5,19.6,49.8,43,69.4,69.4c1.4,1.7,1.1,4.6-0.9,6C293.5,91.6,291.3,91.6,289.6,90.1z" />
 			<path class="st3" d="M215,25.9l-0.3-0.3c-1.4-1.7-1.1-4.6,0.6-6l25.6-20.2c10.2-8,24.7-7.1,34.1,2l35,35.3c9.4,9.4,10,23.9,2,34.1
-			l-20.2,25.3c-1.4,1.7-4,2-6,0.6c-2-1.4-2-4-0.6-6l20.2-25.3c5.4-6.8,4.8-16.5-1.1-22.8L268.8,7.4c-6.3-6.3-15.9-6.8-22.8-1.4
-			l-25.6,20.2C218.7,27.8,216.5,27.6,215,25.9z M264.2,125.7l-13.9,13.9l-8-8l13.9-13.9 M193.7,55.2l-13.9,13.9l-8-8l13.9-13.9" />
+			l-20.2,25.3c-1.4,1.7-4,2-6,0.6s-2-4-0.6-6l20.2-25.3c5.4-6.8,4.8-16.5-1.1-22.8L268.8,7.4C262.5,1.1,252.9,0.6,246,6l-25.6,20.2
+			C218.7,27.8,216.5,27.6,215,25.9z M264.2,125.7l-13.9,13.9l-8-8l13.9-13.9 M193.7,55.2l-13.9,13.9l-8-8l13.9-13.9" />
 			<path class="st3" d="M247.2,142.8l-8.2-8.2c-1.7-1.7-1.7-4.3,0-6l13.9-13.9c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-11.1,11.1l2,2
-			l11.1-11.1c1.7-1.7,4.3-1.7,6,0c1.7,1.7,1.7,4.3,0,6l-13.7,14.2C251.4,144.5,248.9,144.5,247.2,142.8z M176.6,72.2l-8-8
-			c-1.7-1.7-1.7-4.3,0-6l13.9-13.9c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-11.1,11.1l2,2l11.1-11.1c1.7-1.7,4.3-1.7,6,0
-			c1.7,1.7,1.7,4.3,0,6l-13.9,13.9C180.9,73.9,178.3,73.9,176.6,72.2z" />
+			l11.1-11.1c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-13.7,14.2C251.4,144.5,248.9,144.5,247.2,142.8z M176.6,72.2l-8-8
+			c-1.7-1.7-1.7-4.3,0-6l13.9-13.9c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-11.1,11.1l2,2l11.1-11.1c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6
+			l-13.9,13.9C180.9,73.9,178.3,73.9,176.6,72.2z" />
 			<path class="st3" d="M270.2,137.6l-96.4-96.4c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l96.4,96.4c1.7,1.7,1.7,4.3,0,6
 			C274.5,139.4,271.9,139.4,270.2,137.6z" />
 			<path class="st2" d="M239.5,88.7l-16.8-16.8c-1.7-1.7-1.7-4.3,0-6l10-10c6.3-6.3,16.5-6.3,23,0l0,0c6.3,6.3,6.3,16.5,0,23l-10,10
@@ -194,7 +189,7 @@
 			<path class="st2" d="M213,28.1c-2.8-2.8-7.4-2.8-10,0c-2.8,2.8-2.8,7.4,0,10c2.8,2.8,7.4,2.8,10,0C215.6,35.2,215.6,30.7,213,28.1
 			z M283.3,98.4c-2.8-2.8-7.4-2.8-10,0s-2.8,7.4,0,10s7.4,2.8,10,0C285.9,105.5,286.2,101.2,283.3,98.4z" />
 			<path class="st3" d="M253.2,148.7L169,64.5c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l84.2,84.2c1.7,1.7,1.7,4.3,0,6
-			C257.4,150.4,254.9,150.4,253.2,148.7z M274.2,157.8c-1.7-1.7-4.3-1.7-6,0s-1.7,4.3,0,6c1.7,1.7,4.3,1.7,6,0
+			C257.4,150.4,254.9,150.4,253.2,148.7z M274.2,157.8c-1.7-1.7-4.3-1.7-6,0s-1.7,4.3,0,6s4.3,1.7,6,0
 			C275.9,162.1,275.9,159.5,274.2,157.8z" />
 	</g>
 		<g>
@@ -208,7 +203,7 @@
 			<path class="st3" d="M467.1,235.8l-40.4,40.1c-4.6,4.6-11.7,4.6-16.2,0l-68.3-68.3c-4.6-4.6-4.6-11.7,0-16.2l40.1-40.1
 			c4.6-4.6,11.7-4.6,16.2,0l68.3,68.3C471.3,224.1,471.3,231.2,467.1,235.8z M348.2,197.7c-1.1,1.1-1.1,2.8,0,4l68.3,68.3
 			c1.1,1.1,2.8,1.1,4,0l40.4-40.1c1.1-1.1,1.1-2.8,0-4l-68.3-68.3c-1.1-1.1-2.8-1.1-4,0L348.2,197.7z" />
-			<path class="st2" d="M421.5,260.8c-1.7,1.7-4.3,1.7-6,0l-25-25c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l25,25
+			<path class="st2" d="M421.5,260.8c-1.7,1.7-4.3,1.7-6,0l-25-25c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l25,25
 			C423.3,256.5,423.3,259.1,421.5,260.8z M381.4,220.7c-0.9,0.9-2,1.4-3.1,1.1c-1.1,0-2.3-0.3-3.1-1.1c-0.9-0.9-1.4-2-1.1-3.1
 			c0-0.3,0-0.6,0-0.9c0-0.3,0-0.6,0.3-0.9c0.3-0.3,0.3-0.6,0.3-0.9c0.9-1.1,2-2,3.4-2c1.1,0,2.3,0.3,3.1,1.1
 			c0.3,0.3,0.3,0.3,0.6,0.6c0.3,0.3,0.3,0.6,0.3,0.9c0,0.3,0.3,0.6,0.3,0.9c0,0.3,0,0.6,0,0.9C382.9,218.7,382.3,219.8,381.4,220.7z
@@ -222,25 +217,25 @@
 				d="M905.4,490.4L798.2,383.1c-6-6-6-15.4,0-21.3l53.2-53.2c5.7-5.7,15.4-5.7,21.3,0l107.2,107.2" />
 			<path class="st2" d="M892,364.3l-38.1,38.1c-2.8,2.8-7.7,2.8-10.5,0l-24.7-24.7c-2.8-2.8-2.8-7.7,0-10.5l38.1-38.1
 			c2.8-2.8,7.7-2.8,10.5,0l24.7,24.7C894.9,356.7,894.9,361.5,892,364.3z" />
-			<path class="st3" d="M983.3,419.5c-2,2-5.4,2-7.4,0l-107-107c-3.7-3.7-10.2-4-13.9,0l-53.2,53.2c-3.7,3.7-3.7,10,0,13.9
-			l107.2,107.2c2,2,2,5.4,0,7.4c-2,2-5.4,2-7.4,0L794.5,387.1c-8-8-8-20.8,0-28.7l53.2-53.2c8-8,20.8-8,28.7,0l107.2,107.2
+			<path class="st3" d="M983.3,419.5c-2,2-5.4,2-7.4,0l-107-107c-3.7-3.7-10.2-4-13.9,0l-53.2,53.2c-3.7,3.7-3.7,10,0,13.9L909,486.8
+			c2,2,2,5.4,0,7.4s-5.4,2-7.4,0L794.5,387.1c-8-8-8-20.8,0-28.7l53.2-53.2c8-8,20.8-8,28.7,0l107.2,107.2
 			C985.6,414.4,985.3,417.5,983.3,419.5z" />
 			<path class="st4" d="M892,364.3l-38.1,38.1c-2.8,2.8-7.7,2.8-10.5,0l-24.7-24.7c-2.8-2.8-2.8-7.7,0-10.5l38.1-38.1
 			c2.8-2.8,7.7-2.8,10.5,0l24.7,24.7C894.9,356.7,894.9,361.5,892,364.3z" />
-			<path class="st3" d="M895.7,368l-38.1,38.1c-4.8,4.8-13.1,4.8-17.9,0l-24.7-24.7c-4.8-4.8-4.8-13.1,0-17.9l38.1-38.1
+			<path class="st3" d="M895.7,368l-38.1,38.1c-4.8,4.8-13.1,4.8-17.9,0L815,381.4c-4.8-4.8-4.8-13.1,0-17.9l38.1-38.1
 			c4.8-4.8,13.1-4.8,17.9,0l24.7,24.7C900.6,355,900.6,362.9,895.7,368z M822.3,370.9c-0.9,0.9-0.9,2.3,0,3.1l24.7,24.7
 			c0.9,0.9,2.3,0.9,3.1,0l38.1-38.1c0.9-0.9,0.9-2.3,0-3.1l-24.7-24.7c-0.9-0.9-2.3-0.9-3.1,0L822.3,370.9z M994.1,409l-95.3,95.3
-			c-2,2-5.4,2-7.4,0c-2-2-2-5.4,0-7.4l95.3-95.3c2-2,5.4-2,7.4,0C996.1,403.6,996.1,407,994.1,409z M988.4,392.8
-			c-4.8,4.8-13.1,4.8-17.9,0l-43-43c-0.9-0.9-2.3-0.9-3.1,0l-5.4,5.4c-2,2-5.4,2-7.4,0c-2-2-2-5.4,0-7.4l5.4-5.4
-			c4.8-4.8,13.1-4.8,17.9,0l43,43c0.9,0.9,2.3,0.9,3.1,0c0.9-0.9,0.9-2.3,0-3.1l-58.9-58.9c-2-2-2-5.4,0-7.4c2-2,5.4-2,7.4,0
-			l58.9,58.9C993.3,379.7,993.3,388,988.4,392.8z" />
+			c-2,2-5.4,2-7.4,0s-2-5.4,0-7.4l95.3-95.3c2-2,5.4-2,7.4,0C996.1,403.6,996.1,407,994.1,409z M988.4,392.8
+			c-4.8,4.8-13.1,4.8-17.9,0l-43-43c-0.9-0.9-2.3-0.9-3.1,0l-5.4,5.4c-2,2-5.4,2-7.4,0s-2-5.4,0-7.4l5.4-5.4
+			c4.8-4.8,13.1-4.8,17.9,0l43,43c0.9,0.9,2.3,0.9,3.1,0c0.9-0.9,0.9-2.3,0-3.1l-58.9-58.9c-2-2-2-5.4,0-7.4s5.4-2,7.4,0l58.9,58.9
+			C993.3,379.7,993.3,388,988.4,392.8z" />
 			<path class="st3" d="M934.7,318.3l-10.5,10.5c-2,2-5.4,2-7.4,0l-21.6-21.6c-2-2-2-5.4,0-7.4l1.7-1.7l-4.8-4.8c-2-2-2-5.4,0-7.4
-			c2-2,5.4-2,7.4,0l4.8,4.8l1.4-1.4c2-2,5.4-2,7.4,0l21.3,21.3C936.7,312.9,936.7,316.3,934.7,318.3z M920.5,317.7l3.1-3.1
-			l-13.9-13.9l-3.1,3.1L920.5,317.7z" />
+			s5.4-2,7.4,0l4.8,4.8l1.4-1.4c2-2,5.4-2,7.4,0l21.3,21.3C936.7,312.9,936.7,316.3,934.7,318.3z M920.5,317.7l3.1-3.1l-13.9-13.9
+			l-3.1,3.1L920.5,317.7z" />
 			<g>
 			<path class="st5" d="M923.9,444.6c-0.6,0.6-1.4,1.1-2.6,1.4c-2.8,0.6-5.7-1.1-6.3-3.7l-3.7-16.2l-3.7,5.4c-1.1,1.7-3.1,2.6-5.1,2
-				c-2-0.6-3.7-2-4-4l-6.5-27c-0.6-2.8,1.1-5.7,3.7-6.3c2.8-0.6,5.7,1.1,6.3,3.7l3.7,16.2l3.7-5.4c1.1-1.7,3.1-2.6,5.1-2
-				c2,0.6,3.7,2,4,4l6.3,27C925.6,441.7,925.3,443.4,923.9,444.6z" />
+				s-3.7-2-4-4l-6.5-27c-0.6-2.8,1.1-5.7,3.7-6.3c2.8-0.6,5.7,1.1,6.3,3.7l3.7,16.2l3.7-5.4c1.1-1.7,3.1-2.6,5.1-2s3.7,2,4,4l6.3,27
+				C925.6,441.7,925.3,443.4,923.9,444.6z" />
 		</g>
 	</g>
 		<g>
@@ -251,9 +246,9 @@
 			<path class="st12" d="M749.8,413.3l3.7,3.7c1.1,1.1,1.4,2.8,0.6,4.6L708.6,496l-10-10l51.8-68.3
 			C751.2,416.1,750.9,414.4,749.8,413.3z" />
 			<g>
-			<path class="st3" d="M706.6,498L663,454.5c-0.6-0.6-0.9-1.4-0.9-2.3c0-0.9,0.6-1.7,1.4-2l74.5-45.2c2.6-1.4,5.7-1.1,8,0.9
-				l9.4,9.4c2,2,2.6,5.4,0.9,8l-45.5,74.2c-0.6,0.9-1.1,1.1-2,1.4C708,498.9,707.1,498.6,706.6,498z M669.6,453.1l38.4,38.4
-				l43.5-71.7c0.3-0.3,0.3-0.9,0-0.9l-9.4-9.4c-0.3-0.3-0.6-0.3-0.9,0L669.6,453.1z" />
+			<path class="st3" d="M706.6,498L663,454.5c-0.6-0.6-0.9-1.4-0.9-2.3s0.6-1.7,1.4-2L738,405c2.6-1.4,5.7-1.1,8,0.9l9.4,9.4
+				c2,2,2.6,5.4,0.9,8l-45.5,74.2c-0.6,0.9-1.1,1.1-2,1.4C708,498.9,707.1,498.6,706.6,498z M669.6,453.1l38.4,38.4l43.5-71.7
+				c0.3-0.3,0.3-0.9,0-0.9l-9.4-9.4c-0.3-0.3-0.6-0.3-0.9,0L669.6,453.1z" />
 				<path class="st3" d="M655.6,447.1c-1.1-1.1-1.1-2.8,0-4s2.8-1.1,4,0l58,58l0,0c1.1,1.1,1.1,2.8,0,4s-2.8,1.1-4,0L655.6,447.1
 				L655.6,447.1z" />
 		</g>
@@ -274,22 +269,21 @@
 			c0.3-0.6,0.3-1.1,0.6-2l-23.3-23.3c-2.8-2.8-7.1-2.8-10,0l-2.3,2.3c-2.8,2.8-2.8,7.1,0,10L664.2,347.8L664.2,347.8z" />
 			<path class="st3" d="M623.8,389.9l-0.3-0.3c-2.8-2.8-2.6-7.4,0.3-10.2c1.7-1.7,4.3-1.7,6,0c0.6,0.6,1.1,1.4,1.1,2.3l3.1-2.6
 			c14.5-11.7,25-27.3,31.3-44.9l1.1-3.4c2.8-8.8,0.6-18.2-6-24.7l-64.3-64.3c-9.4-9.4-24.7-9.4-34.1,0l-35.8,35.8
-			c-1.7,1.7-4.3,1.7-6,0c-1.7-1.7-1.7-4.3,0-6l35.8-35.8c12.8-12.8,33.6-12.8,46.4,0l64.3,64.3c8.8,8.8,11.9,21.6,8,33.6l-1.1,3.4
-			c-6.5,19.1-18.2,35.8-33.8,48.6l-5.7,4.8C630.6,392.8,626.6,392.5,623.8,389.9z M644.8,388.2c-1.7-1.7-1.7-4.3,0-6l18.2-18.2
-			c1.7-1.7,4.3-1.7,6,0c1.7,1.7,1.7,4.3,0,6l-18.2,18.2C649.4,389.9,646.5,389.9,644.8,388.2z" />
-			<path class="st3" d="M599.6,361.2l-46.9-46.9c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l47.2,46.9c1.7,1.7,1.7,4.3,0,6
+			c-1.7,1.7-4.3,1.7-6,0s-1.7-4.3,0-6l35.8-35.8c12.8-12.8,33.6-12.8,46.4,0l64.3,64.3c8.8,8.8,11.9,21.6,8,33.6l-1.1,3.4
+			c-6.5,19.1-18.2,35.8-33.8,48.6l-5.7,4.8C630.6,392.8,626.6,392.5,623.8,389.9z M644.8,388.2c-1.7-1.7-1.7-4.3,0-6L663,364
+			c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-18.2,18.2C649.4,389.9,646.5,389.9,644.8,388.2z" />
+			<path class="st3" d="M599.6,361.2l-46.9-46.9c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l47.2,46.9c1.7,1.7,1.7,4.3,0,6
 			C604.2,362.9,601.3,362.9,599.6,361.2z M531.3,292.7L516,277.3c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l15.4,15.4c1.7,1.7,1.7,4.3,0,6
 			C535.6,294.4,533,294.4,531.3,292.7z M671.9,299.2l-66.6-66.6c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l66.6,66.6c1.7,1.7,1.7,4.3,0,6
 			S673.6,300.9,671.9,299.2z M640.3,379.7c-1.7-1.7-1.7-4-0.3-6c7.7-8.8,5.4-26.5-4.6-36.4l-87.6-87.6c-1.7-1.7-1.7-4.3,0-6
 			s4.3-1.7,6,0l87.6,87.6c13.1,13.1,15.4,35.8,4.8,48.1C644.8,381.1,642.3,381.4,640.3,379.7L640.3,379.7z M565.2,246.9l-6.3-6.3
-			c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l6.3,6.3c1.7,1.7,1.7,4.3,0,6C569.7,248.6,566.9,248.6,565.2,246.9z M577.4,242.9
-			l-6.3-6.3c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l6.3,6.3c1.7,1.7,1.7,4.3,0,6C581.7,244.6,579.1,244.6,577.4,242.9z" />
+			c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l6.3,6.3c1.7,1.7,1.7,4.3,0,6C569.7,248.6,566.9,248.6,565.2,246.9z M577.4,242.9l-6.3-6.3
+			c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l6.3,6.3c1.7,1.7,1.7,4.3,0,6C581.7,244.6,579.1,244.6,577.4,242.9z" />
 			<path class="st2" d="M623.5,359.5c-5.4-5.4-13.9-5.4-19.3,0c-5.4,5.4-5.4,13.9,0,19.3l0,0c5.4,5.4,13.9,5.4,19.3,0
 			C628.6,373.4,628.6,364.9,623.5,359.5L623.5,359.5z" />
-			<path class="st3" d="M601,382c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0c6.8,6.8,7.1,18.5,0,25.3
-			C619.5,389.1,608.1,388.8,601,382z M620.4,362.6c-3.7-3.7-9.7-3.7-13.4,0c-3.7,3.7-3.7,9.7,0,13.4c3.7,3.7,9.7,3.7,13.4,0
-			C624.1,372.3,624.1,366.3,620.4,362.6z" />
-			<path class="st2" d="M535.3,290.7c-5.4,5.4-5.4,13.9,0,19.3c5.4,5.4,13.9,5.4,19.3,0c2.3-2.3,3.7-5.1,4-8.2l-15.1-15.1
+			<path class="st3" d="M601,382c-7.1-7.1-6.8-18.5,0-25.3s18.5-6.8,25.3,0s7.1,18.5,0,25.3C619.5,389.1,608.1,388.8,601,382z
+			 M620.4,362.6c-3.7-3.7-9.7-3.7-13.4,0s-3.7,9.7,0,13.4c3.7,3.7,9.7,3.7,13.4,0C624.1,372.3,624.1,366.3,620.4,362.6z" />
+			<path class="st2" d="M535.3,290.7c-5.4,5.4-5.4,13.9,0,19.3s13.9,5.4,19.3,0c2.3-2.3,3.7-5.1,4-8.2l-15.1-15.1
 			C540.4,287.3,537.6,288.4,535.3,290.7z" />
 			<path class="st3" d="M532.5,313.1c-7.1-7.1-6.8-18.5,0-25.3c2.8-2.8,6.5-4.6,10.8-5.1c1.4,0,2.6,0.3,3.4,1.1l15.1,15.1
 			c0.9,0.9,1.4,2.3,1.1,3.4c-0.3,4-2.3,8-5.1,10.8C550.7,320.3,539.3,320,532.5,313.1z M542.2,291.5c-1.4,0.3-2.6,1.1-3.7,2.3
@@ -300,7 +294,7 @@
 		</g>
 			<g>
 			<path class="st3" d="M623.8,385.4l-2.6-2.6c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l2.6,2.6c1.7,1.7,1.7,4.3,0,6
-				C628.1,387.1,625.5,387.1,623.8,385.4z" />
+				S625.5,387.1,623.8,385.4z" />
 		</g>
 	</g>
 		<g>
@@ -308,35 +302,35 @@
 			C611.3,101.5,575.1,152.2,554.4,172.9z" />
 			<path class="st5" d="M514.8,63.4l48.1-11.7c1.7-0.3,2.6,1.7,1.1,2.6l-28.4,18.8l9.7,9.7c0.9,0.9,0.3,2.3-0.9,2.3l-43.8,6.8
 			c-1.4,0.3-2.3-1.7-1.1-2.6l23.6-14.5l-9.4-9.4C513.4,64.8,513.7,63.7,514.8,63.4z" />
-			<path class="st3" d="M595.6,115.5l-15.1-15.1c-7.1-7.1-7.1-18.8,0-26.2l8-8c1.7-1.7,4.3-1.7,6,0c1.7,1.7,1.7,4.3,0,6l-8,8
+			<path class="st3" d="M595.6,115.5l-15.1-15.1c-7.1-7.1-7.1-18.8,0-26.2l8-8c1.7-1.7,4.3-1.7,6,0s1.7,4.3,0,6l-8,8
 			c-4,4-4,10.2,0,13.9l15.1,15.1c1.7,1.7,1.7,4.3,0,6C599.9,117.2,597.3,117.2,595.6,115.5z" />
 			<path class="st3" d="M548.4,178.9L447.7,78.2c-1.7-1.7-1.7-4.3,0-6l73.4-73.4c7.1-7.1,18.8-7.1,26.2,0l70.3,70.3l0,0l8,8
-			c1.7,1.7,1.7,4.3,0,6c-1.7,1.7-4.3,1.7-6,0l-2.3-2.3c-8.2,31.3-41.5,76.2-60,94.7l-3.1,3.1C552.7,180.6,549.8,180.6,548.4,178.9z
+			c1.7,1.7,1.7,4.3,0,6s-4.3,1.7-6,0l-2.3-2.3c-8.2,31.3-41.5,76.2-60,94.7l-3.1,3.1C552.7,180.6,549.8,180.6,548.4,178.9z
 			 M456.8,75.4l94.4,94.4c21.6-21.6,54.6-69.1,58.9-96.1L541.3,4.8c-4-4-10.2-4-13.9,0C527.1,5.1,456.8,75.4,456.8,75.4z" />
-			<path class="st3" d="M548.4,178.9L443.7,74.2c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l104.7,104.7c1.7,1.7,1.7,4.3,0,6
+			<path class="st3" d="M548.4,178.9L443.7,74.2c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l104.7,104.7c1.7,1.7,1.7,4.3,0,6
 			C552.7,180.6,549.8,180.6,548.4,178.9z" />
-			<path class="st2" d="M472.2,85.6c-5.4-5.4-13.9-5.4-19.3,0c-5.4,5.4-5.4,13.9,0,19.3l0,0c5.4,5.4,13.9,5.4,19.3,0
+			<path class="st2" d="M472.2,85.6c-5.4-5.4-13.9-5.4-19.3,0s-5.4,13.9,0,19.3l0,0c5.4,5.4,13.9,5.4,19.3,0
 			C477.6,99.8,477.6,91,472.2,85.6L472.2,85.6z M536.5,150.2c-5.4-5.4-13.9-5.4-19.3,0c-5.4,5.4-5.4,13.9,0,19.3l0,0
 			c5.4,5.4,13.9,5.4,19.3,0C541.9,164.1,541.9,155.3,536.5,150.2L536.5,150.2z" />
-			<path class="st3" d="M450,108.1c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0c6.8,6.8,6.8,18.5,0,25.3
+			<path class="st3" d="M450,108.1c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0s6.8,18.5,0,25.3
 			C468.2,114.9,456.8,115.2,450,108.1z M469,88.7c-3.7-3.7-9.7-3.7-13.4,0s-3.7,9.7,0,13.4c3.7,3.7,9.7,3.7,13.4,0
 			C472.7,98.4,473,92.4,469,88.7z" />
 			<g>
-			<path class="st3" d="M514.3,172.3c-7.1-7.1-6.8-18.5,0-25.3c6.8-6.8,18.5-6.8,25.3,0c7.1,7.1,6.8,18.5,0,25.3
-				C532.8,179.5,521.4,179.5,514.3,172.3z M533.6,153c-3.7-3.7-9.7-3.7-13.4,0c-3.7,3.7-3.7,9.7,0,13.4c3.7,3.7,9.7,3.7,13.4,0
+			<path class="st3" d="M514.3,172.3c-7.1-7.1-6.8-18.5,0-25.3s18.5-6.8,25.3,0c7.1,7.1,6.8,18.5,0,25.3
+				C532.8,179.5,521.4,179.5,514.3,172.3z M533.6,153c-3.7-3.7-9.7-3.7-13.4,0s-3.7,9.7,0,13.4s9.7,3.7,13.4,0
 				C537,162.7,537.3,156.7,533.6,153z" />
 		</g>
 			<g>
-			<path class="st3" d="M514.3,172.3l-84.5-84.5c-1.7-1.7-1.7-4.3,0-6c1.7-1.7,4.3-1.7,6,0l84.5,84.5c1.7,1.7,1.7,4.3,0,6
+			<path class="st3" d="M514.3,172.3l-84.5-84.5c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l84.5,84.5c1.7,1.7,1.7,4.3,0,6
 				C518.5,174.1,516,174.1,514.3,172.3z" />
 		</g>
 			<g>
 			<path class="st3" d="M415.6,73.9c-0.3-0.3-0.3-0.3-0.6-0.6c0-0.3-0.3-0.6-0.3-0.9s-0.3-0.6-0.3-0.9s0-0.6,0-0.9s0-0.6,0-0.9
-				c0-0.3,0-0.6,0.3-0.9c0.3,0,0.3-0.3,0.6-0.6c0.3-0.3,0.3-0.6,0.6-0.6c0.3,0,0.3-0.3,0.6-0.6c0.3-0.3,0.6-0.3,0.9-0.3
-				s0.6,0,0.9-0.3s0.6,0,0.9,0c0.3,0,0.6,0,0.9,0c0.3,0,0.6,0,0.9,0.3c0.3,0.3,0.6,0.3,0.9,0.3c0.6,0.3,0.9,0.6,1.1,1.1
-				c0.3,0.3,0.3,0.6,0.3,0.9s0.3,0.6,0.3,0.9c0,0.3,0,0.6,0,0.9c0,0.3,0,0.6,0,0.9s0,0.6-0.3,0.9c0,0.3-0.3,0.6-0.3,0.9
-				c-0.3,0.3-0.3,0.6-0.6,0.6c-0.3,0-0.3,0.3-0.6,0.6c-0.3,0.3-0.6,0.3-0.9,0.3s-0.6,0.3-0.9,0.3c-0.3,0-0.6,0-0.9,0
-				c-0.3,0-0.6,0-0.9,0s-0.6,0-0.9-0.3c-0.3,0-0.6-0.3-0.9-0.3C416.1,74.5,415.9,73.9,415.6,73.9z" />
+				s0-0.6,0.3-0.9c0.3,0,0.3-0.3,0.6-0.6c0.3-0.3,0.3-0.6,0.6-0.6c0.3,0,0.3-0.3,0.6-0.6c0.3-0.3,0.6-0.3,0.9-0.3s0.6,0,0.9-0.3
+				s0.6,0,0.9,0s0.6,0,0.9,0s0.6,0,0.9,0.3s0.6,0.3,0.9,0.3c0.6,0.3,0.9,0.6,1.1,1.1c0.3,0.3,0.3,0.6,0.3,0.9s0.3,0.6,0.3,0.9
+				s0,0.6,0,0.9s0,0.6,0,0.9s0,0.6-0.3,0.9c0,0.3-0.3,0.6-0.3,0.9c-0.3,0.3-0.3,0.6-0.6,0.6c-0.3,0-0.3,0.3-0.6,0.6
+				c-0.3,0.3-0.6,0.3-0.9,0.3s-0.6,0.3-0.9,0.3s-0.6,0-0.9,0s-0.6,0-0.9,0s-0.6,0-0.9-0.3c-0.3,0-0.6-0.3-0.9-0.3
+				C416.1,74.5,415.9,73.9,415.6,73.9z" />
 		</g>
 	</g>
 		<path class="st3"
@@ -350,8 +344,8 @@
 		<path class="st3" d="M78.2,8.2l-8.8-8.5c-1.1-1.1-1.1-2.8,0-4c1.1-1.1,2.8-1.1,4,0l8.8,8.8c1.1,1.1,1.1,2.8,0,4
 		C81.4,9.6,79.4,9.4,78.2,8.2z" />
 		<g>
-		<path class="st2" d="M57.7,69.9L44.7,56.6c-3.7-3.7-3.7-10,0-13.7L82.2,5.4c3.7-3.7,10-3.7,13.7,0l13.4,13.4
-			c3.7,3.7,3.7,10,0,13.7L71.4,69.9C67.7,73.6,61.7,73.6,57.7,69.9z" />
+		<path class="st2" d="M57.7,69.9l-13-13.3c-3.7-3.7-3.7-10,0-13.7L82.2,5.4c3.7-3.7,10-3.7,13.7,0l13.4,13.4c3.7,3.7,3.7,10,0,13.7
+			L71.4,69.9C67.7,73.6,61.7,73.6,57.7,69.9z" />
 	</g>
 		<g>
 		<path class="st11" d="M95.6,18.2c-4.3-4.3-11.1-4.3-15.1,0c-4.3,4.3-4.3,11.1,0,15.1l0,0c4.3,4.3,11.1,4.3,15.1,0
@@ -371,8 +365,8 @@
 			C32.4,85.3,30.4,85.3,29.3,84.2z" />
 	</g>
 		<g>
-		<path class="st5" d="M802.4,224.7l-70.5-70.5l-46.9,46.9c-4.3,4.3-4.3,11.4,0,15.6l54.9,54.9c4.3,4.3,11.4,4.3,15.6,0L802.4,224.7
-			z" />
+		<path class="st5" d="M802.4,224.7l-70.5-70.5L685,201.1c-4.3,4.3-4.3,11.4,0,15.6l54.9,54.9c4.3,4.3,11.4,4.3,15.6,0L802.4,224.7z
+			" />
 			<path class="st2" d="M731,207.9l33.3-8.2c1.1-0.3,1.7,1.1,0.9,1.7l-19.6,13.1l6.8,6.8c0.6,0.6,0.3,1.4-0.6,1.7l-30.2,4.8
 			c-1.1,0.3-1.4-1.1-0.6-1.7l16.2-9.7l-6.5-6.5C729.9,209,730.2,208.2,731,207.9z" />
 			<path class="st6" d="M794.7,217l-45.5,45.5c-0.9,0.9-2.3,0.9-3.1,0L712.5,229c-2.3-2.3-5.7-2.3-8,0l0,0c-2.3,2.3-2.3,5.7,0,8
@@ -383,11 +377,11 @@
 			c-3.1,3.1-3.1,8,0,11.1l54.9,54.9c3.1,3.1,8,3.1,11.1,0l46.9-46.9c1.4-1.4,3.4-1.4,4.8,0c1.4,1.4,1.4,3.4,0,4.8l-46.9,46.9
 			C752.1,279.6,743.3,279.6,737.6,274.2z" />
 			<path class="st2" d="M714,188c-1.4-1.4-1.4-3.4,0-4.8l23.6-23.6c1.4-1.4,3.4-1.4,4.8,0c1.4,1.4,1.4,3.4,0,4.8L718.8,188
-			C717.4,189.1,715.4,189.1,714,188z M702.3,199.7c-0.3-0.3-0.3-0.3-0.3-0.6c-0.3-0.3-0.3-0.3-0.3-0.6c0-0.3,0-0.3-0.3-0.6
+			C717.4,189.1,715.4,189.1,714,188z M702.3,199.7c-0.3-0.3-0.3-0.3-0.3-0.6c-0.3-0.3-0.3-0.3-0.3-0.6s0-0.3-0.3-0.6
 			c0-0.3,0-0.3,0-0.6s0-0.6,0-0.6c0-0.3,0-0.3,0.3-0.6c0-0.3,0.3-0.3,0.3-0.6s0.3,0,0.3-0.3c0.3-0.3,0.3-0.3,0.6-0.3
-			c0.3,0,0.3-0.3,0.6-0.3s0.6-0.3,0.6-0.3c0.3,0,0.3,0,0.6,0s0.6,0,0.6,0s0.3,0,0.6,0.3c0.3,0,0.3,0.3,0.6,0.3
-			c0.9,0.6,1.4,1.7,1.4,2.8c0,0.3,0,0.6,0,0.6c0,0.3,0,0.3-0.3,0.6c0,0.3-0.3,0.3-0.3,0.6s-0.6,0.3-0.6,0.3
-			c-0.6,0.6-1.4,1.1-2.3,0.9C703.7,200.8,702.9,200.2,702.3,199.7z" />
+			s0.3-0.3,0.6-0.3s0.6-0.3,0.6-0.3c0.3,0,0.3,0,0.6,0s0.6,0,0.6,0s0.3,0,0.6,0.3c0.3,0,0.3,0.3,0.6,0.3c0.9,0.6,1.4,1.7,1.4,2.8
+			c0,0.3,0,0.6,0,0.6c0,0.3,0,0.3-0.3,0.6c0,0.3-0.3,0.3-0.3,0.6s-0.6,0.3-0.6,0.3c-0.6,0.6-1.4,1.1-2.3,0.9
+			C703.7,200.8,702.9,200.2,702.3,199.7z" />
 			<path class="st3" d="M804.1,230.9l-78.2-78.2c-1.4-1.4-1.4-3.4,0-4.8l9.4-9.4c1.4-1.4,3.4-1.4,4.8,0l78.2,78.2
 			c1.4,1.4,1.4,3.4,0,4.8l-9.4,9.4C807.5,232.4,805.3,232.4,804.1,230.9z M732.7,150.4l73.7,73.7l4.8-4.8l-73.7-73.7L732.7,150.4z" />
 			<path class="st3" d="M758.6,166.7c-1.4-1.4-1.4-3.4,0-4.8l7.1-7.1l-7.1-7.1l-0.9,0.9c-1.4,1.4-3.4,1.4-4.8,0
@@ -401,20 +395,20 @@
 			<path class="st8" d="M909.4,164.4C909.4,164.1,909.4,164.1,909.4,164.4c-1.1-0.3-2-0.3-2.8-0.3c-8.8,0.3-18.2,2.8-28.2,6.8l0,0
 			l31,31C919.6,191.7,919.6,174.6,909.4,164.4 M991,246.6c-10.2-7.7-25-6.8-34.7,2.6l19.3,19.3l10.8-10.8
 			C989.6,254.6,991,250.6,991,246.6" />
-			<path class="st3" d="M972.8,271.6l-97.6-97.6c-1.1-1.1-1.4-2.3-1.1-3.7c0.3-1.4,1.1-2.6,2.6-3.1c27.9-11.9,48.6-9.4,65.7,8
-			l0.3,0.3c1.7,1.7,1.7,4.3,0,6c-1.7,1.7-4.3,1.7-6,0l-0.3-0.3c-13.4-13.4-29.3-16.2-50.6-8.2l89.9,89.9l8-8
-			c4.3-4.3,4.3-11.4,0-15.6l-34.4-34.7c-1.1-1.1-1.4-2.3-1.1-3.7l1.7-10.8c0.3-2.3,2.6-4,4.8-3.4c2.3,0.3,4,2.6,3.4,4.8l-1.4,8.5
-			l33.3,33c7.7,7.7,7.7,20.2,0,27.9l-10.8,10.8C977.4,273.3,974.5,273.3,972.8,271.6z" />
-			<path class="st2" d="M901.4,172.3c-6-6-15.6-6-21.6,0c-6,6-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0
-			C907.4,188,907.4,178.3,901.4,172.3L901.4,172.3z M957.7,216.4c-3.4-3.4-8.8-3.4-11.9,0c-3.4,3.4-3.4,8.8,0,11.9
-			c3.4,3.1,8.8,3.4,11.9,0C960.9,225,960.9,219.6,957.7,216.4z" />
-			<path class="st3" d="M876.7,197.1c-7.7-7.7-7.7-20.2,0-27.9c7.7-7.7,20.2-7.7,27.9,0s7.7,20.2,0,27.9
-			C896.6,204.8,884.3,204.8,876.7,197.1z M898.3,175.2c-4.3-4.3-11.4-4.3-15.6,0c-4.3,4.3-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0
-			C902.5,186.6,902.5,179.7,898.3,175.2z" />
-			<path class="st2" d="M986.2,257.1c-6-6-15.6-6-21.6,0c-6,6-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0
-			C992.1,272.8,992.1,263.1,986.2,257.1L986.2,257.1z" />
+			<path class="st3" d="M972.8,271.6L875.2,174c-1.1-1.1-1.4-2.3-1.1-3.7c0.3-1.4,1.1-2.6,2.6-3.1c27.9-11.9,48.6-9.4,65.7,8l0.3,0.3
+			c1.7,1.7,1.7,4.3,0,6s-4.3,1.7-6,0l-0.3-0.3c-13.4-13.4-29.3-16.2-50.6-8.2l89.9,89.9l8-8c4.3-4.3,4.3-11.4,0-15.6l-34.4-34.7
+			c-1.1-1.1-1.4-2.3-1.1-3.7l1.7-10.8c0.3-2.3,2.6-4,4.8-3.4c2.3,0.3,4,2.6,3.4,4.8l-1.4,8.5l33.3,33c7.7,7.7,7.7,20.2,0,27.9
+			l-10.8,10.8C977.4,273.3,974.5,273.3,972.8,271.6z" />
+			<path class="st2" d="M901.4,172.3c-6-6-15.6-6-21.6,0s-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0C907.4,188,907.4,178.3,901.4,172.3
+			L901.4,172.3z M957.7,216.4c-3.4-3.4-8.8-3.4-11.9,0c-3.4,3.4-3.4,8.8,0,11.9c3.4,3.1,8.8,3.4,11.9,0
+			C960.9,225,960.9,219.6,957.7,216.4z" />
+			<path class="st3" d="M876.7,197.1c-7.7-7.7-7.7-20.2,0-27.9s20.2-7.7,27.9,0s7.7,20.2,0,27.9C896.6,204.8,884.3,204.8,876.7,197.1
+			z M898.3,175.2c-4.3-4.3-11.4-4.3-15.6,0c-4.3,4.3-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0C902.5,186.6,902.5,179.7,898.3,175.2z
+			" />
+			<path class="st2" d="M986.2,257.1c-6-6-15.6-6-21.6,0s-6,15.6,0,21.6l0,0c6,6,15.6,6,21.6,0C992.1,272.8,992.1,263.1,986.2,257.1
+			L986.2,257.1z" />
 			<path class="st3" d="M961.4,281.9c-7.7-7.7-7.7-20.2,0-27.9c7.7-7.7,20.2-7.7,27.9,0c7.7,7.7,7.7,20.2,0,27.9
-			C981.6,289.5,969.1,289.5,961.4,281.9z M983.3,260.2c-4.3-4.3-11.4-4.3-15.6,0s-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0
+			C981.6,289.5,969.1,289.5,961.4,281.9z M983.3,260.2c-4.3-4.3-11.4-4.3-15.6,0c-4.2,4.3-4.3,11.4,0,15.6c4.3,4.3,11.4,4.3,15.6,0
 			C987.6,271.6,987.6,264.5,983.3,260.2z" />
 			<path class="st3" d="M961.4,281.9l-98.1-98.1c-1.7-1.7-1.7-4.3,0-6s4.3-1.7,6,0l98.1,98.1c1.7,1.7,1.7,4.3,0,6
 			S963.1,283.6,961.4,281.9z M851.3,171.8c-0.9-0.9-1.4-2-1.1-3.1c0-1.1,0.3-2.3,1.1-3.1c0.9-0.9,2-1.4,3.1-1.1c2.3,0,4.3,2,4.3,4.3
@@ -423,7 +417,7 @@
 		<g>
 		<path class="st3" d="M789.9,46.3c0-8.5,6.8-15.4,15.4-15.4c8.5,0,15.4,6.8,15.4,15.4s-6.8,15.4-15.4,15.4 M752.6,8.8
 			c0-8.5,6.8-15.4,15.4-15.4s15.4,6.8,15.4,15.4s-6.8,15.4-15.4,15.4" />
-			<path class="st11" d="M782.2,91.6l-59.7-59.7c-0.6-0.6-0.6-1.7,0-2.6l19.3-19.3c0.6-0.6,1.7-0.6,2.6,0l59.7,59.7
+			<path class="st11" d="M782.2,91.6l-59.7-59.7c-0.6-0.6-0.6-1.7,0-2.6L741.8,10c0.6-0.6,1.7-0.6,2.6,0l59.7,59.7
 			c0.6,0.6,0.6,1.7,0,2.6l-19.3,19.3C783.9,92.4,782.8,92.4,782.2,91.6z" />
 			<path class="st2" d="M725.6,26.4l-3.1,3.1c-0.6,0.6-0.6,1.7,0,2.6l5.1,5.1l40.4-3.4l0,0L757.2,23L725.6,26.4z M737.3,46.9
 			l-0.6-0.6l11.4,11.4l40.4-3.1l0,0l-10.8-10.8L737.3,46.9z M801,75.6l3.1-3.1c0.6-0.6,0.6-1.7,0-2.6l-5.1-5.1L758.6,68l0,0
@@ -437,7 +431,7 @@
 	</g>
 		<rect y="-34.4" class="st13" width="1024" height="568.9" />
 </g>
-	<g id="Ebene_2">
+	<g id="Ebene_2_1_">
 	<g>
 		<g>
 			<g>
@@ -455,19 +449,36 @@
 			</g>
 			<g>
 				<g>
-					<path class="st17" d="M267.6,140.1c-37,0-67,30-67,67c0,50.5,56.4,76.9,63.2,148.9c0.2,2.1,1.9,3.6,4,3.6c2.1,0,3.8-1.5,4-3.6
+					<path class="st17" d="M267.6,140.1c-37,0-67,30-67,67c0,50.5,56.4,76.9,63.2,148.9c0.2,2.1,1.9,3.6,4,3.6s3.8-1.5,4-3.6
 						c6.8-72,63.2-98.4,63.2-148.9C334.5,169.9,304.5,140.1,267.6,140.1z" />
 					<path class="st18" d="M267.6,141.6c36.8,0,66.5,29.6,67,66.1c0-0.2,0-0.4,0-0.6c0-37-30-67-67-67s-67,29.8-67,67
 						c0,0.2,0,0.4,0,0.6C201,171.2,230.8,141.6,267.6,141.6L267.6,141.6z" />
 					<path class="st19" d="M271.6,354.4c-0.2,2.1-1.9,3.6-4,3.6s-3.8-1.5-4-3.6c-6.5-71.8-62.5-98.2-63-148.1c0,0.4,0,0.6,0,1.1
-						c0,50.5,56.4,76.9,63.2,148.9c0.2,2.1,1.9,3.6,4,3.6c2.1,0,3.8-1.5,4-3.6c6.8-72,63.2-98.4,63.2-148.9c0-0.4,0-0.6,0-1.1
+						c0,50.5,56.4,76.9,63.2,148.9c0.2,2.1,1.9,3.6,4,3.6s3.8-1.5,4-3.6c6.8-72,63.2-98.4,63.2-148.9c0-0.4,0-0.6,0-1.1
 						C334.1,256.1,278.1,282.5,271.6,354.4L271.6,354.4z" />
 				</g>
 				<path class="st20"
-					d="M252.2,174.4v40.6h11v33.2l25.8-44.4h-14.8l14.8-29.6C289.1,174.4,252.2,174.4,252.2,174.4z" />
+					d="M252.2,174.4V215h11v33.2l25.8-44.4h-14.8l14.8-29.6C289.1,174.4,252.2,174.4,252.2,174.4z" />
 			</g>
 		</g>
-		<text transform="matrix(1 0 0 1 417.7245 289.5375)" class="st2 st21 st22">EVMap</text>
+		<g class="st21">
+			<path class="st2"
+				d="M483.6,243h-45.4v39.6h52.2v6.9H430v-97.1h60.1v6.9h-51.9v36.7h45.4V243z" />
+			<path class="st2"
+				d="M536.9,277.5l0.5,2.1l0.6-2.1l30.5-85.1h9l-36.1,97.1h-7.9l-36.1-97.1h8.9L536.9,277.5z" />
+			<path class="st2" d="M602.7,192.5l35.8,85.7l35.9-85.7h10.9v97.1h-8.2v-42.3l0.7-43.3l-36.1,85.6h-6.3l-36-85.3l0.7,42.7v42.5
+				h-8.2v-97.1H602.7z" />
+			<path class="st2" d="M753.7,289.5c-0.8-2.3-1.3-5.6-1.5-10.1c-2.8,3.6-6.4,6.5-10.7,8.4c-4.3,2-8.9,3-13.8,3
+				c-6.9,0-12.5-1.9-16.8-5.8c-4.3-3.9-6.4-8.8-6.4-14.7c0-7,2.9-12.6,8.8-16.7c5.8-4.1,14-6.1,24.4-6.1h14.5v-8.2
+				c0-5.2-1.6-9.2-4.8-12.2c-3.2-3-7.8-4.4-13.9-4.4c-5.6,0-10.2,1.4-13.8,4.3c-3.6,2.8-5.5,6.3-5.5,10.3l-8-0.1
+				c0-5.7,2.7-10.7,8-14.9c5.3-4.2,11.9-6.3,19.7-6.3c8,0,14.4,2,19,6c4.6,4,7,9.6,7.2,16.8v34.1c0,7,0.7,12.2,2.2,15.7v0.8H753.7z
+				 M728.6,283.8c5.3,0,10.1-1.3,14.3-3.9c4.2-2.6,7.3-6,9.2-10.3v-15.9h-14.3c-8,0.1-14.2,1.5-18.7,4.4c-4.5,2.8-6.7,6.7-6.7,11.6
+				c0,4,1.5,7.4,4.5,10.1S723.8,283.8,728.6,283.8z" />
+			<path class="st2" d="M839.3,254.2c0,11.2-2.5,20.2-7.5,26.8c-5,6.6-11.6,9.9-20,9.9c-9.9,0-17.4-3.5-22.7-10.4v36.8h-7.9v-99.9
+				h7.4l0.4,10.2c5.2-7.7,12.7-11.5,22.6-11.5c8.6,0,15.4,3.3,20.3,9.8c4.9,6.5,7.4,15.6,7.4,27.2V254.2z M831.3,252.8
+				c0-9.2-1.9-16.5-5.7-21.8c-3.8-5.3-9-8-15.8-8c-4.9,0-9.1,1.2-12.6,3.5c-3.5,2.4-6.2,5.8-8.1,10.3v34.6c1.9,4.1,4.6,7.3,8.2,9.5
+				c3.6,2.2,7.8,3.3,12.6,3.3c6.7,0,11.9-2.7,15.7-8C829.4,270.7,831.3,263,831.3,252.8z" />
+		</g>
 	</g>
 </g>
 </svg>

_img/map_marker_charging_multiple.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	viewBox="0 0 233.8 368.4" style="enable-background:new 0 0 233.8 368.4;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#B5B5B5;}
+	.st2{fill:#808080;}
+</style>
+	<g>
+	<g>
+		<g>
+			<path class="st0" d="M109.8,0h13.6c33.9,1.9,67.1,18.5,87.7,45.8c13.5,17.2,21,38.6,22.7,60.3v8.1c-0.8,42.1-27.7,76.6-51,109.4
+				c-26.2,37-50.4,77.3-57.1,122.9c-1.8,7.7,0.4,18.5-8.9,22c-2.2-1.7-4.7-3.1-6.2-5.4c-2.7-25.5-9.1-50.7-20-73.9
+				c-12.3-27.1-29.5-51.6-47-75.6C33,199,23,184.2,14.7,168.3c-13-23.8-17.9-51.9-12.5-78.6C6.6,68.6,17.6,49.1,32.8,34
+				C53.3,14,81.1,1.8,109.8,0z" />
+		</g>
+	</g>
+</g>
+	<g>
+	<polygon class="st1"
+		points="143.2,109.4 123.5,143.2 123.5,181.3 166.9,106.9 144.7,106.9 	" />
+		<path class="st1"
+			d="M122.2,101.9h16.7h5.7l22.3-44.6c0,0-10.2,0-22.4,0l-1.1,2.2L122.2,101.9z" />
+		<path class="st2" d="M138.9,57.3c-9.7,0-19.8,0-26.4,0c-2.5,0-5.1,0-7.6,0c-8.2,0-16.1,0-21.4,0c-4.1,0-6.6,0-6.6,0v68.2h18.6v55.8
+		l43.4-74.4h-24.8L138.9,57.3z" />
+</g>
+</svg>

_img/paypal.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<svg fill="#000000" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px"
+    height="24px">
+    <path
+        d="M20.055,7.713c-0.677-0.842-1.673-1.41-2.764-1.615C16.773,3.971,14.877,3,13.045,3H7.057C6.425,3,5.878,3.409,5.689,4.009 c-0.015,0.04-0.026,0.082-0.036,0.125L3.034,16.262c-0.009,0.041-0.015,0.083-0.019,0.125C3.006,16.449,3,16.513,3,16.56 C3,17.354,3.648,18,4.444,18h2.316l-0.267,1.262c-0.008,0.04-0.014,0.081-0.018,0.121c-0.009,0.063-0.016,0.126-0.016,0.173 C6.461,20.353,7.109,21,7.905,21h3.259c0.056,0,0.111-0.005,0.166-0.015c0.549-0.063,1.011-0.437,1.191-0.963 c0.021-0.05,0.038-0.103,0.05-0.156L13.475,16h1.398c3.365,0,5.38-1.445,5.989-4.295C21.278,9.752,20.653,8.456,20.055,7.713z M5.137,16L7.512,5h5.533c0.293,0,1.5,0.061,2.078,1.013h-4.706c-0.626,0-1.17,0.401-1.363,0.99c-0.019,0.049-0.033,0.1-0.043,0.151 l-1.034,5.093L7.183,16H5.137z M18.906,11.287C18.5,13.188,17.293,14,14.873,14h-1.857c-0.823,0-1.338,0.652-1.405,1.198L10.721,19 H8.594l1.271-6h1.444c4.259,0,5.665-2.394,6.094-4.402c0.027-0.128,0.045-0.256,0.057-0.382c0.378,0.151,0.749,0.393,1.038,0.751 C18.971,9.557,19.108,10.337,18.906,11.287z" />
+</svg>

_img/powered_by_chargeprice.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="363.80554mm"
+    height="72.554214mm" viewBox="0 0 1289.0747 257.0819" id="svg4985" version="1.1"
+    inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="logo_text_small2.svg"
+    inkscape:export-filename="/home/nih/Desktop/cp/logos/powered_by/logo_text_white_small.png"
+    inkscape:export-xdpi="42.009968" inkscape:export-ydpi="42.009968">
+  <defs id="defs4987">
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 152.57443 : 1"
+        inkscape:vp_y="0 : 1000.0001 : 0" inkscape:vp_z="305.14877 : 152.57443 : 1"
+        inkscape:persp3d-origin="152.57439 : 101.71629 : 1" id="perspective4145" />
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0"
+      inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="572.73795"
+      inkscape:cy="173.48708" inkscape:document-units="px" inkscape:current-layer="layer4"
+      showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0"
+      fit-margin-bottom="0" inkscape:window-width="1857" inkscape:window-height="1052"
+      inkscape:window-x="63" inkscape:window-y="0" inkscape:window-maximized="1" />
+  <metadata id="metadata4990">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:groupmode="layer" id="layer4" inkscape:label="Layer 2"
+      transform="translate(-220.97188,-392.31605)">
+    <g aria-label="chargeprice" transform="matrix(0.93750004,0,0,0.93750004,231.60533,392.30136)"
+        style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        id="flowRoot825">
+      <path
+          d="m 350.50175,132.92433 q 15.168,0 25.152,4.8 10.176,4.8 10.176,12.288 0,3.264 -2.112,5.952 -2.112,2.496 -5.376,2.496 -2.496,0 -4.032,-0.768 -1.344,-0.768 -3.84,-2.496 -1.152,-1.152 -3.648,-2.688 -2.304,-1.152 -6.528,-1.92 -4.224,-0.768 -7.68,-0.768 -9.984,0 -17.664,4.608 -7.68,4.608 -11.904,12.864 -4.224,8.064 -4.224,18.048 0,10.176 4.032,18.24 4.224,8.064 11.712,12.672 7.488,4.608 17.088,4.608 9.984,0 16.128,-3.072 1.344,-0.768 3.648,-2.496 1.92,-1.536 3.264,-2.304 1.536,-0.768 3.648,-0.768 3.84,0 5.952,2.496 2.304,2.304 2.304,6.144 0,4.032 -5.184,8.064 -4.992,3.84 -13.632,6.336 -8.448,2.496 -18.24,2.496 -14.592,0 -25.728,-6.72 -11.136,-6.912 -17.28,-18.816 -5.952,-12.096 -5.952,-26.88 0,-14.784 6.336,-26.688 6.336,-12.096 17.664,-18.816 11.328,-6.912 25.92,-6.912 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path824" />
+      <path
+          d="m 455.46275,133.50033 q 33.792,0 33.792,41.856 v 51.264 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -3.84,0 -6.528,-2.688 -2.496,-2.688 -2.496,-6.528 v -51.264 q 0,-24.96 -21.12,-24.96 -11.328,0 -18.816,7.296 -7.488,7.104 -7.488,17.664 v 51.264 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -4.032,0 -6.528,-2.496 -2.496,-2.688 -2.496,-6.72 v -123.648 q 0,-3.840001 2.496,-6.528001 2.688,-2.688 6.528,-2.688 4.032,0 6.528,2.688 2.688,2.688 2.688,6.528001 v 48.576 q 4.8,-7.488 13.44,-12.672 8.64,-5.376 18.432,-5.376 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path826" />
+      <path
+          d="m 597.95075,133.88433 q 4.032,0 6.528,2.688 2.688,2.496 2.688,6.72 v 83.328 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -4.032,0 -6.528,-2.496 -2.496,-2.688 -2.496,-6.72 v -4.992 q -4.992,6.72 -13.632,11.52 -8.64,4.608 -18.624,4.608 -13.056,0 -23.808,-6.72 -10.56,-6.72 -16.704,-18.624 -5.952,-12.096 -5.952,-27.072 0,-14.976 5.952,-26.88 6.144,-12.096 16.704,-18.816 10.56,-6.72 23.232,-6.72 10.176,0 18.816,4.224 8.832,4.224 14.016,10.752 v -4.608 q 0,-4.032 2.496,-6.72 2.496,-2.688 6.528,-2.688 z m -39.168,86.976 q 9.024,0 15.936,-4.608 7.104,-4.608 10.944,-12.672 4.032,-8.064 4.032,-18.24 0,-9.984 -4.032,-18.048 -3.84,-8.064 -10.944,-12.672 -6.912,-4.8 -15.936,-4.8 -9.024,0 -16.128,4.608 -6.912,4.608 -10.944,12.672 -3.84,8.064 -3.84,18.24 0,10.176 3.84,18.24 4.032,8.064 10.944,12.672 7.104,4.608 16.128,4.608 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path828" />
+      <path
+          d="m 684.21275,132.92433 q 4.992,0 8.64,2.688 3.648,2.496 3.648,6.336 0,4.608 -2.496,7.104 -2.304,2.304 -5.76,2.304 -1.728,0 -5.184,-1.152 -4.032,-1.344 -6.336,-1.344 -5.952,0 -11.712,4.224 -5.568,4.032 -9.216,11.328 -3.456,7.104 -3.456,15.936 v 46.272 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -4.032,0 -6.528,-2.496 -2.496,-2.688 -2.496,-6.72 v -82.176 q 0,-3.84 2.496,-6.528 2.688,-2.688 6.528,-2.688 4.032,0 6.528,2.688 2.688,2.688 2.688,6.528 v 9.792 q 4.224,-9.408 12.672,-15.168 8.448,-5.952 19.2,-6.144 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path830" />
+      <path
+          d="m 794.32175,133.88433 q 4.032,0 6.528,2.688 2.688,2.496 2.688,6.72 v 84.48 q 0,15.552 -6.72,25.92 -6.528,10.56 -17.856,15.552 -11.328,4.992 -25.536,4.992 -7.68,0 -18.048,-2.688 -10.176,-2.688 -13.056,-5.568 -5.952,-3.072 -5.952,-7.68 0,-1.152 0.768,-3.072 2.112,-4.8 7.104,-4.8 2.496,0 5.376,1.152 15.36,5.952 24,5.952 15.36,0 23.424,-7.488 8.256,-7.296 8.256,-20.16 v -10.368 q -4.032,7.488 -13.632,12.864 -9.408,5.376 -19.968,5.376 -13.248,0 -24.192,-6.72 -10.944,-6.72 -17.28,-18.624 -6.144,-12.096 -6.144,-27.072 0,-14.976 6.144,-26.88 6.336,-12.096 17.088,-18.816 10.944,-6.72 24,-6.72 10.56,0 19.584,4.8 9.216,4.8 14.4,11.712 v -6.144 q 0,-4.032 2.496,-6.72 2.496,-2.688 6.528,-2.688 z m -40.512,86.976 q 9.408,0 16.704,-4.416 7.296,-4.608 11.328,-12.672 4.224,-8.256 4.224,-18.432 0,-10.176 -4.224,-18.24 -4.032,-8.064 -11.328,-12.672 -7.296,-4.608 -16.704,-4.608 -9.216,0 -16.512,4.608 -7.296,4.608 -11.52,12.864 -4.032,8.064 -4.032,18.048 0,9.984 4.032,18.24 4.224,8.064 11.52,12.672 7.296,4.608 16.512,4.608 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path832" />
+      <path
+          d="m 915.17075,181.69233 q -0.192,3.456 -2.88,5.952 -2.688,2.304 -6.336,2.304 h -67.584 q 1.344,14.016 10.56,22.464 9.408,8.448 22.848,8.448 9.216,0 14.976,-2.688 5.76,-2.688 10.176,-6.912 2.88,-1.728 5.568,-1.728 3.264,0 5.376,2.304 2.304,2.304 2.304,5.376 0,4.032 -3.84,7.296 -5.568,5.568 -14.784,9.408 -9.216,3.84 -18.816,3.84 -15.552,0 -27.456,-6.528 -11.712,-6.528 -18.24,-18.24 -6.336,-11.712 -6.336,-26.496 0,-16.128 6.528,-28.224 6.72,-12.288 17.472,-18.816 10.944,-6.528 23.424,-6.528 12.288,0 23.04,6.336 10.752,6.336 17.28,17.472 6.528,11.136 6.72,24.96 z m -47.04,-31.872 q -10.752,0 -18.624,6.144 -7.872,5.952 -10.368,18.624 h 56.64 v -1.536 q -0.96,-10.176 -9.216,-16.704 -8.064,-6.528 -18.432,-6.528 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path834" />
+      <path
+          d="m 986.84675,133.50033 q 13.056,0 23.61605,6.72 10.5599,6.528 16.512,18.432 6.144,11.904 6.144,26.88 0,14.976 -6.144,26.88 -5.9521,11.712 -16.512,18.432 -10.56005,6.72 -23.23205,6.72 -9.984,0 -18.624,-4.416 -8.64,-4.416 -14.016,-10.752 v 42.624 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -3.84,0 -6.528,-2.688 -2.496,-2.496 -2.496,-6.528 v -120.768 q 0,-4.032 2.496,-6.72 2.496,-2.688 6.528,-2.688 4.032,0 6.528,2.688 2.688,2.688 2.688,6.72 v 5.568 q 4.608,-6.72 13.44,-11.52 8.832,-4.8 18.816,-4.8 z m -2.112,87.168 q 8.832,0 15.93595,-4.608 7.1041,-4.608 10.944,-12.48 4.032,-8.064 4.032,-18.048 0,-9.984 -4.032,-17.856 -3.8399,-8.064 -10.944,-12.672 -7.10395,-4.608 -15.93595,-4.608 -9.024,0 -16.128,4.608 -7.104,4.416 -11.136,12.48 -3.84,8.064 -3.84,18.048 0,9.984 3.84,18.048 4.032,8.064 11.136,12.672 7.104,4.416 16.128,4.416 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path836" />
+      <path
+          d="m 1104.2128,132.92433 q 4.9919,0 8.64,2.688 3.648,2.496 3.648,6.336 0,4.608 -2.496,7.104 -2.304,2.304 -5.76,2.304 -1.728,0 -5.184,-1.152 -4.032,-1.344 -6.336,-1.344 -5.952,0 -11.712,4.224 -5.568,4.032 -9.216,11.328 -3.456,7.104 -3.456,15.936 v 46.272 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -4.032,0 -6.528,-2.496 -2.496,-2.688 -2.496,-6.72 v -82.176 q 0,-3.84 2.496,-6.528 2.688,-2.688 6.528,-2.688 4.032,0 6.528,2.688 2.688,2.688 2.688,6.528 v 9.792 q 4.224,-9.408 12.672,-15.168 8.448,-5.952 19.2,-6.144 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path838" />
+      <path
+          d="m 1150.5058,226.62033 q 0,3.84 -2.688,6.528 -2.496,2.688 -6.528,2.688 -3.84,0 -6.5281,-2.688 -2.4959,-2.688 -2.4959,-6.528 v -83.136 q 0,-3.84 2.4959,-6.528 2.6881,-2.688 6.5281,-2.688 4.032,0 6.528,2.688 2.688,2.688 2.688,6.528 z m -9.216,-105.024 q -5.568,0 -8.064,-1.92 -2.304,-2.112 -2.304,-6.528 v -3.072 q 0,-4.608 2.496,-6.528 2.688,-1.92 8.064,-1.92 5.3759,0 7.68,2.112 2.496,1.92 2.496,6.336 v 3.072 q 0,4.608 -2.496,6.528 -2.496,1.92 -7.872,1.92 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path840" />
+      <path
+          d="m 1220.5018,132.92433 q 15.168,0 25.152,4.8 10.1759,4.8 10.1759,12.288 0,3.264 -2.1119,5.952 -2.112,2.496 -5.376,2.496 -2.496,0 -4.0321,-0.768 -1.3439,-0.768 -3.8399,-2.496 -1.152,-1.152 -3.648,-2.688 -2.304,-1.152 -6.528,-1.92 -4.224,-0.768 -7.68,-0.768 -9.984,0 -17.664,4.608 -7.68,4.608 -11.904,12.864 -4.224,8.064 -4.224,18.048 0,10.176 4.032,18.24 4.224,8.064 11.712,12.672 7.488,4.608 17.088,4.608 9.984,0 16.128,-3.072 1.344,-0.768 3.648,-2.496 1.92,-1.536 3.264,-2.304 1.536,-0.768 3.648,-0.768 3.84,0 5.952,2.496 2.304,2.304 2.304,6.144 0,4.032 -5.184,8.064 -4.992,3.84 -13.632,6.336 -8.448,2.496 -18.24,2.496 -14.592,0 -25.728,-6.72 -11.136,-6.912 -17.28,-18.816 -5.952,-12.096 -5.952,-26.88 0,-14.784 6.336,-26.688 6.336,-12.096 17.664,-18.816 11.328,-6.912 25.92,-6.912 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path842" />
+      <path
+          d="m 1363.6708,181.69233 q -0.192,3.456 -2.88,5.952 -2.688,2.304 -6.3361,2.304 h -67.5839 q 1.344,14.016 10.56,22.464 9.4079,8.448 22.848,8.448 9.216,0 14.976,-2.688 5.76,-2.688 10.176,-6.912 2.88,-1.728 5.568,-1.728 3.264,0 5.376,2.304 2.304,2.304 2.304,5.376 0,4.032 -3.8401,7.296 -5.5679,5.568 -14.7839,9.408 -9.2161,3.84 -18.816,3.84 -15.552,0 -27.456,-6.528 -11.712,-6.528 -18.24,-18.24 -6.336,-11.712 -6.336,-26.496 0,-16.128 6.528,-28.224 6.72,-12.288 17.472,-18.816 10.944,-6.528 23.424,-6.528 12.288,0 23.04,6.336 10.752,6.336 17.28,17.472 6.528,11.136 6.72,24.96 z m -47.04,-31.872 q -10.752,0 -18.624,6.144 -7.872,5.952 -10.368,18.624 h 56.64 v -1.536 q -0.96,-10.176 -9.216,-16.704 -8.064,-6.528 -18.432,-6.528 z"
+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:192px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Medium'"
+          id="path844" />
+    </g>
+    <g aria-label="POWERED BY" transform="matrix(0.93750004,0,0,0.93750004,231.12524,266.21949)"
+        style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        id="flowRoot825-6">
+      <path
+          d="m 331.92042,135.56966 q 5.44,0 10.34666,3.30667 4.90667,3.2 7.89334,8.74667 2.98666,5.44 2.98666,11.94666 0,6.4 -2.98666,11.94667 -2.98667,5.54666 -7.89334,8.85333 -4.90666,3.2 -10.34666,3.2 h -18.56 v 20.16 q 0,2.88 -1.70667,4.69333 -1.70667,1.81334 -4.48,1.81334 -2.66667,0 -4.37333,-1.81334 -1.70667,-1.92 -1.70667,-4.69333 v -61.65333 q 0,-2.77333 1.81333,-4.58667 1.92,-1.92 4.69334,-1.92 z m 0,35.84 q 2.02666,0 3.94666,-1.70667 2.02667,-1.70666 3.2,-4.37333 1.28,-2.77333 1.28,-5.76 0,-2.98667 -1.28,-5.65333 -1.17333,-2.77333 -3.2,-4.37333 -1.92,-1.70667 -3.94666,-1.70667 h -18.56 v 23.57333 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path883" />
+      <path
+          d="m 434.16208,172.90299 q 0,10.56 -4.69333,19.41334 -4.69333,8.74666 -13.01333,13.86666 -8.21334,5.12 -18.56,5.12 -10.34667,0 -18.66667,-5.12 -8.21333,-5.12 -12.90667,-13.86666 -4.58666,-8.85334 -4.58666,-19.41334 0,-10.56 4.58666,-19.30666 4.69334,-8.85333 12.90667,-13.97333 8.32,-5.12 18.66667,-5.12 10.34666,0 18.56,5.12 8.32,5.12 13.01333,13.97333 4.69333,8.74666 4.69333,19.30666 z m -13.86666,0 q 0,-7.14666 -2.88,-12.90666 -2.88,-5.86667 -8,-9.28 -5.12,-3.41333 -11.52,-3.41333 -6.50667,0 -11.62667,3.41333 -5.01333,3.30666 -7.89333,9.17333 -2.77334,5.86667 -2.77334,13.01333 0,7.14667 2.77334,13.01334 2.88,5.86666 7.89333,9.28 5.12,3.30666 11.62667,3.30666 6.4,0 11.52,-3.41333 5.12,-3.41333 8,-9.17333 2.88,-5.86667 2.88,-13.01334 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path885" />
+      <path
+          d="m 529.83207,135.24966 q 2.56,0 4.69333,2.02667 2.24,1.92 2.24,4.90667 0,0.96 -0.32,2.13333 l -21.01333,61.86666 q -0.64,1.81334 -2.24,2.88 -1.6,1.06667 -3.52,1.17334 -1.92,0 -3.62667,-1.06667 -1.70666,-1.06667 -2.66666,-3.09333 l -15.14667,-34.45334 -15.25333,34.45334 q -0.96,2.02666 -2.66667,3.09333 -1.70666,1.06667 -3.62666,1.06667 -1.92,-0.10667 -3.52,-1.17334 -1.6,-1.06666 -2.24,-2.88 l -21.01334,-61.86666 q -0.32,-1.17333 -0.32,-2.13333 0,-2.98667 2.13334,-4.90667 2.24,-2.02667 4.90666,-2.02667 2.13334,0 3.84,1.17334 1.70667,1.06666 2.34667,2.98666 l 15.89333,48.21333 13.86667,-33.28 q 0.85333,-1.91999 2.45333,-2.98666 1.6,-1.17333 3.62667,-1.06667 2.02667,-0.10666 3.52,1.06667 1.6,1.06667 2.45333,2.98666 l 13.12,32.96 15.78667,-47.89333 q 0.64,-1.92 2.34666,-2.98666 1.81334,-1.17334 3.94667,-1.17334 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path887" />
+      <path
+          d="m 588.75041,197.96966 q 2.77333,0 4.58666,1.92 1.92,1.81333 1.92,4.26667 0,2.66666 -1.92,4.37333 -1.81333,1.70667 -4.58666,1.70667 h -35.73334 q -2.77333,0 -4.69333,-1.81334 -1.81333,-1.92 -1.81333,-4.69333 v -61.65333 q 0,-2.77333 1.81333,-4.58667 1.92,-1.92 4.69333,-1.92 h 35.73334 q 2.77333,0 4.58666,1.81334 1.92,1.70666 1.92,4.48 0,2.66666 -1.81333,4.37333 -1.81333,1.6 -4.69333,1.6 h -28.90667 v 18.13333 h 24.10667 q 2.77333,0 4.58666,1.81333 1.92,1.70667 1.92,4.48 0,2.66667 -1.81333,4.37334 -1.81333,1.6 -4.69333,1.6 h -24.10667 v 19.73333 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path889" />
+      <path
+          d="m 666.11206,199.78299 q 1.38667,0.85334 2.13333,2.24 0.85334,1.38667 0.85334,2.88 0,1.92 -1.28,3.52 -1.6,1.92 -4.90667,1.92 -2.56,0 -4.69333,-1.17333 -7.68,-4.37333 -7.68,-17.81333 0,-3.84 -2.56,-6.08 -2.45333,-2.24 -7.14667,-2.24 H 620.8854 v 20.69333 q 0,2.88 -1.6,4.69333 -1.49334,1.81334 -4.05334,1.81334 -3.09333,0 -5.44,-1.81334 -2.24,-1.92 -2.24,-4.69333 v -61.65333 q 0,-2.77333 1.81334,-4.58667 1.92,-1.92 4.69333,-1.92 h 30.72 q 5.54667,0 10.45333,2.98667 4.90667,2.98667 7.78667,8.21333 2.98666,5.22667 2.98666,11.73333 0,5.33334 -2.88,10.45334 -2.88,5.01333 -7.46666,8 6.72,4.69333 7.36,12.58666 0.32,1.70667 0.32,3.30667 0.42666,3.30667 0.85333,4.8 0.42667,1.38667 1.92,2.13333 z M 644.2454,172.04966 q 1.92,0 3.73333,-1.81333 1.81333,-1.81334 2.98667,-4.8 1.17333,-3.09334 1.17333,-6.61334 0,-2.98666 -1.17333,-5.43999 -1.17334,-2.56 -2.98667,-4.05334 -1.81333,-1.49333 -3.73333,-1.49333 h -23.36 v 24.21333 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path891" />
+      <path
+          d="m 723.12541,197.96966 q 2.77333,0 4.58666,1.92 1.92,1.81333 1.92,4.26667 0,2.66666 -1.92,4.37333 -1.81333,1.70667 -4.58666,1.70667 h -35.73334 q -2.77333,0 -4.69333,-1.81334 -1.81333,-1.92 -1.81333,-4.69333 v -61.65333 q 0,-2.77333 1.81333,-4.58667 1.92,-1.92 4.69333,-1.92 h 35.73334 q 2.77333,0 4.58666,1.81334 1.92,1.70666 1.92,4.48 0,2.66666 -1.81333,4.37333 -1.81333,1.6 -4.69333,1.6 h -28.90667 v 18.13333 h 24.10667 q 2.77333,0 4.58666,1.81333 1.92,1.70667 1.92,4.48 0,2.66667 -1.81333,4.37334 -1.81333,1.6 -4.69333,1.6 h -24.10667 v 19.73333 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path893" />
+      <path
+          d="m 773.92706,135.56966 q 10.02667,0 17.17333,5.01334 7.25334,4.90666 10.98667,13.43999 3.84,8.42667 3.84,18.88 0,10.45334 -3.84,18.98667 -3.73333,8.42667 -10.98667,13.44 -7.14666,4.90667 -17.17333,4.90667 h -25.49333 q -2.77333,0 -4.69333,-1.81334 -1.81334,-1.92 -1.81334,-4.69333 v -61.65333 q 0,-2.77333 1.81334,-4.58667 1.92,-1.92 4.69333,-1.92 z m -1.06666,62.4 q 9.6,0 14.4,-7.04 4.79999,-7.14667 4.79999,-18.02667 0,-10.88 -4.90666,-17.92 -4.8,-7.14666 -14.29333,-7.14666 h -17.6 v 50.13333 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path895" />
+      <path
+          d="m 892.76875,168.84966 q 5.65333,2.24 9.17333,6.82667 3.62667,4.58666 3.62667,11.84 0,12.69333 -7.25333,17.70666 -7.25334,5.01334 -17.28,5.01334 h -26.56 q -2.77334,0 -4.69334,-1.81334 -1.81333,-1.92 -1.81333,-4.69333 v -61.65333 q 0,-2.77333 1.81333,-4.58667 1.92,-1.92 4.69334,-1.92 h 26.88 q 20.26666,0 20.26666,18.98667 0,4.8 -2.34666,8.53333 -2.24,3.62667 -6.50667,5.76 z m -5.01333,-11.94667 q 0,-4.37333 -2.24,-6.50666 -2.13334,-2.24 -6.08,-2.24 h -17.6 v 16.64 h 17.92 q 3.2,0 5.54666,-2.13334 2.45334,-2.13333 2.45334,-5.76 z m -6.72,41.06667 q 5.01333,0 7.78666,-2.66667 2.88,-2.66666 2.88,-7.78666 0,-6.29334 -3.30666,-8.21334 -3.30667,-1.92 -8.10667,-1.92 h -18.45333 v 20.58667 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path897" />
+      <path
+          d="m 969.23371,141.863 q 0,2.13333 -1.17334,3.94666 l -22.29333,31.89333 v 26.02667 q 0,2.77333 -1.81333,4.69333 -1.81333,1.81334 -4.37333,1.81334 -2.66667,0 -4.58667,-1.81334 -1.81333,-1.92 -1.81333,-4.69333 v -27.52 l -22.18667,-29.44 q -1.92,-2.56 -1.92,-5.01333 0,-2.77333 2.13333,-4.58667 2.24,-1.92 4.69334,-1.92 2.98666,0 5.22666,2.98667 l 18.77334,25.92 17.59999,-25.70667 q 2.24,-3.2 5.33334,-3.2 2.56,0 4.48,1.92 1.92,1.92 1.92,4.69334 z"
+          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:106.66666412px;font-family:Quicksand;-inkscape-font-specification:'Quicksand Bold'"
+          id="path899" />
+    </g>
+  </g>
+  <g inkscape:groupmode="layer" id="layer2" inkscape:label="Layer 3"
+      transform="translate(-27.815468,21.198496)" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"
+      transform="translate(-220.97188,-392.31605)">
+    <path inkscape:connector-curvature="0" style="fill:#000016;fill-opacity:1"
+        d="m 467.91504,565.96351 -11.49602,-6.03301 10.02002,-5.23601 c 3.41201,-1.785 3.41501,-4.70701 0.01,-6.49601 l -10.76202,-5.64801 10.75602,-5.62101 c 3.41201,-1.78501 3.41501,-4.70701 0.01,-6.49602 L 380.3709,485.25335 c -3.40901,-1.789 -8.99702,-1.809 -12.41802,-0.041 L 223.53563,559.8065 c -3.422,1.766 -3.418,4.65001 0.01,6.41001 l 11.01802,5.66202 -11.02302,5.69301 c -3.422,1.766 -3.418,4.65001 0.01,6.41001 l 11.75602,6.04101 -10.28901,5.31401 c -3.42201,1.76801 -3.41801,4.65201 0.01,6.41201 l 88.01014,45.22309 c 3.42601,1.76001 9.02002,1.74001 12.43002,-0.043 l 142.46424,-74.46914 c 3.40901,-1.78301 3.41201,-4.70701 0,-6.49602 z m -93.03415,-58.62311 -21.59604,24.90005 c -1.08,1.246 -0.764,2.883 0.703,3.637 l 17.18203,8.82802 c 1.467,0.754 1.469,1.99201 0,2.74801 l -53.92109,27.85005 c -1.467,0.758 -1.781,0.357 -0.699,-0.889 l 21.59404,-24.90005 c 1.082,-1.246 0.766,-2.885 -0.70101,-3.63901 l -17.18202,-8.82801 c -1.46701,-0.75401 -1.46901,-1.99001 0,-2.74801 l 53.92209,-27.85005 c 1.465,-0.75601 1.78,-0.35501 0.699,0.891 z"
+        id="path11" />
+  </g>
+</svg>

app/build.gradle

@@ -1,26 +1,35 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 18
-        versionName "0.2.0"
+        targetSdkVersion 30
+        versionCode 47
+        versionName "0.7.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
-        release
+        release {
+            def isRunningOnTravis = System.getenv("CI") == "true"
+            if (isRunningOnTravis) {
+                // configure keystore
+                storeFile = file("../_ci/keystore.jks")
+                storePassword = System.getenv("keystore_password")
+                keyAlias = System.getenv("keystore_alias")
+                keyPassword = System.getenv("keystore_alias_password")
+            }
+        }
     }
 
     buildTypes {
@@ -35,13 +44,15 @@ android {
         }
     }
 
-    def isRunningOnTravis = System.getenv("CI") == "true"
-    if (isRunningOnTravis) {
-        // configure keystore
-        signingConfigs.release.storeFile = file("../_ci/keystore.jks")
-        signingConfigs.release.storePassword = System.getenv("keystore_password")
-        signingConfigs.release.keyAlias = System.getenv("keystore_alias")
-        signingConfigs.release.keyPassword = System.getenv("keystore_alias_password")
+    flavorDimensions "dependencies"
+    productFlavors {
+        foss {
+            dimension "dependencies"
+        }
+        google {
+            dimension "dependencies"
+            versionNameSuffix "-google"
+        }
     }
 
     compileOptions {
@@ -56,95 +67,138 @@ android {
 
     buildFeatures {
         dataBinding = true
+        viewBinding true
     }
 
     // add API keys from environment variable if not set in apikeys.xml
     applicationVariants.all { variant ->
         ext.env = System.getenv()
-        def goingelectricKey = env.GOINGELECTRIC_API_KEY
+        def goingelectricKey = env.GOINGELECTRIC_API_KEY ?: project.findProperty("GOINGELECTRIC_API_KEY")
         if (goingelectricKey != null) {
             variant.resValue "string", "goingelectric_key", goingelectricKey
         }
-        def googleMapsKey = env.GOOGLE_MAPS_API_KEY
-        if (googleMapsKey != null) {
+        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) {
+            variant.resValue "string", "mapbox_key", mapboxKey
+        }
+        def chargepriceKey = env.CHARGEPRICE_API_KEY ?: project.findProperty("CHARGEPRICE_API_KEY")
+        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
+            chargepriceKey = decode(project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (chargepriceKey != null) {
+            variant.resValue "string", "chargeprice_key", chargepriceKey
+        }
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation "androidx.activity:activity-ktx:1.2.3"
+    implementation "androidx.fragment:fragment-ktx:1.3.4"
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.2.0-beta01'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
-    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.7.2'
+    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.picasso:picasso:2.71828'
-    implementation 'com.github.MikeOrtiz:TouchImageView:2.3.3'
+    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.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 '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'
+
+    // Android Auto
+    googleImplementation 'androidx.car.app:app:1.0.0'
+
+    // AnyMaps
+    def anyMapsVersion = '1f050d860f'
+    implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
+    googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
+    implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
 
     // Google Maps v3 Beta
-    implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
-    implementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
-    implementation 'com.google.maps.android:android-maps-utils-v3:1.3.3'
-    implementation 'com.android.volley:volley:1.1.1'
-    implementation 'com.google.android.gms:play-services-base:17.3.0'
-    implementation 'com.google.android.gms:play-services-basement:17.3.0'
-    implementation 'com.google.android.gms:play-services-gcm:17.0.0'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.android.gms:play-services-tasks:17.1.0'
-    implementation 'com.google.auto.value:auto-value-annotations:1.6.3'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.android.datatransport:transport-runtime:2.2.3'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    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.2.0'
+    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'
+
+    // Mapbox places (autocomplete)
+    // forked this library and included through JitPack to fix https://github.com/mapbox/mapbox-plugins-android/issues/1011
+    implementation('com.github.johan12345.mapbox-plugins-android:mapbox-android-plugin-places-v9:922bf877f6') {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+    }
 
     // navigation library
-    def nav_version = "2.3.0-rc01"
     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.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.2.5"
+    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.0"
-    implementation "com.android.billingclient:billing:$billing_version"
-    implementation "com.android.billingclient:billing-ktx:$billing_version"
+    def billing_version = "4.0.0"
+    googleImplementation "com.android.billingclient:billing:$billing_version"
+    googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
 
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.squareup.okhttp3:mockwebserver:3.14.7"
+    testImplementation 'junit:junit:4.13'
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
+private static String decode(String s, String key) {
+    return new String(xorWithKey(s.decodeBase64(), key.getBytes()), "UTF-8");
+}
+
+private static byte[] xorWithKey(byte[] a, byte[] key) {
+    byte[] out = new byte[a.length];
+    for (int i = 0; i < a.length; i++) {
+        out[i] = (byte) (a[i] ^ key[i%key.length]);
+    }
+    return out;
 }

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">EV Map (debug)</string>
+    <string name="app_name">EVMap (debug)</string>
 </resources>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">EV Map (debug)</string>
+    <string name="app_name">EVMap (debug)</string>
 </resources>

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

@@ -0,0 +1,12 @@
+package net.vonforst.evmap
+
+import android.app.Activity
+import android.content.Context
+
+fun init(context: Context) {
+
+}
+
+fun checkPlayServices(activity: Activity): Boolean {
+    return true
+}

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

@@ -0,0 +1,49 @@
+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())

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

@@ -0,0 +1,40 @@
+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.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.setupWithNavController
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.FragmentDonateBinding
+
+class DonateFragment : Fragment() {
+    private lateinit var binding: FragmentDonateBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = FragmentDonateBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    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))
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+<?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:id="@+id/linearLayout2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <Button
+        android:id="@+id/btnDonate"
+        style="@style/Widget.MaterialComponents.Button.Icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/donate_paypal"
+        app:icon="@drawable/ic_paypal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView20" />
+
+    <TextView
+        android:id="@+id/textView20"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/donations_info"
+        app:layout_constraintBottom_toTopOf="@+id/btnDonate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
+        app:layout_constraintVertical_chainStyle="packed" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <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 name="donate_paypal">Mit PayPal spenden</string>
+</resources>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_map_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
+    <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>
+    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
+</resources>

app/src/google/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="net.vonforst.evmap">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
+
+    <uses-sdk tools:overrideLibrary="androidx.car.app" />
+
+    <application>
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
+
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+
+        <meta-data
+            android:name="androidx.car.app.theme"
+            android:resource="@style/CarAppTheme" />
+
+        <service
+            android:name=".auto.CarAppService"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true">
+            <intent-filter>
+                <action
+                    android:name="androidx.car.app.CarAppService"
+                    android:category="androidx.car.app.category.CHARGING" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".auto.CarLocationService"
+            android:foregroundServiceType="location"
+            android:enabled="true" />
+
+        <activity android:name=".auto.PermissionActivity" />
+    </application>
+</manifest>

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

@@ -0,0 +1,27 @@
+package net.vonforst.evmap
+
+import android.app.Activity
+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.libraries.places.api.Places
+
+fun init(context: Context) {
+    Places.initialize(context, context.getString(R.string.google_maps_key));
+}
+
+fun checkPlayServices(activity: Activity): Boolean {
+    val request = 9000
+    val apiAvailability = GoogleApiAvailability.getInstance()
+    val resultCode = apiAvailability.isGooglePlayServicesAvailable(activity)
+    if (resultCode != ConnectionResult.SUCCESS) {
+        if (apiAvailability.isUserResolvableError(resultCode)) {
+            apiAvailability.getErrorDialog(activity, resultCode, request)?.show()
+        } else {
+            Log.d("EVMap", "This device is not supported.")
+        }
+        return false
+    }
+    return true
+}

app/src/google/java/net/vonforst/evmap/adapter/DonationAdapter.kt

@@ -0,0 +1,8 @@
+package net.vonforst.evmap.adapter
+
+import net.vonforst.evmap.R
+import net.vonforst.evmap.viewmodel.DonationItem
+
+class DonationAdapter() : DataBindingAdapter<DonationItem>() {
+    override fun getItemViewType(position: Int): Int = R.layout.item_donation
+}

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

@@ -0,0 +1,666 @@
+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.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
+
+
+interface LocationAwareScreen {
+    fun updateLocation(location: Location)
+}
+
+class CarAppService : androidx.car.app.CarAppService() {
+    override fun createHostValidator(): HostValidator {
+        return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
+            HostValidator.ALLOW_ALL_HOSTS_VALIDATOR
+        } else {
+            HostValidator.Builder(applicationContext)
+                .addAllowedHosts(androidx.car.app.R.array.hosts_allowlist_sample)
+                .build()
+        }
+    }
+
+    override fun onCreateSession(): Session {
+        return EVMapSession(this)
+    }
+}
+
+class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
+    var mapScreen: LocationAwareScreen? = null
+        set(value) {
+            field = value
+            location?.let { value?.updateLocation(it) }
+        }
+    private var location: Location? = null
+    private var locationService: CarLocationService? = null
+
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
+            val binder: CarLocationService.LocalBinder = ibinder as CarLocationService.LocalBinder
+            locationService = binder.service
+            locationService?.requestLocationUpdates()
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+            locationService = null
+        }
+    }
+
+    init {
+        lifecycle.addObserver(this)
+    }
+
+    override fun onCreateScreen(intent: Intent): Screen {
+        return if (locationPermissionGranted()) {
+            WelcomeScreen(carContext, this)
+        } else {
+            PermissionScreen(carContext, this)
+        }
+    }
+
+    private fun locationPermissionGranted() =
+        ContextCompat.checkSelfPermission(
+            carContext,
+            Manifest.permission.ACCESS_FINE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+
+    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
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    fun bindLocationService() {
+        if (!locationPermissionGranted()) return
+        cas.bindService(
+            Intent(cas, CarLocationService::class.java),
+            serviceConnection,
+            Context.BIND_AUTO_CREATE
+        )
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    private fun unbindLocationService() {
+        locationService?.let { service ->
+            service.removeLocationUpdates()
+            cas.unbindService(serviceConnection)
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun registerBroadcastReceiver() {
+        LocalBroadcastManager.getInstance(cas).registerReceiver(
+            locationReceiver,
+            IntentFilter(CarLocationService.ACTION_BROADCAST)
+        );
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    private fun unregisterBroadcastReceiver() {
+        LocalBroadcastManager.getInstance(cas).unregisterReceiver(locationReceiver)
+    }
+}
+
+/**
+ * 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)
+                            }
+                        }.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())
+                    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/CarLocationService.kt

@@ -0,0 +1,163 @@
+package net.vonforst.evmap.auto
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.Service
+import android.content.Intent
+import android.location.Location
+import android.os.*
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.google.android.gms.location.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
+
+
+class CarLocationService : Service() {
+    private lateinit var serviceHandler: Handler
+    private lateinit var locationRequest: LocationRequest
+    private lateinit var notificationManager: NotificationManager
+    private lateinit var locationCallback: LocationCallback
+    private lateinit var fusedLocationClient: FusedLocationProviderClient
+    private val binder: IBinder = LocalBinder(this)
+    private var location: Location? = null
+
+    private val UPDATE_INTERVAL_IN_MILLISECONDS = 10000L
+    private val FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS = UPDATE_INTERVAL_IN_MILLISECONDS / 2
+
+    private val CHANNEL_ID = "car_location"
+    private val NOTIFICATION_ID = 1000
+    private val TAG = "CarLocationService"
+
+    companion object {
+        const val ACTION_BROADCAST: String = BuildConfig.APPLICATION_ID + ".car_location_broadcast"
+        const val EXTRA_LOCATION: String = BuildConfig.APPLICATION_ID + ".location"
+    }
+
+    override fun onCreate() {
+        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
+        locationCallback = object : LocationCallback() {
+            override fun onLocationResult(locationResult: LocationResult) {
+                super.onLocationResult(locationResult)
+                onNewLocation(locationResult.lastLocation)
+            }
+        }
+        createLocationRequest()
+        getLastLocation()
+        val handlerThread = HandlerThread(TAG)
+        handlerThread.start()
+        serviceHandler = Handler(handlerThread.looper)
+        notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
+        // Android O requires a Notification Channel.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name: CharSequence = getString(R.string.app_name)
+            // Create the channel for the notification
+            val mChannel =
+                NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT)
+
+            // Set the Notification Channel for the Notification Manager.
+            notificationManager.createNotificationChannel(mChannel)
+        }
+
+        startForeground(NOTIFICATION_ID, getNotification())
+    }
+
+    /**
+     * Returns the [NotificationCompat] used as part of the foreground service.
+     */
+    private fun getNotification(): Notification {
+        val builder: NotificationCompat.Builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentText(getString(R.string.auto_location_service))
+            .setContentTitle(getString(R.string.app_name))
+            .setOngoing(true)
+            .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setTicker(getString(R.string.auto_location_service))
+            .setWhen(System.currentTimeMillis())
+
+        return builder.build()
+    }
+
+    override fun onBind(intent: Intent?): IBinder {
+        return binder
+    }
+
+    private fun createLocationRequest() {
+        locationRequest = LocationRequest()
+        locationRequest.interval = UPDATE_INTERVAL_IN_MILLISECONDS
+        locationRequest.fastestInterval = FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS
+        locationRequest.priority = LocationRequest.PRIORITY_HIGH_ACCURACY
+    }
+
+    private fun onNewLocation(location: Location) {
+        Log.i(TAG, "New location: $location")
+        this.location = location
+
+        // Notify anyone listening for broadcasts about the new location.
+        val intent = Intent(ACTION_BROADCAST)
+        intent.putExtra(EXTRA_LOCATION, location)
+        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
+    }
+
+    private fun getLastLocation() {
+        try {
+            fusedLocationClient.lastLocation
+                .addOnCompleteListener { task ->
+                    if (task.isSuccessful && task.result != null) {
+                        location = task.result
+                    } else {
+                        Log.w(TAG, "Failed to get location.")
+                    }
+                }
+        } catch (unlikely: SecurityException) {
+            Log.e(TAG, "Lost location permission.$unlikely")
+        }
+    }
+
+    /**
+     * Makes a request for location updates. Note that in this sample we merely log the
+     * [SecurityException].
+     */
+    fun requestLocationUpdates() {
+        Log.i(TAG, "Requesting location updates")
+        startService(Intent(applicationContext, CarLocationService::class.java))
+        try {
+            fusedLocationClient.requestLocationUpdates(
+                locationRequest,
+                locationCallback, Looper.myLooper()
+            )
+        } catch (unlikely: SecurityException) {
+            Log.e(TAG, "Lost location permission. Could not request updates. $unlikely")
+        }
+    }
+
+    /**
+     * Removes location updates. Note that in this sample we merely log the
+     * [SecurityException].
+     */
+    fun removeLocationUpdates() {
+        Log.i(TAG, "Removing location updates")
+        try {
+            fusedLocationClient.removeLocationUpdates(locationCallback)
+            stopSelf()
+        } catch (unlikely: SecurityException) {
+            Log.e(TAG, "Lost location permission. Could not remove updates. $unlikely")
+        }
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        Log.i(TAG, "Service started")
+        // Tells the system to not try to recreate the service after it has been killed.
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        serviceHandler.removeCallbacksAndMessages(null)
+    }
+
+    class LocalBinder(val service: CarLocationService) : Binder()
+}

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

@@ -0,0 +1,72 @@
+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/autocomplete/Autocomplete.kt

@@ -0,0 +1,33 @@
+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
+
+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))
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_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 30% 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="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>
+</resources>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="CarAppTheme">
+        <item name="carColorPrimary">@color/colorPrimary</item>
+        <item name="carColorPrimaryDark">@color/colorPrimaryVariant</item>
+        <item name="carColorSecondary">@color/colorSecondary</item>
+        <item name="carColorSecondaryDark">@color/colorSecondaryVariant</item>
+    </style>
+</resources>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_map_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_map_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="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="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>
+</resources>

app/src/google/res/xml/automotive_app_desc.xml

@@ -0,0 +1,5 @@
+<automotiveApp xmlns:tools="http://schemas.android.com/tools">
+    <uses
+        name="template"
+        tools:ignore="InvalidUsesTagAttribute" />
+</automotiveApp>

app/src/main/AndroidManifest.xml

@@ -2,8 +2,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.vonforst.evmap">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="geo" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="google.navigation" />
+        </intent>
+    </queries>
+
     <application
         android:name=".EvMapApplication"
         android:allowBackup="true"
@@ -13,17 +25,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <!--
-             The API key for Google Maps-based APIs is defined as a string resource.
-             (See the file "res/values/apikeys.xml").
-             Note that the API key is linked to the encryption key used to sign the APK.
-             You need a different API key for each encryption key, including the release key that is used to
-             sign the APK for publishing.
-             You can define the keys for the debug and release targets in src/debug/ and src/release/.
-        -->
         <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="@string/google_maps_key" />
+            android:name="com.mapbox.ACCESS_TOKEN"
+            android:value="@string/mapbox_key" />
 
         <activity
             android:name=".MapsActivity"
@@ -34,7 +38,224 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="geo" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Deutschland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Oesterreich/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Schweiz/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Albanien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Andorra/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Aruba/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Belarus/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Belgien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Bosnien-und-Herzegowina/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Bulgarien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Daenemark/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Estland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Faeroeer/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Finnland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Frankreich/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Gibraltar/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Griechenland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Grossbritannien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Irland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Island/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Italien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Jordanien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Kasachstan/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Kroatien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Lettland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Liechtenstein/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Litauen/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Luxemburg/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Malta/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Marokko/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Mazedonien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Moldawien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Monaco/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Montenegro/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Niederlande/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Norwegen/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Polen/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Portugal/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Rumaenien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Russland/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/San-Marino/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Schweden/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Serbien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Slowakei/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Slowenien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Spanien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Tuerkei/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Tschechien/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/USA/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Ukraine/..*/..*/..*/"
+                    android:scheme="https" />
+                <data
+                    android:host="www.goingelectric.de"
+                    android:pathPattern="/stromtankstellen/Ungarn/..*/..*/..*/"
+                    android:scheme="https" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
+
     </application>
 
 </manifest>

app/src/main/java/com/google/maps/android/clustering/Cluster.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering;
+
+import com.car2go.maps.model.LatLng;
+
+import java.util.Collection;
+
+/**
+ * A collection of ClusterItems that are nearby each other.
+ */
+public interface Cluster<T extends ClusterItem> {
+    LatLng getPosition();
+
+    Collection<T> getItems();
+
+    int getSize();
+}

app/src/main/java/com/google/maps/android/clustering/ClusterItem.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.car2go.maps.model.LatLng;
+
+/**
+ * ClusterItem represents a marker on the map.
+ */
+public interface ClusterItem {
+
+    /**
+     * The position of this marker. This must always return the same value.
+     */
+    @NonNull
+    LatLng getPosition();
+
+    /**
+     * The title of this marker.
+     */
+    @Nullable
+    String getTitle();
+
+    /**
+     * The description of this marker.
+     */
+    @Nullable
+    String getSnippet();
+}

app/src/main/java/com/google/maps/android/clustering/algo/AbstractAlgorithm.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering.algo;
+
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * Base Algorithm class that implements lock/unlock functionality.
+ */
+public abstract class AbstractAlgorithm<T extends ClusterItem> implements Algorithm<T> {
+
+    private final ReadWriteLock mLock = new ReentrantReadWriteLock();
+
+    @Override
+    public void lock() {
+        mLock.writeLock().lock();
+    }
+
+    @Override
+    public void unlock() {
+        mLock.writeLock().unlock();
+    }
+}

app/src/main/java/com/google/maps/android/clustering/algo/Algorithm.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering.algo;
+
+import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * Logic for computing clusters
+ */
+public interface Algorithm<T extends ClusterItem> {
+
+    /**
+     * Adds an item to the algorithm
+     *
+     * @param item the item to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    boolean addItem(T item);
+
+    /**
+     * Adds a collection of items to the algorithm
+     *
+     * @param items the items to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    boolean addItems(Collection<T> items);
+
+    void clearItems();
+
+    /**
+     * Removes an item from the algorithm
+     *
+     * @param item the item to be removed
+     * @return true if this algorithm contained the specified element (or equivalently, if this
+     * algorithm changed as a result of the call).
+     */
+    boolean removeItem(T item);
+
+    /**
+     * Updates the provided item in the algorithm
+     *
+     * @param item the item to be updated
+     * @return true if the item existed in the algorithm and was updated, or false if the item did
+     * not exist in the algorithm and the algorithm contents remain unchanged.
+     */
+    boolean updateItem(T item);
+
+    /**
+     * Removes a collection of items from the algorithm
+     *
+     * @param items the items to be removed
+     * @return true if this algorithm contents changed as a result of the call
+     */
+    boolean removeItems(Collection<T> items);
+
+    Set<? extends Cluster<T>> getClusters(float zoom);
+
+    Collection<T> getItems();
+
+    void setMaxDistanceBetweenClusteredItems(int maxDistance);
+
+    int getMaxDistanceBetweenClusteredItems();
+
+    void lock();
+
+    void unlock();
+}

app/src/main/java/com/google/maps/android/clustering/algo/NonHierarchicalDistanceBasedAlgorithm.java

@@ -0,0 +1,314 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering.algo;
+
+import com.car2go.maps.model.LatLng;
+import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterItem;
+import com.google.maps.android.geometry.Bounds;
+import com.google.maps.android.geometry.Point;
+import com.google.maps.android.projection.SphericalMercatorProjection;
+import com.google.maps.android.quadtree.PointQuadTree;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A simple clustering algorithm with O(nlog n) performance. Resulting clusters are not
+ * hierarchical.
+ * <p/>
+ * High level algorithm:<br>
+ * 1. Iterate over items in the order they were added (candidate clusters).<br>
+ * 2. Create a cluster with the center of the item. <br>
+ * 3. Add all items that are within a certain distance to the cluster. <br>
+ * 4. Move any items out of an existing cluster if they are closer to another cluster. <br>
+ * 5. Remove those items from the list of candidate clusters.
+ * <p/>
+ * Clusters have the center of the first element (not the centroid of the items within it).
+ */
+public class NonHierarchicalDistanceBasedAlgorithm<T extends ClusterItem> extends AbstractAlgorithm<T> {
+    private static final int DEFAULT_MAX_DISTANCE_AT_ZOOM = 100; // essentially 100 dp.
+
+    private int mMaxDistance = DEFAULT_MAX_DISTANCE_AT_ZOOM;
+
+    /**
+     * Any modifications should be synchronized on mQuadTree.
+     */
+    private final Collection<QuadItem<T>> mItems = new LinkedHashSet<>();
+
+    /**
+     * Any modifications should be synchronized on mQuadTree.
+     */
+    private final PointQuadTree<QuadItem<T>> mQuadTree = new PointQuadTree<>(0, 1, 0, 1);
+
+    private static final SphericalMercatorProjection PROJECTION = new SphericalMercatorProjection(1);
+
+    /**
+     * Adds an item to the algorithm
+     *
+     * @param item the item to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    @Override
+    public boolean addItem(T item) {
+        boolean result;
+        final QuadItem<T> quadItem = new QuadItem<>(item);
+        synchronized (mQuadTree) {
+            result = mItems.add(quadItem);
+            if (result) {
+                mQuadTree.add(quadItem);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Adds a collection of items to the algorithm
+     *
+     * @param items the items to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    @Override
+    public boolean addItems(Collection<T> items) {
+        boolean result = false;
+        for (T item : items) {
+            boolean individualResult = addItem(item);
+            if (individualResult) {
+                result = true;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void clearItems() {
+        synchronized (mQuadTree) {
+            mItems.clear();
+            mQuadTree.clear();
+        }
+    }
+
+    /**
+     * Removes an item from the algorithm
+     *
+     * @param item the item to be removed
+     * @return true if this algorithm contained the specified element (or equivalently, if this
+     * algorithm changed as a result of the call).
+     */
+    @Override
+    public boolean removeItem(T item) {
+        boolean result;
+        // QuadItem delegates hashcode() and equals() to its item so,
+        //   removing any QuadItem to that item will remove the item
+        final QuadItem<T> quadItem = new QuadItem<>(item);
+        synchronized (mQuadTree) {
+            result = mItems.remove(quadItem);
+            if (result) {
+                mQuadTree.remove(quadItem);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Removes a collection of items from the algorithm
+     *
+     * @param items the items to be removed
+     * @return true if this algorithm contents changed as a result of the call
+     */
+    @Override
+    public boolean removeItems(Collection<T> items) {
+        boolean result = false;
+        synchronized (mQuadTree) {
+            for (T item : items) {
+                // QuadItem delegates hashcode() and equals() to its item so,
+                //   removing any QuadItem to that item will remove the item
+                final QuadItem<T> quadItem = new QuadItem<>(item);
+                boolean individualResult = mItems.remove(quadItem);
+                if (individualResult) {
+                    mQuadTree.remove(quadItem);
+                    result = true;
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Updates the provided item in the algorithm
+     *
+     * @param item the item to be updated
+     * @return true if the item existed in the algorithm and was updated, or false if the item did
+     * not exist in the algorithm and the algorithm contents remain unchanged.
+     */
+    @Override
+    public boolean updateItem(T item) {
+        // TODO - Can this be optimized to update the item in-place if the location hasn't changed?
+        boolean result;
+        synchronized (mQuadTree) {
+            result = removeItem(item);
+            if (result) {
+                // Only add the item if it was removed (to help prevent accidental duplicates on map)
+                result = addItem(item);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public Set<? extends Cluster<T>> getClusters(float zoom) {
+        final int discreteZoom = (int) zoom;
+
+        final double zoomSpecificSpan = mMaxDistance / Math.pow(2, discreteZoom) / 256;
+
+        final Set<QuadItem<T>> visitedCandidates = new HashSet<>();
+        final Set<Cluster<T>> results = new HashSet<>();
+        final Map<QuadItem<T>, Double> distanceToCluster = new HashMap<>();
+        final Map<QuadItem<T>, StaticCluster<T>> itemToCluster = new HashMap<>();
+
+        synchronized (mQuadTree) {
+            for (QuadItem<T> candidate : getClusteringItems(mQuadTree, zoom)) {
+                if (visitedCandidates.contains(candidate)) {
+                    // Candidate is already part of another cluster.
+                    continue;
+                }
+
+                Bounds searchBounds = createBoundsFromSpan(candidate.getPoint(), zoomSpecificSpan);
+                Collection<QuadItem<T>> clusterItems;
+                clusterItems = mQuadTree.search(searchBounds);
+                if (clusterItems.size() == 1) {
+                    // Only the current marker is in range. Just add the single item to the results.
+                    results.add(candidate);
+                    visitedCandidates.add(candidate);
+                    distanceToCluster.put(candidate, 0d);
+                    continue;
+                }
+                StaticCluster<T> cluster = new StaticCluster<>(candidate.mClusterItem.getPosition());
+                results.add(cluster);
+
+                for (QuadItem<T> clusterItem : clusterItems) {
+                    Double existingDistance = distanceToCluster.get(clusterItem);
+                    double distance = distanceSquared(clusterItem.getPoint(), candidate.getPoint());
+                    if (existingDistance != null) {
+                        // Item already belongs to another cluster. Check if it's closer to this cluster.
+                        if (existingDistance < distance) {
+                            continue;
+                        }
+                        // Move item to the closer cluster.
+                        itemToCluster.get(clusterItem).remove(clusterItem.mClusterItem);
+                    }
+                    distanceToCluster.put(clusterItem, distance);
+                    cluster.add(clusterItem.mClusterItem);
+                    itemToCluster.put(clusterItem, cluster);
+                }
+                visitedCandidates.addAll(clusterItems);
+            }
+        }
+        return results;
+    }
+
+    protected Collection<QuadItem<T>> getClusteringItems(PointQuadTree<QuadItem<T>> quadTree, float zoom) {
+        return mItems;
+    }
+
+    @Override
+    public Collection<T> getItems() {
+        final Set<T> items = new LinkedHashSet<>();
+        synchronized (mQuadTree) {
+            for (QuadItem<T> quadItem : mItems) {
+                items.add(quadItem.mClusterItem);
+            }
+        }
+        return items;
+    }
+
+    @Override
+    public void setMaxDistanceBetweenClusteredItems(int maxDistance) {
+        mMaxDistance = maxDistance;
+    }
+
+    @Override
+    public int getMaxDistanceBetweenClusteredItems() {
+        return mMaxDistance;
+    }
+
+    private double distanceSquared(Point a, Point b) {
+        return (a.x - b.x) * (a.x - b.x) + (a.y - b.y) * (a.y - b.y);
+    }
+
+    private Bounds createBoundsFromSpan(Point p, double span) {
+        // TODO: Use a span that takes into account the visual size of the marker, not just its
+        // LatLng.
+        double halfSpan = span / 2;
+        return new Bounds(
+                p.x - halfSpan, p.x + halfSpan,
+                p.y - halfSpan, p.y + halfSpan);
+    }
+
+    protected static class QuadItem<T extends ClusterItem> implements PointQuadTree.Item, Cluster<T> {
+        private final T mClusterItem;
+        private final Point mPoint;
+        private final LatLng mPosition;
+        private Set<T> singletonSet;
+
+        private QuadItem(T item) {
+            mClusterItem = item;
+            mPosition = item.getPosition();
+            mPoint = PROJECTION.toPoint(mPosition);
+            singletonSet = Collections.singleton(mClusterItem);
+        }
+
+        @Override
+        public Point getPoint() {
+            return mPoint;
+        }
+
+        @Override
+        public LatLng getPosition() {
+            return mPosition;
+        }
+
+        @Override
+        public Set<T> getItems() {
+            return singletonSet;
+        }
+
+        @Override
+        public int getSize() {
+            return 1;
+        }
+
+        @Override
+        public int hashCode() {
+            return mClusterItem.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof QuadItem<?>)) {
+                return false;
+            }
+
+            return ((QuadItem<?>) other).mClusterItem.equals(mClusterItem);
+        }
+    }
+}

app/src/main/java/com/google/maps/android/clustering/algo/StaticCluster.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.clustering.algo;
+
+import com.car2go.maps.model.LatLng;
+import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * A cluster whose center is determined upon creation.
+ */
+public class StaticCluster<T extends ClusterItem> implements Cluster<T> {
+    private final LatLng mCenter;
+    private final List<T> mItems = new ArrayList<T>();
+
+    public StaticCluster(LatLng center) {
+        mCenter = center;
+    }
+
+    public boolean add(T t) {
+        return mItems.add(t);
+    }
+
+    @Override
+    public LatLng getPosition() {
+        return mCenter;
+    }
+
+    public boolean remove(T t) {
+        return mItems.remove(t);
+    }
+
+    @Override
+    public Collection<T> getItems() {
+        return mItems;
+    }
+
+    @Override
+    public int getSize() {
+        return mItems.size();
+    }
+
+    @Override
+    public String toString() {
+        return "StaticCluster{" +
+                "mCenter=" + mCenter +
+                ", mItems.size=" + mItems.size() +
+                '}';
+    }
+
+    @Override
+    public int hashCode() {
+        return mCenter.hashCode() + mItems.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof StaticCluster<?>)) {
+            return false;
+        }
+
+        return ((StaticCluster<?>) other).mCenter.equals(mCenter)
+                && ((StaticCluster<?>) other).mItems.equals(mItems);
+    }
+}

app/src/main/java/com/google/maps/android/geometry/Bounds.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.geometry;
+
+/**
+ * Represents an area in the cartesian plane.
+ */
+public class Bounds {
+    public final double minX;
+    public final double minY;
+
+    public final double maxX;
+    public final double maxY;
+
+    public final double midX;
+    public final double midY;
+
+    public Bounds(double minX, double maxX, double minY, double maxY) {
+        this.minX = minX;
+        this.minY = minY;
+        this.maxX = maxX;
+        this.maxY = maxY;
+
+        midX = (minX + maxX) / 2;
+        midY = (minY + maxY) / 2;
+    }
+
+    public boolean contains(double x, double y) {
+        return minX <= x && x <= maxX && minY <= y && y <= maxY;
+    }
+
+    public boolean contains(Point point) {
+        return contains(point.x, point.y);
+    }
+
+    public boolean intersects(double minX, double maxX, double minY, double maxY) {
+        return minX < this.maxX && this.minX < maxX && minY < this.maxY && this.minY < maxY;
+    }
+
+    public boolean intersects(Bounds bounds) {
+        return intersects(bounds.minX, bounds.maxX, bounds.minY, bounds.maxY);
+    }
+
+    public boolean contains(Bounds bounds) {
+        return bounds.minX >= minX && bounds.maxX <= maxX && bounds.minY >= minY && bounds.maxY <= maxY;
+    }
+}

app/src/main/java/com/google/maps/android/geometry/Point.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.geometry;
+
+public class Point {
+    public final double x;
+    public final double y;
+
+    public Point(double x, double y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @Override
+    public String toString() {
+        return "Point{" +
+                "x=" + x +
+                ", y=" + y +
+                '}';
+    }
+}

app/src/main/java/com/google/maps/android/projection/Point.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.projection;
+
+/**
+ * @deprecated since 0.2. Use {@link com.google.maps.android.geometry.Point} instead.
+ */
+@Deprecated
+public class Point extends com.google.maps.android.geometry.Point {
+    public Point(double x, double y) {
+        super(x, y);
+    }
+}

app/src/main/java/com/google/maps/android/projection/SphericalMercatorProjection.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.projection;
+
+import com.car2go.maps.model.LatLng;
+
+public class SphericalMercatorProjection {
+    final double mWorldWidth;
+
+    public SphericalMercatorProjection(final double worldWidth) {
+        mWorldWidth = worldWidth;
+    }
+
+    @SuppressWarnings("deprecation")
+    public Point toPoint(final LatLng latLng) {
+        final double x = latLng.longitude / 360 + .5;
+        final double siny = Math.sin(Math.toRadians(latLng.latitude));
+        final double y = 0.5 * Math.log((1 + siny) / (1 - siny)) / -(2 * Math.PI) + .5;
+
+        return new Point(x * mWorldWidth, y * mWorldWidth);
+    }
+
+    public LatLng toLatLng(com.google.maps.android.geometry.Point point) {
+        final double x = point.x / mWorldWidth - 0.5;
+        final double lng = x * 360;
+
+        double y = .5 - (point.y / mWorldWidth);
+        final double lat = 90 - Math.toDegrees(Math.atan(Math.exp(-y * 2 * Math.PI)) * 2);
+
+        return new LatLng(lat, lng);
+    }
+}

app/src/main/java/com/google/maps/android/quadtree/PointQuadTree.java

@@ -0,0 +1,226 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.quadtree;
+
+import com.google.maps.android.geometry.Bounds;
+import com.google.maps.android.geometry.Point;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A quad tree which tracks items with a Point geometry.
+ * See http://en.wikipedia.org/wiki/Quadtree for details on the data structure.
+ * This class is not thread safe.
+ */
+public class PointQuadTree<T extends PointQuadTree.Item> {
+    public interface Item {
+        Point getPoint();
+    }
+
+    /**
+     * The bounds of this quad.
+     */
+    private final Bounds mBounds;
+
+    /**
+     * The depth of this quad in the tree.
+     */
+    private final int mDepth;
+
+    /**
+     * Maximum number of elements to store in a quad before splitting.
+     */
+    private final static int MAX_ELEMENTS = 50;
+
+    /**
+     * The elements inside this quad, if any.
+     */
+    private Set<T> mItems;
+
+    /**
+     * Maximum depth.
+     */
+    private final static int MAX_DEPTH = 40;
+
+    /**
+     * Child quads.
+     */
+    private List<PointQuadTree<T>> mChildren = null;
+
+    /**
+     * Creates a new quad tree with specified bounds.
+     *
+     * @param minX
+     * @param maxX
+     * @param minY
+     * @param maxY
+     */
+    public PointQuadTree(double minX, double maxX, double minY, double maxY) {
+        this(new Bounds(minX, maxX, minY, maxY));
+    }
+
+    public PointQuadTree(Bounds bounds) {
+        this(bounds, 0);
+    }
+
+    private PointQuadTree(double minX, double maxX, double minY, double maxY, int depth) {
+        this(new Bounds(minX, maxX, minY, maxY), depth);
+    }
+
+    private PointQuadTree(Bounds bounds, int depth) {
+        mBounds = bounds;
+        mDepth = depth;
+    }
+
+    /**
+     * Insert an item.
+     */
+    public void add(T item) {
+        Point point = item.getPoint();
+        if (this.mBounds.contains(point.x, point.y)) {
+            insert(point.x, point.y, item);
+        }
+    }
+
+    private void insert(double x, double y, T item) {
+        if (this.mChildren != null) {
+            if (y < mBounds.midY) {
+                if (x < mBounds.midX) { // top left
+                    mChildren.get(0).insert(x, y, item);
+                } else { // top right
+                    mChildren.get(1).insert(x, y, item);
+                }
+            } else {
+                if (x < mBounds.midX) { // bottom left
+                    mChildren.get(2).insert(x, y, item);
+                } else {
+                    mChildren.get(3).insert(x, y, item);
+                }
+            }
+            return;
+        }
+        if (mItems == null) {
+            mItems = new LinkedHashSet<>();
+        }
+        mItems.add(item);
+        if (mItems.size() > MAX_ELEMENTS && mDepth < MAX_DEPTH) {
+            split();
+        }
+    }
+
+    /**
+     * Split this quad.
+     */
+    private void split() {
+        mChildren = new ArrayList<PointQuadTree<T>>(4);
+        mChildren.add(new PointQuadTree<T>(mBounds.minX, mBounds.midX, mBounds.minY, mBounds.midY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.midX, mBounds.maxX, mBounds.minY, mBounds.midY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.minX, mBounds.midX, mBounds.midY, mBounds.maxY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.midX, mBounds.maxX, mBounds.midY, mBounds.maxY, mDepth + 1));
+
+        Set<T> items = mItems;
+        mItems = null;
+
+        for (T item : items) {
+            // re-insert items into child quads.
+            insert(item.getPoint().x, item.getPoint().y, item);
+        }
+    }
+
+    /**
+     * Remove the given item from the set.
+     *
+     * @return whether the item was removed.
+     */
+    public boolean remove(T item) {
+        Point point = item.getPoint();
+        if (this.mBounds.contains(point.x, point.y)) {
+            return remove(point.x, point.y, item);
+        } else {
+            return false;
+        }
+    }
+
+    private boolean remove(double x, double y, T item) {
+        if (this.mChildren != null) {
+            if (y < mBounds.midY) {
+                if (x < mBounds.midX) { // top left
+                    return mChildren.get(0).remove(x, y, item);
+                } else { // top right
+                    return mChildren.get(1).remove(x, y, item);
+                }
+            } else {
+                if (x < mBounds.midX) { // bottom left
+                    return mChildren.get(2).remove(x, y, item);
+                } else {
+                    return mChildren.get(3).remove(x, y, item);
+                }
+            }
+        } else {
+            if (mItems == null) {
+                return false;
+            } else {
+                return mItems.remove(item);
+            }
+        }
+    }
+
+    /**
+     * Removes all points from the quadTree
+     */
+    public void clear() {
+        mChildren = null;
+        if (mItems != null) {
+            mItems.clear();
+        }
+    }
+
+    /**
+     * Search for all items within a given bounds.
+     */
+    public Collection<T> search(Bounds searchBounds) {
+        final List<T> results = new ArrayList<T>();
+        search(searchBounds, results);
+        return results;
+    }
+
+    private void search(Bounds searchBounds, Collection<T> results) {
+        if (!mBounds.intersects(searchBounds)) {
+            return;
+        }
+
+        if (this.mChildren != null) {
+            for (PointQuadTree<T> quad : mChildren) {
+                quad.search(searchBounds, results);
+            }
+        } else if (mItems != null) {
+            if (searchBounds.contains(mBounds)) {
+                results.addAll(mItems);
+            } else {
+                for (T item : mItems) {
+                    if (searchBounds.contains(item.getPoint())) {
+                        results.add(item);
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/google/maps/android/ui/IconGenerator.java

@@ -0,0 +1,268 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.ui;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import net.vonforst.evmap.R;
+
+/**
+ * IconGenerator generates icons that contain text (or custom content) within an info
+ * window-like shape.
+ * <p/>
+ * The icon {@link Bitmap}s generated by the factory should be used in conjunction with a
+ * BitmapDescriptorFactory.
+ * <p/>
+ * This class is not thread safe.
+ */
+public class IconGenerator {
+    private final Context mContext;
+
+    private ViewGroup mContainer;
+    private RotationLayout mRotationLayout;
+    private TextView mTextView;
+    private View mContentView;
+
+    private int mRotation;
+
+    private float mAnchorU = 0.5f;
+    private float mAnchorV = 1f;
+
+    /**
+     * Creates a new IconGenerator with the default style.
+     */
+    public IconGenerator(Context context) {
+        mContext = context;
+        mContainer = (ViewGroup) LayoutInflater.from(mContext).inflate(R.layout.amu_text_bubble, null);
+        mRotationLayout = (RotationLayout) mContainer.getChildAt(0);
+        mContentView = mTextView = (TextView) mRotationLayout.findViewById(R.id.amu_text);
+    }
+
+    /**
+     * Sets the text content, then creates an icon with the current style.
+     *
+     * @param text the text content to display inside the icon.
+     */
+    public Bitmap makeIcon(CharSequence text) {
+        if (mTextView != null) {
+            mTextView.setText(text);
+        }
+
+        return makeIcon();
+    }
+
+    /**
+     * Creates an icon with the current content and style.
+     * <p/>
+     * This method is useful if a custom view has previously been set, or if text content is not
+     * applicable.
+     */
+    public Bitmap makeIcon() {
+        int measureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+        mContainer.measure(measureSpec, measureSpec);
+
+        int measuredWidth = mContainer.getMeasuredWidth();
+        int measuredHeight = mContainer.getMeasuredHeight();
+
+        mContainer.layout(0, 0, measuredWidth, measuredHeight);
+
+        if (mRotation == 1 || mRotation == 3) {
+            measuredHeight = mContainer.getMeasuredWidth();
+            measuredWidth = mContainer.getMeasuredHeight();
+        }
+
+        Bitmap r = Bitmap.createBitmap(measuredWidth, measuredHeight, Bitmap.Config.ARGB_8888);
+        r.eraseColor(Color.TRANSPARENT);
+
+        Canvas canvas = new Canvas(r);
+
+        switch (mRotation) {
+            case 0:
+                // do nothing
+                break;
+            case 1:
+                canvas.translate(measuredWidth, 0);
+                canvas.rotate(90);
+                break;
+            case 2:
+                canvas.rotate(180, measuredWidth / 2, measuredHeight / 2);
+                break;
+            case 3:
+                canvas.translate(0, measuredHeight);
+                canvas.rotate(270);
+                break;
+        }
+        mContainer.draw(canvas);
+        return r;
+    }
+
+    /**
+     * Sets the child view for the icon.
+     * <p/>
+     * If the view contains a {@link TextView} with the id "text", operations such as {@link
+     * #setTextAppearance} and {@link #makeIcon(CharSequence)} will operate upon that {@link TextView}.
+     */
+    public void setContentView(View contentView) {
+        mRotationLayout.removeAllViews();
+        mRotationLayout.addView(contentView);
+        mContentView = contentView;
+        final View view = mRotationLayout.findViewById(R.id.amu_text);
+        mTextView = view instanceof TextView ? (TextView) view : null;
+    }
+
+    /**
+     * Rotates the contents of the icon.
+     *
+     * @param degrees the amount the contents should be rotated, as a multiple of 90 degrees.
+     */
+    public void setContentRotation(int degrees) {
+        mRotationLayout.setViewRotation(degrees);
+    }
+
+    /**
+     * Rotates the icon.
+     *
+     * @param degrees the amount the icon should be rotated, as a multiple of 90 degrees.
+     */
+    public void setRotation(int degrees) {
+        mRotation = ((degrees + 360) % 360) / 90;
+    }
+
+
+    /**
+     * @return u coordinate of the anchor, with rotation applied.
+     */
+    public float getAnchorU() {
+        return rotateAnchor(mAnchorU, mAnchorV);
+    }
+
+    /**
+     * @return v coordinate of the anchor, with rotation applied.
+     */
+    public float getAnchorV() {
+        return rotateAnchor(mAnchorV, mAnchorU);
+    }
+
+    /**
+     * Rotates the anchor around (u, v) = (0, 0).
+     */
+    private float rotateAnchor(float u, float v) {
+        switch (mRotation) {
+            case 0:
+                return u;
+            case 1:
+                return 1 - v;
+            case 2:
+                return 1 - u;
+            case 3:
+                return v;
+        }
+        throw new IllegalStateException();
+    }
+
+    /**
+     * Sets the text color, size, style, hint color, and highlight color from the specified
+     * <code>TextAppearance</code> resource.
+     *
+     * @param resid the identifier of the resource.
+     */
+    public void setTextAppearance(Context context, int resid) {
+        if (mTextView != null) {
+            mTextView.setTextAppearance(context, resid);
+        }
+    }
+
+    /**
+     * Sets the text color, size, style, hint color, and highlight color from the specified
+     * <code>TextAppearance</code> resource.
+     *
+     * @param resid the identifier of the resource.
+     */
+    public void setTextAppearance(int resid) {
+        setTextAppearance(mContext, resid);
+    }
+
+    /**
+     * Set the background to a given Drawable, or remove the background.
+     *
+     * @param background the Drawable to use as the background, or null to remove the background.
+     */
+    @SuppressWarnings("deprecation")
+    // View#setBackgroundDrawable is compatible with pre-API level 16 (Jelly Bean).
+    public void setBackground(Drawable background) {
+        mContainer.setBackgroundDrawable(background);
+
+        // Force setting of padding.
+        // setBackgroundDrawable does not call setPadding if the background has 0 padding.
+        if (background != null) {
+            Rect rect = new Rect();
+            background.getPadding(rect);
+            mContainer.setPadding(rect.left, rect.top, rect.right, rect.bottom);
+        } else {
+            mContainer.setPadding(0, 0, 0, 0);
+        }
+    }
+
+    /**
+     * Sets the padding of the content view. The default padding of the content view (i.e. text
+     * view) is 5dp top/bottom and 10dp left/right.
+     *
+     * @param left   the left padding in pixels.
+     * @param top    the top padding in pixels.
+     * @param right  the right padding in pixels.
+     * @param bottom the bottom padding in pixels.
+     */
+    public void setContentPadding(int left, int top, int right, int bottom) {
+        mContentView.setPadding(left, top, right, bottom);
+    }
+
+    public static final int STYLE_DEFAULT = 1;
+    public static final int STYLE_WHITE = 2;
+    public static final int STYLE_RED = 3;
+    public static final int STYLE_BLUE = 4;
+    public static final int STYLE_GREEN = 5;
+    public static final int STYLE_PURPLE = 6;
+    public static final int STYLE_ORANGE = 7;
+
+    private static int getStyleColor(int style) {
+        switch (style) {
+            default:
+            case STYLE_DEFAULT:
+            case STYLE_WHITE:
+                return 0xffffffff;
+            case STYLE_RED:
+                return 0xffcc0000;
+            case STYLE_BLUE:
+                return 0xff0099cc;
+            case STYLE_GREEN:
+                return 0xff669900;
+            case STYLE_PURPLE:
+                return 0xff9933cc;
+            case STYLE_ORANGE:
+                return 0xffff8800;
+        }
+    }
+}

app/src/main/java/com/google/maps/android/ui/RotationLayout.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.ui;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * RotationLayout rotates the contents of the layout by multiples of 90 degrees.
+ * <p/>
+ * May not work with padding.
+ */
+public class RotationLayout extends FrameLayout {
+    private int mRotation;
+
+    public RotationLayout(Context context) {
+        super(context);
+    }
+
+    public RotationLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RotationLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mRotation == 1 || mRotation == 3) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            setMeasuredDimension(getMeasuredHeight(), getMeasuredWidth());
+        } else {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    /**
+     * @param degrees the rotation, in degrees.
+     */
+    public void setViewRotation(int degrees) {
+        mRotation = ((degrees + 360) % 360) / 90;
+    }
+
+
+    @Override
+    public void dispatchDraw(Canvas canvas) {
+        if (mRotation == 0) {
+            super.dispatchDraw(canvas);
+            return;
+        }
+
+        if (mRotation == 1) {
+            canvas.translate(getWidth(), 0);
+            canvas.rotate(90, getWidth() / 2, 0);
+            canvas.translate(getHeight() / 2, getWidth() / 2);
+        } else if (mRotation == 2) {
+            canvas.rotate(180, getWidth() / 2, getHeight() / 2);
+        } else {
+            canvas.translate(0, getHeight());
+            canvas.rotate(270, getWidth() / 2, 0);
+            canvas.translate(getHeight() / 2, -getWidth() / 2);
+        }
+
+        super.dispatchDraw(canvas);
+    }
+}

app/src/main/java/com/google/maps/android/ui/SquareTextView.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * 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 com.google.maps.android.ui;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+public class SquareTextView extends AppCompatTextView {
+    private int mOffsetTop = 0;
+    private int mOffsetLeft = 0;
+
+    public SquareTextView(Context context) {
+        super(context);
+    }
+
+    public SquareTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SquareTextView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = getMeasuredWidth();
+        int height = getMeasuredHeight();
+        int dimension = Math.max(width, height);
+        if (width > height) {
+            mOffsetTop = width - height;
+            mOffsetLeft = 0;
+        } else {
+            mOffsetTop = 0;
+            mOffsetLeft = height - width;
+        }
+        setMeasuredDimension(dimension, dimension);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.translate(mOffsetLeft / 2, mOffsetTop / 2);
+        super.draw(canvas);
+    }
+}

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

@@ -2,12 +2,14 @@ package net.vonforst.evmap
 
 import android.app.Application
 import com.facebook.stetho.Stetho
-import com.google.android.libraries.places.api.Places
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.updateNightMode
 
 class EvMapApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        updateNightMode(PreferenceDataSource(this))
         Stetho.initializeWithDefaults(this);
-        Places.initialize(getApplicationContext(), getString(R.string.google_maps_key));
+        init(applicationContext)
     }
 }

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

@@ -1,29 +1,35 @@
 package net.vonforst.evmap
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 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.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
-import com.google.android.gms.common.ConnectionResult
-import com.google.android.gms.common.GoogleApiAvailability
 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.storage.PreferenceDataSource
 import net.vonforst.evmap.utils.LocaleContextWrapper
+import net.vonforst.evmap.utils.getLocationFromIntent
 
 
 const val REQUEST_LOCATION_PERMISSION = 1
+const val EXTRA_CHARGER_ID = "chargerId"
+const val EXTRA_LAT = "lat"
+const val EXTRA_LON = "lon"
 
 class MapsActivity : AppCompatActivity() {
     interface FragmentCallback {
@@ -56,15 +62,68 @@ class MapsActivity : AppCompatActivity() {
             setOf(
                 R.id.map,
                 R.id.favs,
-                R.id.about
+                R.id.about,
+                R.id.settings
             ),
             findViewById<DrawerLayout>(R.id.drawer_layout)
         )
-        findViewById<NavigationView>(R.id.nav_view).setupWithNavController(navController)
+        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)
+            insets
+        }
 
         prefs = PreferenceDataSource(this)
 
-        checkPlayServices()
+        checkPlayServices(this)
+
+        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]
+                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()
+            }
+        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+            val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+            if (id != null) {
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragment.showChargerById(id))
+                    .createPendingIntent()
+                deepLink.send()
+            }
+        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+            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)
+                    )
+                )
+                .createPendingIntent()
+                .send()
+        }
     }
 
     fun navigateTo(charger: ChargeLocation) {
@@ -92,15 +151,28 @@ class MapsActivity : AppCompatActivity() {
                 cb.getRootView(),
                 R.string.no_maps_app_found,
                 Snackbar.LENGTH_SHORT
-            )
+            ).show()
         }
     }
 
     fun openUrl(url: String) {
         val intent = CustomTabsIntent.Builder()
-            .setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
+            .setDefaultColorSchemeParams(
+                CustomTabColorSchemeParams.Builder()
+                    .setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
+                    .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) {
@@ -110,19 +182,4 @@ class MapsActivity : AppCompatActivity() {
         }
         startActivity(intent)
     }
-
-    private fun checkPlayServices(): Boolean {
-        val request = 9000
-        val apiAvailability = GoogleApiAvailability.getInstance()
-        val resultCode = apiAvailability.isGooglePlayServicesAvailable(this)
-        if (resultCode != ConnectionResult.SUCCESS) {
-            if (apiAvailability.isUserResolvableError(resultCode)) {
-                apiAvailability.getErrorDialog(this, resultCode, request).show()
-            } else {
-                Log.d("EVMap", "This device is not supported.")
-            }
-            return false
-        }
-        return true
-    }
 }

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

@@ -1,6 +1,9 @@
 package net.vonforst.evmap
 
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.*
+import android.text.style.StyleSpan
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -14,4 +17,38 @@ fun Bundle.optLong(name: String): Long? {
 
     val lng = this.getLong(name, Long.MIN_VALUE)
     return if (lng == Long.MIN_VALUE) null else lng
+}
+
+fun <T> Iterable<T>.joinToSpannedString(
+    separator: CharSequence = ", ",
+    prefix: CharSequence = "",
+    postfix: CharSequence = "",
+    limit: Int = -1,
+    truncated: CharSequence = "...",
+    transform: ((T) -> CharSequence)? = null
+): CharSequence {
+    return SpannedString(
+        joinTo(
+            SpannableStringBuilder(),
+            separator,
+            prefix,
+            postfix,
+            limit,
+            truncated,
+            transform
+        )
+    )
+}
+
+operator fun CharSequence.plus(other: CharSequence): CharSequence {
+    return TextUtils.concat(this, other)
+}
+
+fun String.bold(): CharSequence {
+    return SpannableString(this).apply {
+        setSpan(
+            StyleSpan(Typeface.BOLD), 0, this.length,
+            Spannable.SPAN_INCLUSIVE_EXCLUSIVE
+        )
+    }
 }

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

@@ -1,31 +1,25 @@
 package net.vonforst.evmap.adapter
 
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.text.HtmlCompat
-import androidx.core.view.children
 import androidx.databinding.DataBindingUtil
-import androidx.databinding.Observable
 import androidx.databinding.ViewDataBinding
 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.goingelectric.*
-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 java.time.ZoneId
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
+import net.vonforst.evmap.api.chargeprice.ChargePrice
+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.ItemConnectorButtonBinding
+import net.vonforst.evmap.ui.CheckableConstraintLayout
+import net.vonforst.evmap.viewmodel.FavoritesViewModel
 
 interface Equatable {
     override fun equals(other: Any?): Boolean;
@@ -92,121 +86,6 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
 }
 
-class DetailAdapter : DataBindingAdapter<DetailAdapter.Detail>() {
-    data class Detail(
-        val icon: Int,
-        val contentDescription: Int,
-        val text: CharSequence,
-        val detailText: CharSequence? = null,
-        val links: Boolean = true,
-        val clickable: Boolean = false,
-        val hoursDays: OpeningHoursDays? = null
-    ) : Equatable
-
-    override fun getItemViewType(position: Int): Int {
-        val item = getItem(position)
-        if (item.hoursDays != null) {
-            return R.layout.item_detail_openinghours
-        } else {
-            return R.layout.item_detail
-        }
-    }
-}
-
-fun buildDetails(
-    loc: ChargeLocation?,
-    chargeCards: Map<Long, ChargeCard>?,
-    ctx: Context
-): List<DetailAdapter.Detail> {
-    if (loc == null) return emptyList()
-
-    return listOfNotNull(
-        DetailAdapter.Detail(
-            R.drawable.ic_address,
-            R.string.address,
-            loc.address.toString(),
-            loc.locationDescription
-        ),
-        if (loc.operator != null) DetailAdapter.Detail(
-            R.drawable.ic_operator,
-            R.string.operator,
-            loc.operator
-        ) else null,
-        if (loc.network != null) DetailAdapter.Detail(
-            R.drawable.ic_network,
-            R.string.network,
-            loc.network
-        ) else null,
-        if (loc.faultReport != null) DetailAdapter.Detail(
-            R.drawable.ic_fault_report,
-            R.string.fault_report,
-            loc.faultReport.created?.let {
-                ctx.getString(
-                    R.string.fault_report_date,
-                    loc.faultReport.created
-                        .atZone(ZoneId.systemDefault())
-                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
-                )
-            } ?: "",
-            loc.faultReport.description?.let {
-                HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY)
-            } ?: "",
-            clickable = true
-        ) else null,
-        if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailAdapter.Detail(
-            R.drawable.ic_hours,
-            R.string.hours,
-            loc.openinghours.getStatusText(ctx),
-            loc.openinghours.description,
-            hoursDays = loc.openinghours.days
-        ) else null,
-        if (loc.cost != null) DetailAdapter.Detail(
-            R.drawable.ic_cost,
-            R.string.cost,
-            loc.cost.getStatusText(ctx),
-            loc.cost.descriptionLong ?: loc.cost.descriptionShort
-        )
-        else null,
-        if (loc.chargecards != null && loc.chargecards.isNotEmpty()) DetailAdapter.Detail(
-            R.drawable.ic_payment,
-            R.string.charge_cards,
-            ctx.resources.getQuantityString(
-                R.plurals.charge_cards_compatible_num,
-                loc.chargecards.size, loc.chargecards.size
-            ),
-            formatChargeCards(loc.chargecards, chargeCards, ctx),
-            clickable = true
-        ) else null,
-        DetailAdapter.Detail(
-            R.drawable.ic_location,
-            R.string.coordinates,
-            loc.coordinates.formatDMS(),
-            loc.coordinates.formatDecimal(),
-            links = false,
-            clickable = true
-        )
-    )
-}
-
-fun formatChargeCards(
-    chargecards: List<ChargeCardId>,
-    chargecardData: Map<Long, ChargeCard>?,
-    ctx: Context
-): String {
-    if (chargecardData == null) return ""
-
-    val maxItems = 5
-    var result = chargecards
-        .take(maxItems)
-        .mapNotNull { chargecardData[it.id]?.name }
-        .joinToString()
-    if (chargecards.size > maxItems) {
-        result += " " + ctx.getString(R.string.and_n_others, chargecards.size - maxItems)
-    }
-
-    return result
-}
-
 
 class FavoritesAdapter(val vm: FavoritesViewModel) :
     DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
@@ -219,194 +98,103 @@ class FavoritesAdapter(val vm: FavoritesViewModel) :
     override fun getItemId(position: Int): Long = getItem(position).charger.id
 }
 
-class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
-    init {
-        setHasStableIds(true)
-    }
+class ChargepriceAdapter() :
+    DataBindingAdapter<ChargePrice>() {
 
-    val itemids = mutableMapOf<String, Long>()
-    var maxId = 0L
-
-    override fun getItemViewType(position: Int): Int =
-        when (val filter = getItem(position).filter) {
-            is BooleanFilter -> R.layout.item_filter_boolean
-            is MultipleChoiceFilter -> {
-                if (filter.manyChoices) {
-                    R.layout.item_filter_multiple_choice_large
-                } else {
-                    R.layout.item_filter_multiple_choice
-                }
-            }
-            is SliderFilter -> R.layout.item_filter_slider
+    val viewPool = RecyclerView.RecycledViewPool();
+    var meta: ChargepriceChargepointMeta? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var myTariffs: Set<String>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var myTariffsAll: Boolean? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
         }
 
-    override fun bind(
-        holder: ViewHolder<FilterWithValue<FilterValue>>,
-        item: FilterWithValue<FilterValue>
-    ) {
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<ChargePrice> {
+        val holder = super.onCreateViewHolder(parent, viewType)
+        val binding = holder.binding as ItemChargepriceBinding
+        binding.rvTags.apply {
+            adapter = ChargepriceTagsAdapter()
+            layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false).apply {
+                    recycleChildrenOnDetach = true
+                }
+            itemAnimator = null
+            setRecycledViewPool(viewPool)
+        }
+        return holder
+    }
+
+    override fun bind(holder: ViewHolder<ChargePrice>, item: ChargePrice) {
         super.bind(holder, item)
-        when (item.value) {
-            is SliderFilterValue -> {
-                setupSlider(
-                    holder.binding as ItemFilterSliderBinding,
-                    item.filter as SliderFilter, item.value
-                )
-            }
-            is MultipleChoiceFilterValue -> {
-                val filter = item.filter as MultipleChoiceFilter
-                if (filter.manyChoices) {
-                    setupMultipleChoiceMany(
-                        holder.binding as ItemFilterMultipleChoiceLargeBinding,
-                        filter, item.value
-                    )
-                } else {
-                    setupMultipleChoice(
-                        holder.binding as ItemFilterMultipleChoiceBinding,
-                        filter, item.value
-                    )
-                }
-            }
+        (holder.binding as ItemChargepriceBinding).apply {
+            this.meta = this@ChargepriceAdapter.meta
+            this.myTariffs = this@ChargepriceAdapter.myTariffs
+            this.myTariffsAll = this@ChargepriceAdapter.myTariffsAll
         }
     }
-
-    private fun setupMultipleChoice(
-        binding: ItemFilterMultipleChoiceBinding,
-        filter: MultipleChoiceFilter,
-        value: MultipleChoiceFilterValue
-    ) {
-        val inflater = LayoutInflater.from(binding.root.context)
-        value.values.toList().forEach {
-            // delete values that cannot be selected anymore
-            if (it !in filter.choices.keys) value.values.remove(it)
-        }
-
-        fun updateButtons() {
-            value.all = value.values == filter.choices.keys
-            binding.btnAll.isEnabled = !value.all
-            binding.btnNone.isEnabled = value.values.isNotEmpty()
-        }
-
-        val chips = mutableMapOf<String, Chip>()
-        binding.chipGroup.children.forEach {
-            if (it.id != R.id.chipMore) binding.chipGroup.removeView(it)
-        }
-        filter.choices.entries.sortedByDescending {
-            it.key in value.values
-        }.sortedByDescending {
-            if (filter.commonChoices != null) it.key in filter.commonChoices else false
-        }.forEach { choice ->
-            val chip = inflater.inflate(
-                R.layout.item_filter_multiple_choice_chip,
-                binding.chipGroup,
-                false
-            ) as Chip
-            chip.text = choice.value
-            chip.isChecked = choice.key in value.values || value.all
-            if (value.all && choice.key !in value.values) value.values.add(choice.key)
-
-            chip.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) {
-                    value.values.add(choice.key)
-                } else {
-                    value.values.remove(choice.key)
-                }
-                updateButtons()
-            }
-
-            if (filter.commonChoices != null && choice.key !in filter.commonChoices
-                && !(chip.isChecked && !value.all) && !binding.showingAll
-            ) {
-                chip.visibility = View.GONE
-            } else {
-                chip.visibility = View.VISIBLE
-            }
-
-            binding.chipGroup.addView(chip, binding.chipGroup.childCount - 1)
-            chips[choice.key] = chip
-        }
-
-        binding.btnAll.setOnClickListener {
-            value.all = true
-            value.values.addAll(filter.choices.keys)
-            chips.values.forEach { it.isChecked = true }
-            updateButtons()
-        }
-        binding.btnNone.setOnClickListener {
-            value.all = true
-            value.values.addAll(filter.choices.keys)
-            chips.values.forEach { it.isChecked = false }
-            updateButtons()
-        }
-        binding.chipMore.setOnClickListener {
-            binding.showingAll = !binding.showingAll
-            chips.forEach { (key, chip) ->
-                if (filter.commonChoices != null && key !in filter.commonChoices
-                    && !(chip.isChecked && !value.all) && !binding.showingAll
-                ) {
-                    chip.visibility = View.GONE
-                } else {
-                    chip.visibility = View.VISIBLE
-                }
-            }
-        }
-        updateButtons()
-    }
-
-    private fun setupMultipleChoiceMany(
-        binding: ItemFilterMultipleChoiceLargeBinding,
-        filter: MultipleChoiceFilter,
-        value: MultipleChoiceFilterValue
-    ) {
-        if (value.all) {
-            value.values = filter.choices.keys.toMutableSet()
-            binding.notifyPropertyChanged(BR.item)
-        }
-
-        binding.btnEdit.setOnClickListener {
-            val dialog = MultiSelectDialog.getInstance(filter.name, filter.choices, value.values)
-            dialog.okListener = { selected ->
-                value.values = selected.toMutableSet()
-                value.all = value.values == filter.choices.keys
-                binding.item = binding.item
-            }
-            dialog.show((binding.root.context as AppCompatActivity).supportFragmentManager, null)
-        }
-    }
-
-    private fun setupSlider(
-        binding: ItemFilterSliderBinding,
-        filter: SliderFilter,
-        value: SliderFilterValue
-    ) {
-        binding.progress = filter.inverseMapping(value.value)
-        binding.mappedValue = value.value
-
-        binding.addOnPropertyChangedCallback(object :
-            Observable.OnPropertyChangedCallback() {
-            override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
-                when (propertyId) {
-                    BR.progress -> {
-                        val mapped = filter.mapping(binding.progress)
-                        value.value = mapped
-                        binding.mappedValue = mapped
-                    }
-                }
-            }
-        })
-    }
-
-    override fun getItemId(position: Int): Long {
-        val key = getItem(position).filter.key
-        var value = itemids[key]
-        if (value == null) {
-            maxId++
-            value = maxId
-            itemids[key] = maxId
-        }
-        return value
-    }
 }
 
-class DonationAdapter() : DataBindingAdapter<DonationItem>() {
-    override fun getItemViewType(position: Int): Int = R.layout.item_donation
+class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
+    private var checkedItem: Int? = 0
+
+    var enabledConnectors: List<String>? = null
+        get() = field
+        set(value) {
+            field = value
+            checkedItem?.let {
+                if (value != null && getItem(it).type !in value) {
+                    val index = currentList.indexOfFirst {
+                        it.type in value
+                    }
+                    checkedItem = if (index == -1) null else index
+                    onCheckedItemChangedListener?.invoke(getCheckedItem())
+                }
+            }
+            notifyDataSetChanged()
+        }
+
+    override fun getItemViewType(position: Int): Int = R.layout.item_connector_button
+
+    override fun onBindViewHolder(holder: ViewHolder<Chargepoint>, position: Int) {
+        val item = getItem(position)
+        super.bind(holder, item)
+        val binding = holder.binding as ItemConnectorButtonBinding
+        binding.enabled = enabledConnectors?.let { item.type in it } ?: true
+        val root = binding.root as CheckableConstraintLayout
+        root.isChecked = checkedItem == position
+        root.setOnClickListener {
+            root.isChecked = true
+        }
+        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+            if (checked) {
+                checkedItem = position
+                notifyDataSetChanged()
+                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
+            }
+        }
+    }
+
+    fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
+
+    fun setCheckedItem(item: Chargepoint?) {
+        checkedItem = item?.let { currentList.indexOf(item) } ?: null
+    }
+
+    var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null
+}
+
+class ChargepriceTagsAdapter() :
+    DataBindingAdapter<ChargepriceTag>() {
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_tag
 }

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

@@ -0,0 +1,151 @@
+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.plus
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+
+class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
+    data class Detail(
+        val icon: Int,
+        val contentDescription: Int,
+        val text: CharSequence,
+        val detailText: CharSequence? = null,
+        val links: Boolean = true,
+        val clickable: Boolean = false,
+        val hoursDays: OpeningHoursDays? = null
+    ) : Equatable
+
+    override fun getItemViewType(position: Int): Int {
+        val item = getItem(position)
+        if (item.hoursDays != null) {
+            return R.layout.item_detail_openinghours
+        } else {
+            return R.layout.item_detail
+        }
+    }
+}
+
+fun buildDetails(
+    loc: ChargeLocation?,
+    chargeCards: Map<Long, ChargeCard>?,
+    filteredChargeCards: Set<Long>?,
+    ctx: Context
+): List<DetailsAdapter.Detail> {
+    if (loc == null) return emptyList()
+
+    return listOfNotNull(
+        DetailsAdapter.Detail(
+            R.drawable.ic_address,
+            R.string.address,
+            loc.address.toString(),
+            loc.locationDescription,
+            clickable = true
+        ),
+        if (loc.operator != null) DetailsAdapter.Detail(
+            R.drawable.ic_operator,
+            R.string.operator,
+            loc.operator
+        ) else null,
+        if (loc.network != null) DetailsAdapter.Detail(
+            R.drawable.ic_network,
+            R.string.network,
+            loc.network
+        ) else null,
+        if (loc.faultReport != null) DetailsAdapter.Detail(
+            R.drawable.ic_fault_report,
+            R.string.fault_report,
+            loc.faultReport.created?.let {
+                ctx.getString(
+                    R.string.fault_report_date,
+                    loc.faultReport.created
+                        .atZone(ZoneId.systemDefault())
+                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
+                )
+            } ?: "",
+            loc.faultReport.description?.let {
+                HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY)
+            } ?: "",
+            clickable = true
+        ) else null,
+        if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailsAdapter.Detail(
+            R.drawable.ic_hours,
+            R.string.hours,
+            if (loc.openinghours.days != null || loc.openinghours.twentyfourSeven)
+                loc.openinghours.getStatusText(ctx)
+            else
+                loc.openinghours.description ?: "",
+            if (loc.openinghours.days != null) loc.openinghours.description else null,
+            hoursDays = loc.openinghours.days
+        ) else null,
+        if (loc.cost != null) DetailsAdapter.Detail(
+            R.drawable.ic_cost,
+            R.string.cost,
+            loc.cost.getStatusText(ctx),
+            loc.cost.descriptionLong ?: loc.cost.descriptionShort
+        )
+        else null,
+        if (loc.chargecards != null && loc.chargecards.isNotEmpty() || loc.barrierFree == true)
+            DetailsAdapter.Detail(
+                R.drawable.ic_payment,
+                R.string.charge_cards,
+                listOfNotNull(
+                    if (loc.barrierFree == true) ctx.resources.getString(R.string.charging_barrierfree) else null,
+                    if (loc.chargecards != null && loc.chargecards.isNotEmpty()) {
+                        ctx.resources.getQuantityString(
+                            R.plurals.charge_cards_compatible_num,
+                            loc.chargecards.size, loc.chargecards.size
+                        )
+                    } else null
+                ).joinToString(", "),
+                if (loc.chargecards != null && loc.chargecards.isNotEmpty()) {
+                    formatChargeCards(loc.chargecards, chargeCards, filteredChargeCards, ctx)
+                } else null,
+                clickable = true
+            ) else null,
+        DetailsAdapter.Detail(
+            R.drawable.ic_location,
+            R.string.coordinates,
+            loc.coordinates.formatDMS(),
+            loc.coordinates.formatDecimal(),
+            links = false,
+            clickable = true
+        )
+    )
+}
+
+fun formatChargeCards(
+    chargecards: List<ChargeCardId>,
+    chargecardData: Map<Long, ChargeCard>?,
+    filteredChargeCards: Set<Long>?,
+    ctx: Context
+): CharSequence {
+    if (chargecardData == null) return ""
+
+    val maxItems = 5
+    var result = chargecards
+        .sortedByDescending { filteredChargeCards?.contains(it.id) }
+        .take(maxItems)
+        .mapNotNull {
+            val name = chargecardData[it.id]?.name ?: return@mapNotNull null
+            if (filteredChargeCards?.contains(it.id) == true) {
+                name.bold()
+            } else {
+                name
+            }
+        }.joinToSpannedString()
+    if (chargecards.size > maxItems) {
+        result += " " + ctx.getString(R.string.and_n_others, chargecards.size - maxItems)
+    }
+
+    return result
+}

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

@@ -0,0 +1,55 @@
+package net.vonforst.evmap.adapter
+
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import android.view.animation.AccelerateInterpolator
+import androidx.recyclerview.widget.ItemTouchHelper
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.ItemFilterProfileBinding
+import net.vonforst.evmap.storage.FilterProfile
+
+class FilterProfilesAdapter(
+    val dragHelper: ItemTouchHelper,
+    val onDelete: (FilterProfile) -> Unit,
+    val onRename: (FilterProfile) -> Unit
+) : DataBindingAdapter<FilterProfile>() {
+    init {
+        setHasStableIds(true)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun bind(
+        holder: ViewHolder<FilterProfile>,
+        item: FilterProfile
+    ) {
+        super.bind(holder, item)
+
+        val binding = holder.binding as ItemFilterProfileBinding
+        binding.handle.setOnTouchListener { v, event ->
+            if (event?.action == MotionEvent.ACTION_DOWN) {
+                dragHelper.startDrag(holder)
+            }
+            false
+        }
+        binding.foreground.translationX = 0f
+        binding.btnDelete.setOnClickListener {
+            binding.foreground.animate()
+                .translationX(binding.foreground.width.toFloat())
+                .setDuration(250)
+                .setInterpolator(AccelerateInterpolator())
+                .withEndAction {
+                    onDelete(item)
+                }
+                .start()
+        }
+        binding.btnRename.setOnClickListener {
+            onRename(item)
+        }
+    }
+
+    override fun getItemId(position: Int): Long {
+        return getItem(position).id
+    }
+
+    override fun getItemViewType(position: Int): Int = R.layout.item_filter_profile
+}

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

@@ -0,0 +1,227 @@
+package net.vonforst.evmap.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.children
+import androidx.databinding.Observable
+import com.google.android.material.chip.Chip
+import net.vonforst.evmap.BR
+import net.vonforst.evmap.R
+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 kotlin.math.max
+
+class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
+    init {
+        setHasStableIds(true)
+    }
+
+    val itemids = mutableMapOf<String, Long>()
+    var maxId = 0L
+
+    override fun getItemViewType(position: Int): Int =
+        when (val filter = getItem(position).filter) {
+            is BooleanFilter -> R.layout.item_filter_boolean
+            is MultipleChoiceFilter -> {
+                if (filter.manyChoices) {
+                    R.layout.item_filter_multiple_choice_large
+                } else {
+                    R.layout.item_filter_multiple_choice
+                }
+            }
+            is SliderFilter -> R.layout.item_filter_slider
+        }
+
+    override fun bind(
+        holder: ViewHolder<FilterWithValue<FilterValue>>,
+        item: FilterWithValue<FilterValue>
+    ) {
+        super.bind(holder, item)
+        when (item.value) {
+            is SliderFilterValue -> {
+                setupSlider(
+                    holder.binding as ItemFilterSliderBinding,
+                    item.filter as SliderFilter, item.value
+                )
+            }
+            is MultipleChoiceFilterValue -> {
+                val filter = item.filter as MultipleChoiceFilter
+                if (filter.manyChoices) {
+                    setupMultipleChoiceMany(
+                        holder.binding as ItemFilterMultipleChoiceLargeBinding,
+                        filter, item.value
+                    )
+                } else {
+                    setupMultipleChoice(
+                        holder.binding as ItemFilterMultipleChoiceBinding,
+                        filter, item.value
+                    )
+                }
+            }
+        }
+    }
+
+    private fun setupMultipleChoice(
+        binding: ItemFilterMultipleChoiceBinding,
+        filter: MultipleChoiceFilter,
+        value: MultipleChoiceFilterValue
+    ) {
+        // TODO: this implementation seems to be buggy
+        val inflater = LayoutInflater.from(binding.root.context)
+        value.values.toList().forEach {
+            // delete values that cannot be selected anymore
+            if (it !in filter.choices.keys) value.values.remove(it)
+        }
+
+        fun updateButtons() {
+            value.all = value.values == filter.choices.keys
+            binding.btnAll.isEnabled = !value.all
+            binding.btnNone.isEnabled = value.values.isNotEmpty()
+        }
+
+        val chips = mutableMapOf<String, Chip>()
+
+        // reuse existing chips in layout
+        val reuseChips = binding.chipGroup.children.filter {
+            it.id != R.id.chipMore
+        }.toMutableList()
+        binding.chipGroup.children.forEach {
+            if (it.id != R.id.chipMore) binding.chipGroup.removeView(it)
+        }
+        filter.choices.entries.sortedByDescending {
+            it.key in value.values
+        }.sortedByDescending {
+            if (filter.commonChoices != null) it.key in filter.commonChoices else false
+        }.forEach { choice ->
+            var reused = false
+            val chip = if (reuseChips.size > 0) {
+                reused = true
+                reuseChips.removeAt(0) as Chip
+            } else {
+                inflater.inflate(
+                    R.layout.item_filter_multiple_choice_chip,
+                    binding.chipGroup,
+                    false
+                ) as Chip
+            }
+            chip.text = choice.value
+            chip.isChecked = choice.key in value.values || value.all
+            if (value.all && choice.key !in value.values) value.values.add(choice.key)
+
+            chip.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked) {
+                    value.values.add(choice.key)
+                } else {
+                    value.values.remove(choice.key)
+                }
+                updateButtons()
+            }
+
+            if (filter.commonChoices != null && choice.key !in filter.commonChoices
+                && !(chip.isChecked && !value.all) && !binding.showingAll
+            ) {
+                chip.visibility = View.GONE
+            } else {
+                chip.visibility = View.VISIBLE
+            }
+
+            if (!reused) binding.chipGroup.addView(chip, binding.chipGroup.childCount - 1)
+            chips[choice.key] = chip
+        }
+        // delete surplus reusable chips
+        reuseChips.forEach {
+            binding.chipGroup.removeView(it)
+        }
+
+        binding.btnAll.setOnClickListener {
+            value.all = true
+            value.values.addAll(filter.choices.keys)
+            chips.values.forEach { it.isChecked = true }
+            updateButtons()
+        }
+        binding.btnNone.setOnClickListener {
+            value.all = true
+            value.values.addAll(filter.choices.keys)
+            chips.values.forEach { it.isChecked = false }
+            updateButtons()
+        }
+        binding.chipMore.setOnClickListener {
+            binding.showingAll = !binding.showingAll
+            chips.forEach { (key, chip) ->
+                if (filter.commonChoices != null && key !in filter.commonChoices
+                    && !(chip.isChecked && !value.all) && !binding.showingAll
+                ) {
+                    chip.visibility = View.GONE
+                } else {
+                    chip.visibility = View.VISIBLE
+                }
+            }
+        }
+        updateButtons()
+    }
+
+    private fun setupMultipleChoiceMany(
+        binding: ItemFilterMultipleChoiceLargeBinding,
+        filter: MultipleChoiceFilter,
+        value: MultipleChoiceFilterValue
+    ) {
+        if (value.all) {
+            value.values = filter.choices.keys.toMutableSet()
+            binding.notifyPropertyChanged(BR.item)
+        }
+
+        binding.btnEdit.setOnClickListener {
+            val dialog =
+                MultiSelectDialog.getInstance(
+                    filter.name,
+                    filter.choices,
+                    value.values,
+                    commonChoices = filter.commonChoices
+                )
+            dialog.okListener = { selected ->
+                value.values = selected.toMutableSet()
+                value.all = value.values == filter.choices.keys
+                binding.item = binding.item
+            }
+            dialog.show((binding.root.context as AppCompatActivity).supportFragmentManager, null)
+        }
+    }
+
+    private fun setupSlider(
+        binding: ItemFilterSliderBinding,
+        filter: SliderFilter,
+        value: SliderFilterValue
+    ) {
+        binding.progress =
+            max(filter.inverseMapping(value.value) - filter.min, 0)
+        binding.mappedValue = filter.mapping(binding.progress + filter.min)
+
+        binding.addOnPropertyChangedCallback(object :
+            Observable.OnPropertyChangedCallback() {
+            override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+                when (propertyId) {
+                    BR.progress -> {
+                        val mapped = filter.mapping(binding.progress + filter.min)
+                        value.value = mapped
+                        binding.mappedValue = mapped
+                    }
+                }
+            }
+        })
+    }
+
+    override fun getItemId(position: Int): Long {
+        val key = getItem(position).filter.key
+        var value = itemids[key]
+        if (value == null) {
+            maxId++
+            value = maxId
+            itemids[key] = maxId
+        }
+        return value
+    }
+}

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

@@ -7,9 +7,11 @@ import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import coil.load
+import coil.memory.MemoryCache
+import coil.size.OriginalSize
+import coil.size.SizeResolver
 import com.ortiz.touchview.TouchImageView
-import com.squareup.picasso.Callback
-import com.squareup.picasso.Picasso
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.goingelectric.ChargerPhoto
 
@@ -19,17 +21,19 @@ class GalleryAdapter(
     val itemClickListener: ItemClickListener? = null,
     val detailView: Boolean = false,
     val pageToLoad: Int? = null,
+    val imageCacheKey: MemoryCache.Key? = null,
     val loadedListener: (() -> Unit)? = null
 ) :
     ListAdapter<ChargerPhoto, GalleryAdapter.ViewHolder>(ChargerPhotoDiffCallback()) {
     class ViewHolder(val view: ImageView) : RecyclerView.ViewHolder(view)
 
     interface ItemClickListener {
-        fun onItemClick(view: View, position: Int)
+        fun onItemClick(view: View, position: Int, imageCacheKey: MemoryCache.Key?)
     }
 
     val apikey = context.getString(R.string.goingelectric_key)
     var loaded = false
+    val memoryKeys = HashMap<String, MemoryCache.Key?>()
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -37,11 +41,11 @@ class GalleryAdapter(
         val view: ImageView
         if (detailView) {
             view = inflater.inflate(R.layout.gallery_item_fullscreen, parent, false) as ImageView
-            view.setOnTouchListener { view, event ->
+            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 || view.canScrollHorizontally(1) && view.canScrollHorizontally(
+                if (event.pointerCount >= 2 || v.canScrollHorizontally(1) && v.canScrollHorizontally(
                         -1
                     )
                 ) {
@@ -73,46 +77,63 @@ class GalleryAdapter(
         if (detailView) {
             (holder.view as TouchImageView).resetZoom()
         }
-        Picasso.get()
-            .load(
-                "https://api.goingelectric.de/chargepoints/photo/?key=${apikey}" +
-                        "&id=${getItem(position).id}" +
-                        if (detailView) {
-                            "&size=1000"
-                        } else {
-                            "&height=${holder.view.height}"
-                        }
-            )
-            .into(holder.view, object : Callback {
-                override fun onSuccess() {
-                    if (!loaded && loadedListener != null && pageToLoad == position) {
-                        holder.view.viewTreeObserver.addOnPreDrawListener(object :
-                            ViewTreeObserver.OnPreDrawListener {
-                            override fun onPreDraw(): Boolean {
-                                holder.view.viewTreeObserver.removeOnPreDrawListener(this)
-                                loadedListener.invoke()
-                                return true
-                            }
-                        })
-                        loaded = true
-                    }
+        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}"
                 }
 
-                override fun onError(e: Exception?) {
+        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)
+                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"

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

@@ -0,0 +1,33 @@
+package net.vonforst.evmap.api
+
+import com.google.common.util.concurrent.RateLimiter
+import okhttp3.Interceptor
+import okhttp3.Response
+
+
+class RateLimitInterceptor : Interceptor {
+    private val rateLimiter = RateLimiter.create(3.0)
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        if (request.url.host == "my.newmotion.com") {
+            // limit requests sent to NewMotion to 3 per second
+            rateLimiter.acquire(1)
+
+            var response: Response = chain.proceed(request)
+            // 403 is how the NewMotion API indicates a rate limit error
+            if (!response.isSuccessful && response.code == 403) {
+                response.close()
+                // wait & retry
+                try {
+                    Thread.sleep(1000)
+                } catch (e: InterruptedException) {
+                }
+                response = chain.proceed(request)
+            }
+            return response
+        } else {
+            return chain.proceed(request)
+        }
+    }
+}

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

@@ -1,7 +1,11 @@
 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 okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Response
@@ -10,7 +14,10 @@ import java.io.IOException
 import kotlin.coroutines.resumeWithException
 
 operator fun <T> JSONArray.iterator(): Iterator<T> =
-    (0 until length()).asSequence().map { get(it) as T }.iterator()
+    (0 until length()).asSequence().map {
+        @Suppress("UNCHECKED_CAST")
+        get(it) as T
+    }.iterator()
 
 @ExperimentalCoroutinesApi
 suspend fun Call.await(): Response {
@@ -36,26 +43,35 @@ suspend fun Call.await(): Response {
     }
 }
 
-const val earthRadiusKm: Double = 6372.8
+private val plugNames = mapOf(
+    Chargepoint.TYPE_1 to R.string.plug_type_1,
+    Chargepoint.TYPE_2 to R.string.plug_type_2,
+    Chargepoint.TYPE_3 to R.string.plug_type_3,
+    Chargepoint.CCS 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,
+    Chargepoint.CEE_BLAU to R.string.plug_cee_blau,
+    Chargepoint.CEE_ROT to R.string.plug_cee_rot,
+    Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc
+)
 
-/**
- * Calculates the distance between two points on Earth in meters.
- * Latitude and longitude should be given in degrees.
- */
-fun distanceBetween(
-    startLatitude: Double, startLongitude: Double,
-    endLatitude: Double, endLongitude: Double
-): Double {
-    // see https://rosettacode.org/wiki/Haversine_formula#Java
-    val dLat = Math.toRadians(endLatitude - startLatitude);
-    val dLon = Math.toRadians(endLongitude - startLongitude);
-    val originLat = Math.toRadians(startLatitude);
-    val destinationLat = Math.toRadians(endLatitude);
+fun nameForPlugType(ctx: Context, type: String): String =
+    plugNames[type]?.let {
+        ctx.getString(it)
+    } ?: type
 
-    val a = Math.pow(Math.sin(dLat / 2), 2.toDouble()) + Math.pow(
-        Math.sin(dLon / 2),
-        2.toDouble()
-    ) * Math.cos(originLat) * Math.cos(destinationLat);
-    val c = 2 * Math.asin(Math.sqrt(a));
-    return earthRadiusKm * c * 1000;
-}
+@DrawableRes
+fun iconForPlugType(type: String): Int =
+    when (type) {
+        Chargepoint.CCS -> R.drawable.ic_connector_ccs
+        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.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
+    }

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

@@ -2,21 +2,30 @@ package net.vonforst.evmap.api.availability
 
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import kotlinx.coroutines.Dispatchers
+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.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.getMultipleChoiceValue
+import net.vonforst.evmap.viewmodel.getSliderValue
+import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import retrofit2.HttpException
 import java.io.IOException
+import java.net.CookieManager
+import java.net.CookiePolicy
 import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
     suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus
 }
 
+@ExperimentalCoroutinesApi
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
     protected val radius = 150  // max radius in meters
 
@@ -24,9 +33,9 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
         val request = Request.Builder().url(url).build()
         val response = client.newCall(request).await()
 
-        if (!response.isSuccessful) throw IOException(response.message())
+        if (!response.isSuccessful) throw IOException(response.message)
 
-        val str = response.body()!!.string()
+        val str = response.body!!.string()
         return str
     }
 
@@ -107,7 +116,21 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
 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")
+
+        val statusFiltered = status.filterKeys {
+            (connectorsVal.all || it.type in connectorsVal.values) && it.power > minPower
+        }
+        return this.copy(status = statusFiltered)
+    }
+
+    val totalChargepoints = status.map { it.key.count }.sum()
+}
 
 enum class ChargepointStatus {
     AVAILABLE, UNKNOWN, CHARGING, OCCUPIED, FAULTED
@@ -115,10 +138,16 @@ enum class ChargepointStatus {
 
 class AvailabilityDetectorException(message: String) : Exception(message)
 
+private val cookieManager = CookieManager().apply {
+    setCookiePolicy(CookiePolicy.ACCEPT_ALL)
+}
+
 private val okhttp = OkHttpClient.Builder()
+    .addInterceptor(RateLimitInterceptor())
     .addNetworkInterceptor(StethoInterceptor())
     .readTimeout(10, TimeUnit.SECONDS)
     .connectTimeout(10, TimeUnit.SECONDS)
+    .cookieJar(JavaNetCookieJar(cookieManager))
     .build()
 val availabilityDetectors = listOf(
     NewMotionAvailabilityDetector(okhttp)

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

@@ -8,6 +8,7 @@ import okhttp3.OkHttpClient
 import org.json.JSONObject
 import java.io.IOException
 
+@ExperimentalCoroutinesApi
 class ChargecloudAvailabilityDetector(
     client: OkHttpClient,
     private val operatorId: String

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

@@ -1,14 +1,15 @@
 package net.vonforst.evmap.api.availability
 
 import com.squareup.moshi.JsonClass
-import net.vonforst.evmap.api.distanceBetween
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.utils.distanceBetween
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
+import java.util.*
 
 private const val coordRange = 0.1  // range of latitude and longitude for loading the map
 private const val maxDistance = 15  // max distance between reported positions in meters
@@ -95,7 +96,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         // find nearest station to this position
         var markers =
             api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
-        val nearest = markers.minBy { marker ->
+        val nearest = markers.minByOrNull { marker ->
             distanceBetween(marker.coordinates.latitude, marker.coordinates.longitude, lat, lng)
         } ?: throw AvailabilityDetectorException("no candidates found.")
 
@@ -138,15 +139,18 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         connectorStatus.forEach { (connector, statusStr) ->
             val id = connector.uid
             val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType) {
-                "Type3" -> Chargepoint.TYPE_3
-                "Type2" -> Chargepoint.TYPE_2
-                "Type1" -> Chargepoint.TYPE_1
-                "Domestic" -> Chargepoint.SCHUKO
-                "Type2Combo" -> Chargepoint.CCS
-                "TepcoCHAdeMO" -> Chargepoint.CHADEMO
-                "Unspecified" -> "unspecified"
-                else -> throw IllegalArgumentException("unrecognized type ${connector.connectorType}")
+            val type = when (connector.connectorType.toLowerCase(Locale.ROOT)) {
+                "type3" -> Chargepoint.TYPE_3
+                "type2" -> Chargepoint.TYPE_2
+                "type1" -> Chargepoint.TYPE_1
+                "domestic" -> Chargepoint.SCHUKO
+                "type1combo" -> Chargepoint.CCS  // US CCS, aka type1_combo
+                "type2combo" -> Chargepoint.CCS  // EU CCS, aka type2_combo
+                "tepcochademo" -> Chargepoint.CHADEMO
+                "unspecified" -> "unknown"
+                "unknown" -> "unknown"
+                "saej1772" -> "unknown"
+                else -> "unknown"
             }
             val status = when (statusStr) {
                 "Unavailable" -> ChargepointStatus.FAULTED

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

@@ -0,0 +1,78 @@
+package net.vonforst.evmap.api.chargeprice
+
+import android.content.Context
+import com.facebook.stetho.okhttp3.StethoInterceptor
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import moe.banana.jsonapi2.ArrayDocument
+import moe.banana.jsonapi2.JsonApiConverterFactory
+import moe.banana.jsonapi2.ResourceAdapterFactory
+import net.vonforst.evmap.BuildConfig
+import okhttp3.Cache
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface ChargepriceApi {
+    @POST("charge_prices")
+    suspend fun getChargePrices(
+        @Body request: ChargepriceRequest,
+        @Header("Accept-Language") language: String
+    ): ArrayDocument<ChargePrice>
+
+    @GET("vehicles")
+    suspend fun getVehicles(): ArrayDocument<ChargepriceCar>
+
+    @GET("tariffs")
+    suspend fun getTariffs(): ArrayDocument<ChargepriceTariff>
+
+    companion object {
+        private val cacheSize = 1L * 1024 * 1024 // 1MB
+        val supportedLanguages = setOf("de", "en", "fr", "nl")
+
+        private val jsonApiAdapterFactory = ResourceAdapterFactory.builder()
+            .add(ChargepriceRequest::class.java)
+            .add(ChargepriceTariff::class.java)
+            .add(ChargepriceBrand::class.java)
+            .add(ChargePrice::class.java)
+            .add(ChargepriceCar::class.java)
+            .build()
+        val moshi = Moshi.Builder()
+            .add(jsonApiAdapterFactory)
+            .add(KotlinJsonAdapterFactory())
+            .build()
+        fun create(
+            apikey: String,
+            baseurl: String = "https://api.chargeprice.app/v1/",
+            context: Context? = null
+        ): ChargepriceApi {
+            val client = OkHttpClient.Builder().apply {
+                addInterceptor { chain ->
+                    // add API key to every request
+                    val original = chain.request()
+                    val new = original.newBuilder()
+                        .header("API-Key", apikey)
+                        .header("Content-Type", "application/json")
+                        .build()
+                    chain.proceed(new)
+                }
+                if (BuildConfig.DEBUG) {
+                    addNetworkInterceptor(StethoInterceptor())
+                }
+                if (context != null) {
+                    cache(Cache(context.getCacheDir(), cacheSize))
+                }
+            }.build()
+
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseurl)
+                .addConverterFactory(JsonApiConverterFactory.create(moshi))
+                .client(client)
+                .build()
+            return retrofit.create(ChargepriceApi::class.java)
+        }
+    }
+}

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

@@ -0,0 +1,321 @@
+package net.vonforst.evmap.api.chargeprice
+
+import android.content.Context
+import com.squareup.moshi.Json
+import moe.banana.jsonapi2.HasMany
+import moe.banana.jsonapi2.HasOne
+
+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.ui.currency
+import kotlin.math.ceil
+import kotlin.math.floor
+
+
+@JsonApi(type = "charge_price_request")
+class ChargepriceRequest : Resource() {
+    @field:Json(name = "data_adapter")
+    lateinit var dataAdapter: String
+    lateinit var station: ChargepriceStation
+    lateinit var options: ChargepriceOptions
+    var tariffs: HasMany<ChargepriceTariff>? = null
+    var vehicle: HasOne<ChargepriceCar>? = null
+}
+
+data class ChargepriceStation(
+    val longitude: Double,
+    val latitude: Double,
+    val country: String?,
+    val network: String?,
+    @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepoint>
+) {
+    companion object {
+        fun fromGoingelectric(
+            geCharger: ChargeLocation,
+            compatibleConnectors: List<String>
+        ): ChargepriceStation {
+            return ChargepriceStation(
+                geCharger.coordinates.lng,
+                geCharger.coordinates.lat,
+                geCharger.address.country,
+                geCharger.network,
+                geCharger.chargepoints.filter {
+                    it.type in compatibleConnectors
+                }.map {
+                    ChargepriceChargepoint(it.power, it.type)
+                }
+            )
+        }
+    }
+}
+
+data class ChargepriceChargepoint(
+    val power: Double,
+    val plug: String
+)
+
+data class ChargepriceOptions(
+    @Json(name = "max_monthly_fees") val maxMonthlyFees: Double? = null,
+    val energy: Double? = null,
+    val duration: Int? = null,
+    @Json(name = "battery_range") val batteryRange: List<Double>? = null,
+    @Json(name = "car_ac_phases") val carAcPhases: Int? = null,
+    val currency: String? = null,
+    @Json(name = "start_time") val startTime: Int? = null,
+    @Json(name = "allow_unbalanced_load") val allowUnbalancedLoad: Boolean? = null,
+    @Json(name = "provider_customer_tariffs") val providerCustomerTariffs: Boolean? = null
+)
+
+@JsonApi(type = "tariff")
+class ChargepriceTariff() : Resource() {
+    lateinit var provider: String
+    lateinit var name: String
+    @field:Json(name = "direct_payment")
+    var directPayment: Boolean = false
+    @field:Json(name = "provider_customer_tariff")
+    var providerCustomerTariff: Boolean = false
+    @field:Json(name = "supported_cuntries")
+    lateinit var supportedCountries: Set<String>
+    @field:Json(name = "charge_card_id")
+    lateinit var chargeCardId: String  // GE charge card ID
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        other as ChargepriceTariff
+
+        if (provider != other.provider) return false
+        if (name != other.name) return false
+        if (directPayment != other.directPayment) return false
+        if (providerCustomerTariff != other.providerCustomerTariff) return false
+        if (supportedCountries != other.supportedCountries) return false
+        if (chargeCardId != other.chargeCardId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + provider.hashCode()
+        result = 31 * result + name.hashCode()
+        result = 31 * result + directPayment.hashCode()
+        result = 31 * result + providerCustomerTariff.hashCode()
+        result = 31 * result + supportedCountries.hashCode()
+        result = 31 * result + chargeCardId.hashCode()
+        return result
+    }
+}
+
+@JsonApi(type = "car")
+class ChargepriceCar : Resource() {
+    lateinit var name: String
+    lateinit var brand: String
+
+    @field:Json(name = "dc_charge_ports")
+    lateinit var dcChargePorts: List<String>
+    lateinit var manufacturer: HasOne<ChargepriceBrand>
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        other as ChargepriceCar
+
+        if (name != other.name) return false
+        if (brand != other.brand) return false
+        if (dcChargePorts != other.dcChargePorts) return false
+        if (manufacturer != other.manufacturer) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + name.hashCode()
+        result = 31 * result + brand.hashCode()
+        result = 31 * result + dcChargePorts.hashCode()
+        result = 31 * result + manufacturer.hashCode()
+        return result
+    }
+}
+
+@JsonApi(type = "brand")
+class ChargepriceBrand : Resource()
+
+@JsonApi(type = "charge_price")
+class ChargePrice : Resource(), Equatable, Cloneable {
+    lateinit var provider: String
+
+    @field:Json(name = "tariff_name")
+    lateinit var tariffName: String
+    lateinit var url: String
+
+    @field:Json(name = "monthly_min_sales")
+    var monthlyMinSales: Double = 0.0
+
+    @field:Json(name = "total_monthly_fee")
+    var totalMonthlyFee: Double = 0.0
+
+    @field:Json(name = "flat_rate")
+    var flatRate: Boolean = false
+
+    @field:Json(name = "direct_payment")
+    var directPayment: Boolean = false
+
+    @field:Json(name = "provider_customer_tariff")
+    var providerCustomerTariff: Boolean = false
+    lateinit var currency: String
+
+    @field:Json(name = "start_time")
+    var startTime: Int = 0
+    lateinit var tags: List<ChargepriceTag>
+
+    @field:Json(name = "charge_point_prices")
+    lateinit var chargepointPrices: List<ChargepointPrice>
+
+    var tariff: HasOne<ChargepriceTariff>? = null
+
+
+    fun formatMonthlyFees(ctx: Context): String {
+        return listOfNotNull(
+            if (totalMonthlyFee > 0) {
+                ctx.getString(R.string.chargeprice_base_fee, totalMonthlyFee, currency(currency))
+            } else null,
+            if (monthlyMinSales > 0) {
+                ctx.getString(R.string.chargeprice_min_spend, monthlyMinSales, currency(currency))
+            } else null
+        ).joinToString(", ")
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        other as ChargePrice
+
+        if (provider != other.provider) return false
+        if (tariffName != other.tariffName) return false
+        if (url != other.url) return false
+        if (monthlyMinSales != other.monthlyMinSales) return false
+        if (totalMonthlyFee != other.totalMonthlyFee) return false
+        if (flatRate != other.flatRate) return false
+        if (directPayment != other.directPayment) return false
+        if (providerCustomerTariff != other.providerCustomerTariff) return false
+        if (currency != other.currency) return false
+        if (startTime != other.startTime) return false
+        if (tags != other.tags) return false
+        if (chargepointPrices != other.chargepointPrices) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + provider.hashCode()
+        result = 31 * result + tariffName.hashCode()
+        result = 31 * result + url.hashCode()
+        result = 31 * result + monthlyMinSales.hashCode()
+        result = 31 * result + totalMonthlyFee.hashCode()
+        result = 31 * result + flatRate.hashCode()
+        result = 31 * result + directPayment.hashCode()
+        result = 31 * result + providerCustomerTariff.hashCode()
+        result = 31 * result + currency.hashCode()
+        result = 31 * result + startTime
+        result = 31 * result + tags.hashCode()
+        result = 31 * result + chargepointPrices.hashCode()
+        return result
+    }
+
+    public override fun clone(): ChargePrice {
+        return ChargePrice().apply {
+            chargepointPrices = this@ChargePrice.chargepointPrices
+            currency = this@ChargePrice.currency
+            directPayment = this@ChargePrice.directPayment
+            flatRate = this@ChargePrice.flatRate
+            monthlyMinSales = this@ChargePrice.monthlyMinSales
+            provider = this@ChargePrice.provider
+            providerCustomerTariff = this@ChargePrice.providerCustomerTariff
+            startTime = this@ChargePrice.startTime
+            tags = this@ChargePrice.tags
+            tariffName = this@ChargePrice.tariffName
+            totalMonthlyFee = this@ChargePrice.totalMonthlyFee
+            url = this@ChargePrice.url
+            tariff = this@ChargePrice.tariff
+        }
+    }
+}
+
+data class ChargepointPrice(
+    val power: Double,
+    val plug: String,
+    val price: Double,
+    @Json(name = "price_distribution") val priceDistribution: PriceDistribution,
+    @Json(name = "blocking_fee_start") val blockingFeeStart: Int?,
+    @Json(name = "no_price_reason") var noPriceReason: String?
+) {
+    fun formatDistribution(ctx: Context): String {
+        fun percent(value: Double): String {
+            return ctx.getString(R.string.percent_format, value * 100) + "\u00a0"
+        }
+
+        fun time(value: Int): String {
+            val h = floor(value.toDouble() / 60).toInt();
+            val min = ceil(value.toDouble() % 60).toInt();
+            if (h == 0 && min > 0) return "${min}min";
+            // be slightly sloppy (3:01 is shown as 3h) to save space
+            else if (h > 0 && (min == 0 || min == 1)) return "${h}h";
+            else return "%d:%02dh".format(h, min);
+        }
+
+        // based on https://github.com/chargeprice/chargeprice-client/blob/d420bb2f216d9ad91a210a36dd0859a368a8229a/src/views/priceList.js
+        with(priceDistribution) {
+            return listOfNotNull(
+                if (session != null && session > 0.0) {
+                    (if (session < 1) percent(session) else "") + ctx.getString(R.string.chargeprice_session_fee)
+                } else null,
+                if (kwh != null && kwh > 0.0 && !isOnlyKwh) {
+                    (if (kwh < 1) percent(kwh) else "") + ctx.getString(R.string.chargeprice_per_kwh)
+                } else null,
+                if (minute != null && minute > 0.0) {
+                    (if (minute < 1) percent(minute) else "") + ctx.getString(R.string.chargeprice_per_minute) +
+                            if (blockingFeeStart != null) {
+                                " (${
+                                    ctx.getString(
+                                        R.string.chargeprice_blocking_fee,
+                                        time(blockingFeeStart)
+                                    )
+                                })"
+                            } else ""
+                } else null,
+                if ((minute == null || minute == 0.0) && blockingFeeStart != null) {
+                    ctx.getString(R.string.chargeprice_blocking_fee, time(blockingFeeStart))
+                } else null
+            ).joinToString(" +\u00a0")
+        }
+    }
+}
+
+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)
+}
+
+data class ChargepriceTag(val kind: String, val text: String, val url: String?) : Equatable
+
+data class ChargepriceMeta(
+    @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepointMeta>
+)
+
+data class ChargepriceChargepointMeta(
+    val power: Double,
+    val plug: String,
+    val energy: Double,
+    val duration: Double
+)

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.api.goingelectric
 
+import android.util.Log
 import com.squareup.moshi.*
 import java.lang.reflect.Type
 import java.time.Instant
@@ -130,11 +131,18 @@ internal class HoursAdapter {
             return Hours(null, null)
         } else {
             val match = regex.find(str)
-                ?: throw IllegalArgumentException("$str does not match hours format")
-            return Hours(
-                LocalTime.parse(match.groupValues[1]),
-                LocalTime.parse(match.groupValues[2])
-            )
+            if (match != null) {
+                return Hours(
+                    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(
+                    LocalTime.MIN, LocalTime.MIN
+                )
+            }
         }
     }
 

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

@@ -6,7 +6,6 @@ import com.squareup.moshi.Moshi
 import net.vonforst.evmap.BuildConfig
 import okhttp3.Cache
 import okhttp3.OkHttpClient
-import retrofit2.Call
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -16,7 +15,7 @@ import retrofit2.http.Query
 interface GoingElectricApi {
     @GET("chargepoints/")
     suspend fun getChargepoints(
-        @Query("sw_lat") swlat: Double, @Query("sw_lng") sw_lng: Double,
+        @Query("sw_lat") sw_lat: Double, @Query("sw_lng") sw_lng: Double,
         @Query("ne_lat") ne_lat: Double, @Query("ne_lng") ne_lng: Double,
         @Query("zoom") zoom: Float,
         @Query("clustering") clustering: Boolean = false,
@@ -27,6 +26,7 @@ interface GoingElectricApi {
         @Query("plugs") plugs: String? = null,
         @Query("chargecards") chargecards: String? = null,
         @Query("networks") networks: String? = null,
+        @Query("categories") categories: String? = null,
         @Query("startkey") startkey: Int? = null,
         @Query("open_twentyfourseven") open247: Boolean = false,
         @Query("barrierfree") barrierfree: Boolean = false,
@@ -34,7 +34,28 @@ interface GoingElectricApi {
     ): Response<ChargepointList>
 
     @GET("chargepoints/")
-    fun getChargepointDetail(@Query("ge_id") id: Long): Call<ChargepointList>
+    suspend fun getChargepointsRadius(
+        @Query("lat") lat: Double, @Query("lng") lng: Double,
+        @Query("radius") radius: Int,
+        @Query("zoom") zoom: Float,
+        @Query("orderby") orderby: String = "distance",
+        @Query("clustering") clustering: Boolean = false,
+        @Query("cluster_distance") clusterDistance: Int? = null,
+        @Query("freecharging") freecharging: Boolean = false,
+        @Query("freeparking") freeparking: Boolean = false,
+        @Query("min_power") minPower: Int = 0,
+        @Query("plugs") plugs: String? = null,
+        @Query("chargecards") chargecards: String? = null,
+        @Query("networks") networks: String? = null,
+        @Query("categories") categories: String? = null,
+        @Query("startkey") startkey: Int? = null,
+        @Query("open_twentyfourseven") open247: Boolean = false,
+        @Query("barrierfree") barrierfree: Boolean = false,
+        @Query("exclude_faults") excludeFaults: Boolean = false
+    ): Response<ChargepointList>
+
+    @GET("chargepoints/")
+    suspend fun getChargepointDetail(@Query("ge_id") id: Long): Response<ChargepointList>
 
     @GET("chargepoints/pluglist/")
     suspend fun getPlugs(): Response<StringList>
@@ -46,7 +67,14 @@ interface GoingElectricApi {
     suspend fun getChargeCards(): Response<ChargeCardList>
 
     companion object {
-        private val cacheSize = 10L * 1024 * 1024; // 10MB
+        private val cacheSize = 10L * 1024 * 1024 // 10MB
+
+        val moshi = Moshi.Builder()
+            .add(ChargepointListItemJsonAdapterFactory())
+            .add(JsonObjectOrFalseAdapter.Factory())
+            .add(HoursAdapter())
+            .add(InstantAdapter())
+            .build()
 
         fun create(
             apikey: String,
@@ -57,7 +85,7 @@ interface GoingElectricApi {
                 addInterceptor { chain ->
                     // add API key to every request
                     var original = chain.request()
-                    val url = original.url().newBuilder().addQueryParameter("key", apikey).build()
+                    val url = original.url.newBuilder().addQueryParameter("key", apikey).build()
                     original = original.newBuilder().url(url).build()
                     chain.proceed(original)
                 }
@@ -69,13 +97,6 @@ interface GoingElectricApi {
                 }
             }.build()
 
-            val moshi = Moshi.Builder()
-                .add(ChargepointListItemJsonAdapterFactory())
-                .add(JsonObjectOrFalseAdapter.Factory())
-                .add(HoursAdapter())
-                .add(InstantAdapter())
-                .build()
-
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseurl)
                 .addConverterFactory(MoshiConverterFactory.create(moshi))

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

@@ -8,7 +8,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
 import java.time.DayOfWeek
@@ -54,6 +54,7 @@ data class ChargeLocation(
     val url: String,
     @Embedded(prefix = "fault_report_") @JsonObjectOrFalse @Json(name = "fault_report") val faultReport: FaultReport?,
     val verified: Boolean,
+    @Json(name = "barrierfree") val barrierFree: Boolean?,
     // only shown in details:
     @JsonObjectOrFalse val operator: String?,
     @JsonObjectOrFalse @Json(name = "general_information") val generalInformation: String?,
@@ -64,11 +65,37 @@ data class ChargeLocation(
     @Embedded val openinghours: OpeningHours?,
     @Embedded val cost: Cost?
 ) : ChargepointListItem(), Equatable {
+    /**
+     * maximum power available from this charger.
+     */
     val maxPower: Double
         get() {
-            return chargepoints.map { it.power }.max() ?: 0.0
+            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
      *
@@ -86,6 +113,9 @@ data class ChargeLocation(
             }
         }
 
+    val totalChargepoints: Int
+        get() = chargepoints.sumBy { it.count }
+
     fun formatChargepoints(): String {
         return chargepointsMerged.map {
             "${it.count} × ${it.type} ${it.formatPower()}"
@@ -100,14 +130,16 @@ data class Cost(
     @JsonObjectOrFalse @Json(name = "description_short") val descriptionShort: String?,
     @JsonObjectOrFalse @Json(name = "description_long") val descriptionLong: String?
 ) {
-    fun getStatusText(ctx: Context): CharSequence {
-        return HtmlCompat.fromHtml(
-            ctx.getString(
-                R.string.cost_detail,
-                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid),
-                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
-            ), 0
-        )
+    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)
+        }
     }
 }
 
@@ -266,6 +298,7 @@ data class Chargepoint(val type: String, val power: Double, val count: Int) : Eq
         const val SUPERCHARGER = "Tesla Supercharger"
         const val CEE_BLAU = "CEE Blau"
         const val CEE_ROT = "CEE Rot"
+        const val TESLA_ROADSTER_HPC = "Tesla HPC"
     }
 }
 

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

@@ -59,6 +59,14 @@ class AboutFragment : PreferenceFragmentCompat() {
                 findNavController().navigate(R.id.action_about_to_donateFragment)
                 true
             }
+            "twitter" -> {
+                (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url))
+                true
+            }
+            "goingelectric" -> {
+                (activity as? MapsActivity)?.openUrl(getString(R.string.goingelectric_forum_url))
+                true
+            }
             else -> super.onPreferenceTreeClick(preference)
         }
     }

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

@@ -0,0 +1,212 @@
+package net.vonforst.evmap.fragment
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+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.ui.setupWithNavController
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+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.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.databinding.FragmentChargepriceBinding
+import net.vonforst.evmap.viewmodel.ChargepriceViewModel
+import net.vonforst.evmap.viewmodel.Status
+import net.vonforst.evmap.viewmodel.viewModelFactory
+import java.text.NumberFormat
+
+class ChargepriceFragment : DialogFragment() {
+    private lateinit var binding: FragmentChargepriceBinding
+    private var connectionErrorSnackbar: Snackbar? = null
+
+    private val vm: ChargepriceViewModel by viewModels(factoryProducer = {
+        viewModelFactory {
+            ChargepriceViewModel(
+                requireActivity().application,
+                getString(R.string.chargeprice_key)
+            )
+        }
+    })
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        dialog?.window?.attributes?.windowAnimations = R.style.ChargepriceDialogAnimation
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = DataBindingUtil.inflate(
+            inflater,
+            R.layout.fragment_chargeprice, container, false
+        )
+        binding.lifecycleOwner = this
+        binding.vm = vm
+
+        binding.toolbar.inflateMenu(R.menu.chargeprice)
+        binding.toolbar.setTitle(R.string.chargeprice_title)
+
+        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()
+        )
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    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)!!)!!
+        vm.charger.value = charger
+        if (vm.chargepoint.value == null) {
+            vm.chargepoint.value = charger.chargepointsMerged.get(0)
+        }
+
+        val chargepriceAdapter = ChargepriceAdapter().apply {
+            onClickListener = {
+                (requireActivity() as MapsActivity).openUrl(it.url)
+            }
+        }
+        binding.chargePricesList.apply {
+            adapter = chargepriceAdapter
+            layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            addItemDecoration(
+                DividerItemDecoration(
+                    context, LinearLayoutManager.VERTICAL
+                )
+            )
+        }
+        vm.chargepriceMetaForChargepoint.observe(viewLifecycleOwner) {
+            chargepriceAdapter.meta = it?.data
+        }
+        vm.myTariffs.observe(viewLifecycleOwner) {
+            chargepriceAdapter.myTariffs = it
+        }
+        vm.myTariffsAll.observe(viewLifecycleOwner) {
+            chargepriceAdapter.myTariffsAll = it
+        }
+
+        val connectorsAdapter = CheckableConnectorAdapter()
+
+        val observer: Observer<Chargepoint> = Observer {
+            connectorsAdapter.setCheckedItem(it)
+        }
+        vm.chargepoint.observe(viewLifecycleOwner, observer)
+        connectorsAdapter.onCheckedItemChangedListener = {
+            vm.chargepoint.removeObserver(observer)
+            vm.chargepoint.value = it
+            vm.chargepoint.observe(viewLifecycleOwner, observer)
+        }
+
+        vm.vehicleCompatibleConnectors.observe(viewLifecycleOwner) {
+            connectorsAdapter.enabledConnectors = it
+        }
+
+        binding.connectorsList.apply {
+            adapter = connectorsAdapter
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+        }
+
+        binding.imgChargepriceLogo.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=going_electric")
+        }
+
+        binding.btnSettings.setOnClickListener {
+            navController.navigate(R.id.action_chargeprice_to_settingsFragment)
+        }
+
+        binding.batteryRange.setLabelFormatter { value: Float ->
+            val fmt = NumberFormat.getNumberInstance()
+            fmt.maximumFractionDigits = 0
+            fmt.format(value.toDouble()) + "%"
+        }
+        binding.batteryRange.setOnTouchListener { _: View, motionEvent: MotionEvent ->
+            when (motionEvent.actionMasked) {
+                MotionEvent.ACTION_DOWN -> vm.batteryRangeSliderDragging.value = true
+                MotionEvent.ACTION_UP -> vm.batteryRangeSliderDragging.value = false
+            }
+            false
+        }
+
+        binding.toolbar.setOnMenuItemClickListener {
+            when (it.itemId) {
+                R.id.menu_close -> {
+                    dismiss()
+                    true
+                }
+                else -> false
+            }
+        }
+
+        vm.chargePricesForChargepoint.observe(viewLifecycleOwner) { res ->
+            when (res?.status) {
+                Status.ERROR -> {
+                    if (vm.vehicle.value == null) return@observe
+                    connectionErrorSnackbar?.dismiss()
+                    connectionErrorSnackbar = Snackbar
+                        .make(
+                            view,
+                            R.string.chargeprice_connection_error,
+                            Snackbar.LENGTH_INDEFINITE
+                        )
+                        .setAction(R.string.retry) {
+                            connectionErrorSnackbar?.dismiss()
+                            vm.loadPrices()
+                        }
+                    connectionErrorSnackbar!!.show()
+                }
+                Status.SUCCESS, null -> {
+                    connectionErrorSnackbar?.dismiss()
+                }
+                Status.LOADING -> {
+                }
+            }
+        }
+    }
+
+    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)
+                )
+            }
+        }
+    }
+}

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

@@ -2,7 +2,6 @@ package net.vonforst.evmap.fragment
 
 import android.Manifest
 import android.content.pm.PackageManager
-import android.location.Location
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -16,9 +15,9 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
-import com.google.android.libraries.maps.model.LatLng
+import com.car2go.maps.model.LatLng
+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.FavoritesAdapter
@@ -26,9 +25,9 @@ import net.vonforst.evmap.databinding.FragmentFavoritesBinding
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
-class FavoritesFragment : Fragment() {
+class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
     private lateinit var binding: FragmentFavoritesBinding
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
+    private lateinit var locationClient: LostApiClient
 
     private val vm: FavoritesViewModel by viewModels(factoryProducer = {
         viewModelFactory {
@@ -51,7 +50,8 @@ class FavoritesFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.vm = vm
 
-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(requireContext())
+        locationClient = LostApiClient.Builder(requireContext())
+            .addConnectionCallbacks(this).build()
 
         return binding.root
     }
@@ -82,16 +82,24 @@ class FavoritesFragment : Fragment() {
             )
         }
 
+        locationClient.connect()
+    }
+
+    override fun onConnected() {
+        val context = this.context ?: return
         if (ContextCompat.checkSelfPermission(
-                requireContext(),
+                context,
                 Manifest.permission.ACCESS_FINE_LOCATION
             ) == PackageManager.PERMISSION_GRANTED
         ) {
-            fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-                if (location != null) {
-                    vm.location.value = LatLng(location.latitude, location.longitude)
-                }
+            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
+            if (location != null) {
+                vm.location.value = LatLng(location.latitude, location.longitude)
             }
         }
     }
+
+    override fun onConnectionSuspended() {
+
+    }
 }

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

@@ -17,9 +17,11 @@ import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.FiltersAdapter
 import net.vonforst.evmap.databinding.FragmentFilterBinding
+import net.vonforst.evmap.ui.showEditTextDialog
 import net.vonforst.evmap.viewmodel.FilterViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
+
 class FilterFragment : Fragment() {
     private lateinit var binding: FragmentFilterBinding
     private val vm: FilterViewModel by viewModels(factoryProducer = {
@@ -35,13 +37,15 @@ class FilterFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_filter, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
 
         setHasOptionsMenu(true)
 
+        vm.filterProfile.observe(viewLifecycleOwner) {}
+
         return binding.root
     }
 
@@ -85,6 +89,26 @@ class FilterFragment : Fragment() {
                 }
                 true
             }
+            R.id.menu_save_profile -> {
+                showEditTextDialog(requireContext()) { dialog, input ->
+                    vm.filterProfile.value?.let { profile ->
+                        input.setText(profile.name)
+                    }
+
+                    dialog.setTitle(R.string.save_as_profile)
+                        .setMessage(R.string.save_profile_enter_name)
+                        .setPositiveButton(R.string.ok) { di, button ->
+                            lifecycleScope.launch {
+                                vm.saveAsProfile(input.text.toString())
+                                findNavController().popBackStack()
+                            }
+                        }
+                        .setNegativeButton(R.string.cancel) { di, button ->
+
+                        }
+                }
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }

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

@@ -0,0 +1,255 @@
+package net.vonforst.evmap.fragment
+
+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 android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+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.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.launch
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.DataBindingAdapter
+import net.vonforst.evmap.adapter.FilterProfilesAdapter
+import net.vonforst.evmap.databinding.FragmentFilterProfilesBinding
+import net.vonforst.evmap.databinding.ItemFilterProfileBinding
+import net.vonforst.evmap.storage.FilterProfile
+import net.vonforst.evmap.ui.showEditTextDialog
+import net.vonforst.evmap.viewmodel.FilterProfilesViewModel
+import net.vonforst.evmap.viewmodel.viewModelFactory
+
+
+class FilterProfilesFragment : Fragment() {
+    private lateinit var touchHelper: ItemTouchHelper
+    private lateinit var adapter: FilterProfilesAdapter
+    private lateinit var binding: FragmentFilterProfilesBinding
+    private val vm: FilterProfilesViewModel by viewModels(factoryProducer = {
+        viewModelFactory {
+            FilterProfilesViewModel(requireActivity().application)
+        }
+    })
+    private var deleteSnackbar: Snackbar? = null
+    private var toDelete: FilterProfile? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentFilterProfilesBinding.inflate(inflater, container, false)
+        binding.lifecycleOwner = this
+        binding.vm = vm
+
+        return binding.root
+    }
+
+    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
+        )
+
+
+        touchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
+            ItemTouchHelper.UP or ItemTouchHelper.DOWN,
+            ItemTouchHelper.RIGHT or ItemTouchHelper.LEFT
+        ) {
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                val fromPos = viewHolder.adapterPosition;
+                val toPos = target.adapterPosition;
+
+                val list = vm.filterProfiles.value?.toMutableList()
+                if (list != null) {
+                    val item = list[fromPos]
+                    list.removeAt(fromPos)
+                    list.add(toPos, item)
+                    list.forEachIndexed { index, filterProfile ->
+                        filterProfile.order = index
+                    }
+                    vm.reorderProfiles(list)
+                }
+
+
+                return true
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                val fp = vm.filterProfiles.value?.find { it.id == viewHolder.itemId }
+                fp?.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 ItemFilterProfileBinding
+                    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 ItemFilterProfileBinding
+                    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 ItemFilterProfileBinding
+                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 ItemFilterProfileBinding
+                    getDefaultUIUtil().onDraw(
+                        c, recyclerView, binding.foreground, dX, dY,
+                        actionState, isCurrentlyActive
+                    )
+                } else {
+                    super.onChildDraw(
+                        c,
+                        recyclerView,
+                        viewHolder,
+                        dX,
+                        dY,
+                        actionState,
+                        isCurrentlyActive
+                    )
+                }
+            }
+        })
+
+        adapter = FilterProfilesAdapter(touchHelper, onDelete = { fp ->
+            delete(fp)
+        }, onRename = { fp ->
+            showEditTextDialog(requireContext()) { dialog, input ->
+                input.setText(fp.name)
+
+                dialog.setTitle(R.string.rename)
+                    .setMessage(R.string.save_profile_enter_name)
+                    .setPositiveButton(R.string.ok) { di, button ->
+                        lifecycleScope.launch {
+                            vm.update(fp.copy(name = input.text.toString()))
+                        }
+                    }
+                    .setNegativeButton(R.string.cancel) { di, button ->
+
+                    }
+            }
+        })
+        binding.filterProfilesList.apply {
+            this.adapter = this@FilterProfilesFragment.adapter
+            layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            addItemDecoration(
+                DividerItemDecoration(
+                    context, LinearLayoutManager.VERTICAL
+                )
+            )
+        }
+
+        touchHelper.attachToRecyclerView(binding.filterProfilesList)
+
+        toolbar.setNavigationOnClickListener {
+            findNavController().popBackStack()
+        }
+    }
+
+    fun delete(fp: FilterProfile) {
+        val position = vm.filterProfiles.value?.indexOf(fp) ?: return
+        // if there is already a profile to delete, delete it now
+        actuallyDelete()
+        deleteSnackbar?.dismiss()
+
+        toDelete = fp
+
+        view?.let {
+            val snackbar = Snackbar.make(
+                it,
+                getString(R.string.deleted_filterprofile, fp.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.delete(it.id) }
+        toDelete = null
+    }
+
+    override fun onStop() {
+        super.onStop()
+        actuallyDelete()
+    }
+}

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

@@ -12,6 +12,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionInflater
 import androidx.viewpager2.widget.ViewPager2
+import coil.memory.MemoryCache
 import com.ortiz.touchview.TouchImageView
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.GalleryAdapter
@@ -24,18 +25,23 @@ class GalleryFragment : Fragment() {
     companion object {
         private const val EXTRA_POSITION = "position"
         private const val EXTRA_PHOTOS = "photos"
+        private const val EXTRA_IMAGE_CACHE_KEY = "image_cache_key"
         private const val SAVED_CURRENT_PAGE_POSITION = "current_page_position"
 
-        fun buildArgs(photos: List<ChargerPhoto>, position: Int): Bundle {
+        fun buildArgs(
+            photos: List<ChargerPhoto>,
+            position: Int,
+            imageCacheKey: MemoryCache.Key?
+        ): Bundle {
             return Bundle().apply {
                 putParcelableArrayList(EXTRA_PHOTOS, ArrayList(photos))
                 putInt(EXTRA_POSITION, position)
+                putParcelable(EXTRA_IMAGE_CACHE_KEY, imageCacheKey)
             }
         }
     }
 
     private lateinit var binding: FragmentGalleryBinding
-    private var isReturning: Boolean = false
     private var startingPosition: Int = 0
     private var currentPosition: Int = 0
     private lateinit var galleryAdapter: GalleryAdapter
@@ -49,7 +55,6 @@ class GalleryFragment : Fragment() {
             if (image != null && image.currentZoom !in 0.95f..1.05f) {
                 image.setZoomAnimated(1f, 0.5f, 0.5f)
             } else {
-                isReturning = true
                 galleryVm.galleryPosition.value = currentPosition
                 findNavController().popBackStack()
             }
@@ -73,10 +78,13 @@ class GalleryFragment : Fragment() {
             savedInstanceState?.getInt(SAVED_CURRENT_PAGE_POSITION) ?: startingPosition
 
         galleryAdapter =
-            GalleryAdapter(requireContext(), detailView = true, pageToLoad = currentPosition) {
+            GalleryAdapter(
+                requireContext(), detailView = true, pageToLoad = currentPosition,
+                imageCacheKey = args.getParcelable(EXTRA_IMAGE_CACHE_KEY)
+            ) {
                 startPostponedEnterTransition()
             }
-        binding.gallery.setPageTransformer { page, position ->
+        binding.gallery.setPageTransformer { page, _ ->
             val v = page as TouchImageView
             currentPage = v
         }
@@ -120,10 +128,8 @@ class GalleryFragment : Fragment() {
             names: MutableList<String>,
             sharedElements: MutableMap<String, View>
         ) {
-            if (isReturning) {
-                val currentPage = currentPage ?: return
-                sharedElements[names[0]] = currentPage
-            }
+            val currentPage = currentPage ?: return
+            sharedElements[names[0]] = currentPage
         }
     }
 

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

@@ -7,10 +7,10 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.widget.doAfterTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.dialog_multi_select.*
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DataBindingAdapter
 import net.vonforst.evmap.adapter.Equatable
+import net.vonforst.evmap.databinding.DialogMultiSelectBinding
 import java.util.*
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
@@ -20,13 +20,15 @@ class MultiSelectDialog : AppCompatDialogFragment() {
         fun getInstance(
             title: String,
             data: Map<String, String>,
-            selected: Set<String>
+            selected: Set<String>,
+            commonChoices: Set<String>?
         ): MultiSelectDialog {
             val dialog = MultiSelectDialog()
             dialog.arguments = Bundle().apply {
                 putString("title", title)
                 putSerializable("data", HashMap(data))
                 putSerializable("selected", HashSet(selected))
+                if (commonChoices != null) putSerializable("commonChoices", HashSet(commonChoices))
             }
             return dialog
         }
@@ -35,13 +37,15 @@ class MultiSelectDialog : AppCompatDialogFragment() {
     var okListener: ((Set<String>) -> Unit)? = null
     var cancelListener: (() -> Unit)? = null
     private lateinit var items: List<MultiSelectItem>
+    private lateinit var binding: DialogMultiSelectBinding
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.dialog_multi_select, container)
+    ): View {
+        binding = DialogMultiSelectBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onStart() {
@@ -55,60 +59,65 @@ class MultiSelectDialog : AppCompatDialogFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val data = requireArguments().getSerializable("data") as HashMap<String, String>
-        val selected = requireArguments().getSerializable("selected") as HashSet<String>
-        val title = requireArguments().getString("title")
+        val args = requireArguments()
+        val data = args.getSerializable("data") as HashMap<String, String>
+        val selected = args.getSerializable("selected") as HashSet<String>
+        val title = args.getString("title")
+        val commonChoices = if (args.containsKey("commonChoices")) {
+            args.getSerializable("commonChoices") as HashSet<String>
+        } else null
 
-        dialogTitle.text = title
+        binding.dialogTitle.text = title
         val adapter = Adapter()
-        list.adapter = adapter
-        list.layoutManager = LinearLayoutManager(view.context)
+        binding.list.adapter = adapter
+        binding.list.layoutManager = LinearLayoutManager(view.context)
 
-        items = data.entries.toList().sortedBy { it.key }.map {
-            MultiSelectItem(it.key, it.value, it.key in selected)
-        }
+        items = data.entries.toList()
+            .sortedBy { it.value.toLowerCase(Locale.getDefault()) }
+            .sortedByDescending { commonChoices?.contains(it.key) == true }
+            .map { MultiSelectItem(it.key, it.value, it.key in selected) }
         adapter.submitList(items)
 
-        etSearch.doAfterTextChanged { text ->
+        binding.etSearch.doAfterTextChanged { text ->
             adapter.submitList(search(items, text.toString()))
         }
 
-        btnCancel.setOnClickListener {
+        binding.btnCancel.setOnClickListener {
             cancelListener?.let { listener ->
                 listener()
             }
             dismiss()
         }
-        btnOK.setOnClickListener {
+        binding.btnOK.setOnClickListener {
             okListener?.let { listener ->
                 val result = items.filter { it.selected }.map { it.key }.toSet()
                 listener(result)
             }
             dismiss()
         }
-        btnAll.setOnClickListener {
+        binding.btnAll.setOnClickListener {
             items = items.map { MultiSelectItem(it.key, it.name, true) }
-            adapter.submitList(search(items, etSearch.text.toString()))
+            adapter.submitList(search(items, binding.etSearch.text.toString()))
         }
-        btnNone.setOnClickListener {
+        binding.btnNone.setOnClickListener {
             items = items.map { MultiSelectItem(it.key, it.name, false) }
-            adapter.submitList(search(items, etSearch.text.toString()))
+            adapter.submitList(search(items, binding.etSearch.text.toString()))
         }
     }
-
-    private fun search(
-        items: List<MultiSelectItem>,
-        text: String
-    ): List<MultiSelectItem> {
-        return items.filter { item ->
-            // search for string within name
-            text.toLowerCase(Locale.getDefault()) in item.name.toLowerCase(Locale.getDefault())
-        }
-    }
-
-    class Adapter() : DataBindingAdapter<MultiSelectItem>({ it.key }) {
-        override fun getItemViewType(position: Int) = R.layout.dialog_multi_select_item
-    }
+}
+
+private fun search(
+    items: List<MultiSelectItem>,
+    text: String
+): List<MultiSelectItem> {
+    return items.filter { item ->
+        // search for string within name
+        text.toLowerCase(Locale.getDefault()) in item.name.toLowerCase(Locale.getDefault())
+    }
+}
+
+class Adapter() : DataBindingAdapter<MultiSelectItem>({ it.key }) {
+    override fun getItemViewType(position: Int) = R.layout.dialog_multi_select_item
 }
 
 data class MultiSelectItem(val key: String, val name: String, var selected: Boolean) : Equatable

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

@@ -4,25 +4,88 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.updateNightMode
+import net.vonforst.evmap.viewmodel.SettingsViewModel
+import net.vonforst.evmap.viewmodel.viewModelFactory
 
 
 class SettingsFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
+    private lateinit var prefs: PreferenceDataSource
+
+    private val vm: SettingsViewModel by viewModels(factoryProducer = {
+        viewModelFactory {
+            SettingsViewModel(
+                requireActivity().application,
+                getString(R.string.chargeprice_key)
+            )
+        }
+    })
+
+    private lateinit var myVehiclePreference: ListPreference
+    private lateinit var myTariffsPreference: MultiSelectListPreference
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val toolbar = view.findViewById(R.id.toolbar) as Toolbar
+        prefs = PreferenceDataSource(requireContext())
 
         val navController = findNavController()
         toolbar.setupWithNavController(
             navController,
             (requireActivity() as MapsActivity).appBarConfiguration
         )
+
+        myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
+        myVehiclePreference.isEnabled = false
+        vm.vehicles.observe(viewLifecycleOwner) { res ->
+            res.data?.let { cars ->
+                val sortedCars = cars.sortedBy { it.brand }
+                myVehiclePreference.entryValues = sortedCars.map { it.id }.toTypedArray()
+                myVehiclePreference.entries =
+                    sortedCars.map { "${it.brand} ${it.name}" }.toTypedArray()
+                myVehiclePreference.isEnabled = true
+                myVehiclePreference.summary = cars.find { it.id == prefs.chargepriceMyVehicle }
+                    ?.let { "${it.brand} ${it.name}" }
+            }
+        }
+
+        myTariffsPreference = findPreference("chargeprice_my_tariffs")!!
+        myTariffsPreference.isEnabled = false
+        vm.tariffs.observe(viewLifecycleOwner) { res ->
+            res.data?.let { tariffs ->
+                myTariffsPreference.entryValues = tariffs.map { it.id }.toTypedArray()
+                myTariffsPreference.entries = tariffs.map {
+                    if (!it.name.startsWith(it.provider)) {
+                        "${it.provider} ${it.name}"
+                    } else {
+                        it.name
+                    }
+                }.toTypedArray()
+                myTariffsPreference.isEnabled = true
+                updateMyTariffsSummary()
+            }
+        }
+    }
+
+    private fun updateMyTariffsSummary() {
+        myTariffsPreference.summary = if (prefs.chargepriceMyTariffsAll) {
+            getString(R.string.chargeprice_all_tariffs_selected)
+        } else {
+            val n = prefs.chargepriceMyTariffs?.size ?: 0
+            requireContext().resources
+                .getQuantityString(R.plurals.chargeprice_some_tariffs_selected, n, n)
+        }
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -43,6 +106,21 @@ class SettingsFragment : PreferenceFragmentCompat(),
                     it.startActivity(it.intent);
                 }
             }
+            "darkmode" -> {
+                updateNightMode(prefs)
+            }
+            "chargeprice_my_vehicle" -> {
+                vm.vehicles.value?.data?.let { cars ->
+                    val vehicle = cars.find { it.id == prefs.chargepriceMyVehicle }
+                    vehicle?.let {
+                        myVehiclePreference.summary = "${it.brand} ${it.name}"
+                        prefs.chargepriceMyVehicleDcChargeports = it.dcChargePorts
+                    }
+                }
+            }
+            "chargeprice_my_tariffs" -> {
+                updateMyTariffsSummary()
+            }
         }
     }
 

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

@@ -0,0 +1,42 @@
+package net.vonforst.evmap.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatDialogFragment
+import net.vonforst.evmap.databinding.DialogWelcomeBinding
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+class WelcomeDialogFragment : AppCompatDialogFragment() {
+    private lateinit var binding: DialogWelcomeBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = DialogWelcomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.btnOk.setOnClickListener {
+            val prefs = PreferenceDataSource(requireContext())
+            prefs.welcomeDialogShown = true
+            prefs.update060AndroidAutoDialogShown = true
+            dismiss()
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.WRAP_CONTENT
+        )
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/Update060AndroidAutoDialogFramgent.kt

@@ -0,0 +1,40 @@
+package net.vonforst.evmap.fragment.updatedialogs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatDialogFragment
+import net.vonforst.evmap.databinding.DialogUpdate060AndroidautoBinding
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+class Update060AndroidAutoDialogFramgent : AppCompatDialogFragment() {
+    private lateinit var binding: DialogUpdate060AndroidautoBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = DialogUpdate060AndroidautoBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.btnOk.setOnClickListener {
+            PreferenceDataSource(requireContext()).update060AndroidAutoDialogShown = true
+            dismiss()
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.WRAP_CONTENT
+        )
+    }
+}

app/src/main/java/net/vonforst/evmap/navigation/ChromeCustomTabsNavigator.kt

@@ -0,0 +1,55 @@
+package net.vonforst.evmap.navigation
+
+import android.app.Activity
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.util.AttributeSet
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.navigation.NavDestination
+import androidx.navigation.NavOptions
+import androidx.navigation.Navigator
+import net.vonforst.evmap.R
+
+@Navigator.Name("chrome")
+class ChromeCustomTabsNavigator(
+    private val context: Context
+) : Navigator<ChromeCustomTabsNavigator.Destination>() {
+
+    override fun createDestination() =
+        Destination(this)
+
+    override fun navigate(
+        destination: Destination,
+        args: Bundle?,
+        navOptions: NavOptions?,
+        navigatorExtras: Extras?
+    ): NavDestination? {
+        val intent = CustomTabsIntent.Builder()
+            .setDefaultColorSchemeParams(
+                CustomTabColorSchemeParams.Builder()
+                    .setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary))
+                    .build()
+            )
+            .build()
+        intent.launchUrl(context, destination.url!!)
+        return null // Do not add to the back stack, managed by Chrome Custom Tabs
+    }
+
+    override fun popBackStack() = true // Managed by Chrome Custom Tabs
+
+    @NavDestination.ClassType(Activity::class)
+    class Destination(navigator: Navigator<out NavDestination>) : NavDestination(navigator) {
+        var url: Uri? = null
+
+        override fun onInflate(context: Context, attrs: AttributeSet) {
+            super.onInflate(context, attrs)
+            context.withStyledAttributes(attrs, R.styleable.ChromeCustomTabsNavigator, 0, 0) {
+                url = Uri.parse(getString(R.styleable.ChromeCustomTabsNavigator_url))
+            }
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/navigation/NavHostFragment.kt

@@ -0,0 +1,15 @@
+package net.vonforst.evmap.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+
+class NavHostFragment : NavHostFragment() {
+    override fun onCreateNavController(navController: NavController) {
+        super.onCreateNavController(navController)
+        navController.navigatorProvider.addNavigator(
+            ChromeCustomTabsNavigator(
+                requireContext()
+            )
+        )
+    }
+}

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

@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.goingelectric.ChargeCard
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 
@@ -35,13 +36,19 @@ class ChargeCardRepository(
     private suspend fun updateChargeCards() {
         if (Duration.between(prefs.lastChargeCardUpdate, Instant.now()) < Duration.ofDays(1)) return
 
-        val response = api.getChargeCards()
-        if (!response.isSuccessful) return
+        try {
+            val response = api.getChargeCards()
+            if (!response.isSuccessful) return
 
-        for (card in response.body()!!.result) {
-            dao.insert(card)
+            for (card in response.body()!!.result) {
+                dao.insert(card)
+            }
+
+            prefs.lastChargeCardUpdate = Instant.now()
+        } catch (e: IOException) {
+            // ignore, and retry next time
+            e.printStackTrace()
+            return
         }
-
-        prefs.lastChargeCardUpdate = Instant.now()
     }
 }

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

@@ -14,4 +14,7 @@ interface ChargeLocationsDao {
 
     @Query("SELECT * FROM chargelocation")
     fun getAllChargeLocations(): LiveData<List<ChargeLocation>>
+
+    @Query("SELECT * FROM chargelocation")
+    suspend fun getAllChargeLocationsAsync(): List<ChargeLocation>
 }

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

@@ -10,6 +10,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import net.vonforst.evmap.api.goingelectric.ChargeCard
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.viewmodel.BooleanFilterValue
+import net.vonforst.evmap.viewmodel.FILTERS_CUSTOM
 import net.vonforst.evmap.viewmodel.MultipleChoiceFilterValue
 import net.vonforst.evmap.viewmodel.SliderFilterValue
 
@@ -19,15 +20,17 @@ import net.vonforst.evmap.viewmodel.SliderFilterValue
         BooleanFilterValue::class,
         MultipleChoiceFilterValue::class,
         SliderFilterValue::class,
+        FilterProfile::class,
         Plug::class,
         Network::class,
         ChargeCard::class
-    ], version = 8
+    ], version = 11
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun chargeLocationsDao(): ChargeLocationsDao
     abstract fun filterValueDao(): FilterValueDao
+    abstract fun filterProfileDao(): FilterProfileDao
     abstract fun plugDao(): PlugDao
     abstract fun networkDao(): NetworkDao
     abstract fun chargeCardDao(): ChargeCardDao
@@ -38,8 +41,14 @@ abstract class AppDatabase : RoomDatabase() {
             Room.databaseBuilder(context, AppDatabase::class.java, "evmap.db")
                 .addMigrations(
                     MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6,
-                    MIGRATION_7, MIGRATION_8
+                    MIGRATION_7, MIGRATION_8, MIGRATION_9, MIGRATION_10, MIGRATION_11
                 )
+                .addCallback(object : Callback() {
+                    override fun onCreate(db: SupportSQLiteDatabase) {
+                        // create default filter profile
+                        db.execSQL("INSERT INTO `FilterProfile` (`name`, `id`, `order`) VALUES ('FILTERS_CUSTOM', $FILTERS_CUSTOM, 0)")
+                    }
+                })
                 .build()
         }
 
@@ -120,5 +129,52 @@ abstract class AppDatabase : RoomDatabase() {
                 db.execSQL("ALTER TABLE `ChargeLocation` ADD `chargecards` TEXT")
             }
         }
+
+        private val MIGRATION_9 = object : Migration(8, 9) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.beginTransaction()
+                try {
+                    // create filter profiles table
+                    db.execSQL("CREATE TABLE IF NOT EXISTS `FilterProfile` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)")
+                    db.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_name` ON `FilterProfile` (`name`)")
+
+                    // create default filter profile
+                    db.execSQL("INSERT INTO `FilterProfile` (`name`, `id`) VALUES ('FILTERS_CUSTOM', $FILTERS_CUSTOM)")
+
+                    // add profile column to existing filtervalue tables
+                    db.execSQL("CREATE TABLE `BooleanFilterValueNew` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`), FOREIGN KEY(`profile`) REFERENCES `FilterProfile`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+                    db.execSQL("CREATE TABLE `MultipleChoiceFilterValueNew` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`), FOREIGN KEY(`profile`) REFERENCES `FilterProfile`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+                    db.execSQL("CREATE TABLE IF NOT EXISTS `SliderFilterValueNew` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`), FOREIGN KEY(`profile`) REFERENCES `FilterProfile`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )");
+
+                    for (table in listOf(
+                        "BooleanFilterValue",
+                        "MultipleChoiceFilterValue",
+                        "SliderFilterValue"
+                    )) {
+                        db.execSQL("ALTER TABLE `$table` ADD COLUMN `profile` INTEGER NOT NULL DEFAULT $FILTERS_CUSTOM")
+                        db.execSQL("INSERT INTO `${table}New` SELECT * FROM `$table`")
+                        db.execSQL("DROP TABLE `$table`")
+                        db.execSQL("ALTER TABLE `${table}New` RENAME TO `$table`")
+                    }
+
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+            }
+
+        }
+
+        private val MIGRATION_10 = object : Migration(9, 10) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `FilterProfile` ADD `order` INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+
+        private val MIGRATION_11 = object : Migration(10, 11) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `barrierFree` INTEGER")
+            }
+        }
     }
 }

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

@@ -0,0 +1,36 @@
+package net.vonforst.evmap.storage
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import net.vonforst.evmap.adapter.Equatable
+import net.vonforst.evmap.viewmodel.FILTERS_CUSTOM
+
+@Entity(
+    indices = [Index(value = ["name"], unique = true)]
+)
+data class FilterProfile(
+    val name: String,
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    var order: Int = 0
+) : Equatable
+
+@Dao
+interface FilterProfileDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(profile: FilterProfile): Long
+
+    @Update
+    suspend fun update(vararg profiles: FilterProfile)
+
+    @Delete
+    suspend fun delete(vararg profiles: FilterProfile)
+
+    @Query("SELECT * FROM filterProfile WHERE id != $FILTERS_CUSTOM ORDER BY `order` ASC, `name` ASC")
+    fun getProfiles(): LiveData<List<FilterProfile>>
+
+    @Query("SELECT * FROM filterProfile WHERE name = :name")
+    suspend fun getProfileByName(name: String): FilterProfile?
+
+    @Query("SELECT * FROM filterProfile WHERE id = :id")
+    suspend fun getProfileById(id: Long): FilterProfile?
+}

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

@@ -2,22 +2,20 @@ package net.vonforst.evmap.storage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.room.*
-import net.vonforst.evmap.viewmodel.BooleanFilterValue
-import net.vonforst.evmap.viewmodel.FilterValue
-import net.vonforst.evmap.viewmodel.MultipleChoiceFilterValue
-import net.vonforst.evmap.viewmodel.SliderFilterValue
+import net.vonforst.evmap.viewmodel.*
 
 @Dao
 abstract class FilterValueDao {
-    @Query("SELECT * FROM booleanfiltervalue")
-    protected abstract fun getBooleanFilterValues(): LiveData<List<BooleanFilterValue>>
+    @Query("SELECT * FROM booleanfiltervalue WHERE profile = :profile")
+    protected abstract fun getBooleanFilterValues(profile: Long): LiveData<List<BooleanFilterValue>>
 
-    @Query("SELECT * FROM multiplechoicefiltervalue")
-    protected abstract fun getMultipleChoiceFilterValues(): LiveData<List<MultipleChoiceFilterValue>>
+    @Query("SELECT * FROM multiplechoicefiltervalue WHERE profile = :profile")
+    protected abstract fun getMultipleChoiceFilterValues(profile: Long): LiveData<List<MultipleChoiceFilterValue>>
 
-    @Query("SELECT * FROM sliderfiltervalue")
-    protected abstract fun getSliderFilterValues(): LiveData<List<SliderFilterValue>>
+    @Query("SELECT * FROM sliderfiltervalue WHERE profile = :profile")
+    protected abstract fun getSliderFilterValues(profile: Long): LiveData<List<SliderFilterValue>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     protected abstract suspend fun insert(vararg values: BooleanFilterValue)
@@ -28,16 +26,29 @@ abstract class FilterValueDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     protected abstract suspend fun insert(vararg values: SliderFilterValue)
 
-    open fun getFilterValues(): LiveData<List<FilterValue>> =
-        MediatorLiveData<List<FilterValue>>().apply {
-            val sources = listOf(
-                getBooleanFilterValues(),
-                getMultipleChoiceFilterValues(),
-                getSliderFilterValues()
-            )
-            for (source in sources) {
-                addSource(source) {
-                    value = sources.mapNotNull { it.value }.flatten()
+    @Query("DELETE FROM booleanfiltervalue WHERE profile = :profile")
+    protected abstract suspend fun deleteBooleanFilterValuesForProfile(profile: Long)
+
+    @Query("DELETE FROM multiplechoicefiltervalue WHERE profile = :profile")
+    protected abstract suspend fun deleteMultipleChoiceFilterValuesForProfile(profile: Long)
+
+    @Query("DELETE FROM sliderfiltervalue WHERE profile = :profile")
+    protected abstract suspend fun deleteSliderFilterValuesForProfile(profile: Long)
+
+    open fun getFilterValues(filterStatus: Long): LiveData<List<FilterValue>> =
+        if (filterStatus == FILTERS_DISABLED) {
+            MutableLiveData(emptyList())
+        } else {
+            MediatorLiveData<List<FilterValue>>().apply {
+                val sources = listOf(
+                    getBooleanFilterValues(filterStatus),
+                    getMultipleChoiceFilterValues(filterStatus),
+                    getSliderFilterValues(filterStatus)
+                )
+                for (source in sources) {
+                    addSource(source) {
+                        value = sources.mapNotNull { it.value }.flatten()
+                    }
                 }
             }
         }
@@ -52,4 +63,12 @@ abstract class FilterValueDao {
             }
         }
     }
+
+    @Transaction
+    open suspend fun deleteFilterValuesForProfile(profile: Long) {
+        deleteBooleanFilterValuesForProfile(profile)
+        deleteMultipleChoiceFilterValuesForProfile(profile)
+        deleteSliderFilterValuesForProfile(profile)
+    }
+
 }

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

@@ -5,6 +5,7 @@ import androidx.room.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 
@@ -37,13 +38,19 @@ class NetworkRepository(
     private suspend fun updateNetworks() {
         if (Duration.between(prefs.lastNetworkUpdate, Instant.now()) < Duration.ofDays(1)) return
 
-        val response = api.getNetworks()
-        if (!response.isSuccessful) return
+        try {
+            val response = api.getNetworks()
+            if (!response.isSuccessful) return
 
-        for (name in response.body()!!.result) {
-            dao.insert(Network(name))
+            for (name in response.body()!!.result) {
+                dao.insert(Network(name))
+            }
+
+            prefs.lastNetworkUpdate = Instant.now()
+        } catch (e: IOException) {
+            // ignore, and retry next time
+            e.printStackTrace()
+            return
         }
-
-        prefs.lastNetworkUpdate = Instant.now()
     }
 }

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

@@ -5,6 +5,7 @@ import androidx.room.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 
@@ -37,13 +38,19 @@ class PlugRepository(
     private suspend fun updatePlugs() {
         if (Duration.between(prefs.lastPlugUpdate, Instant.now()) < Duration.ofDays(1)) return
 
-        val response = api.getPlugs()
-        if (!response.isSuccessful) return
+        try {
+            val response = api.getPlugs()
+            if (!response.isSuccessful) return
 
-        for (name in response.body()!!.result) {
-            dao.insert(Plug(name))
+            for (name in response.body()!!.result) {
+                dao.insert(Plug(name))
+            }
+
+            prefs.lastPlugUpdate = Instant.now()
+        } catch (e: IOException) {
+            // ignore, and retry next time
+            e.printStackTrace()
+            return
         }
-
-        prefs.lastPlugUpdate = Instant.now()
     }
 }

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

@@ -2,9 +2,13 @@ package net.vonforst.evmap.storage
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import com.car2go.maps.AnyMap
+import net.vonforst.evmap.R
+import net.vonforst.evmap.viewmodel.FILTERS_CUSTOM
+import net.vonforst.evmap.viewmodel.FILTERS_DISABLED
 import java.time.Instant
 
-class PreferenceDataSource(context: Context) {
+class PreferenceDataSource(val context: Context) {
     val sp = PreferenceManager.getDefaultSharedPreferences(context)
 
     var navigateUseMaps: Boolean
@@ -31,12 +35,120 @@ class PreferenceDataSource(context: Context) {
             sp.edit().putLong("last_chargecard_update", value.toEpochMilli()).apply()
         }
 
-    var filtersActive: Boolean
-        get() = sp.getBoolean("filters_active", true)
+    /**
+     * Stores the current filtering status, which is either the ID of a filter profile or
+     * one of FILTERS_DISABLED, FILTERS_CUSTOM
+     */
+    var filterStatus: Long
+        get() =
+            sp.getLong(
+                "filter_status",
+                // migration from versions before filter profiles were implemented
+                if (sp.getBoolean("filters_active", true))
+                    FILTERS_CUSTOM else FILTERS_DISABLED
+            )
         set(value) {
-            sp.edit().putBoolean("filters_active", value).apply()
+            sp.edit().putLong("filter_status", value).apply()
         }
 
+    /**
+     * Stores the last filter profile which was selected
+     * (excluding FILTERS_DISABLED, but including FILTERS_CUSTOM)
+     */
+    var lastFilterProfile: Long
+        get() = sp.getLong("last_filter_profile", FILTERS_CUSTOM)
+        set(value) {
+            sp.edit().putLong("last_filter_profile", value).apply()
+        }
+
+
     val language: String
         get() = sp.getString("language", "default")!!
+
+    val darkmode: String
+        get() = sp.getString("darkmode", "default")!!
+
+    val mapProvider: String
+        get() = sp.getString(
+            "map_provider",
+            context.getString(R.string.pref_map_provider_default)
+        )!!
+
+    var mapType: AnyMap.Type
+        get() = AnyMap.Type.valueOf(sp.getString("map_type", null) ?: AnyMap.Type.NORMAL.toString())
+        set(type) {
+            sp.edit().putString("map_type", type.toString()).apply()
+        }
+
+    var mapTrafficEnabled: Boolean
+        get() = sp.getBoolean("map_traffic_enabled", false)
+        set(value) {
+            sp.edit().putBoolean("map_traffic_enabled", value).apply()
+        }
+
+    var welcomeDialogShown: Boolean
+        get() = sp.getBoolean("welcome_dialog_shown", false)
+        set(value) {
+            sp.edit().putBoolean("welcome_dialog_shown", value).apply()
+        }
+
+    var update060AndroidAutoDialogShown: Boolean
+        get() = sp.getBoolean("update_0.6.0_androidauto_dialog_shown", false)
+        set(value) {
+            sp.edit().putBoolean("update_0.6.0_androidauto_dialog_shown", value).apply()
+        }
+
+    var chargepriceMyVehicle: String?
+        get() = sp.getString("chargeprice_my_vehicle", null)
+        set(value) {
+            sp.edit().putString("chargeprice_my_vehicle", value).apply()
+        }
+
+    var chargepriceMyVehicleDcChargeports: List<String>?
+        get() = sp.getString("chargeprice_my_vehicle_dc_chargeports", null)?.split(",")
+        set(value) {
+            sp.edit().putString("chargeprice_my_vehicle_dc_chargeports", value?.joinToString(","))
+                .apply()
+        }
+
+    var chargepriceMyTariffs: Set<String>?
+        get() = sp.getStringSet("chargeprice_my_tariffs", null)
+        set(value) {
+            sp.edit().putStringSet("chargeprice_my_tariffs", value).apply()
+        }
+
+    var chargepriceMyTariffsAll: Boolean
+        get() = sp.getBoolean("chargeprice_my_tariffs_all", true)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_my_tariffs_all", value).apply()
+        }
+
+    var chargepriceNoBaseFee: Boolean
+        get() = sp.getBoolean("chargeprice_no_base_fee", false)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_no_base_fee", value).apply()
+        }
+
+    var chargepriceShowProviderCustomerTariffs: Boolean
+        get() = sp.getBoolean("chargeprice_show_provider_customer_tariffs", false)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_show_provider_customer_tariffs", value).apply()
+        }
+
+    var chargepriceCurrency: String
+        get() = sp.getString("chargeprice_currency", null) ?: "EUR"
+        set(value) {
+            sp.edit().putString("chargeprice_currency", value).apply()
+        }
+
+    var chargepriceBatteryRange: List<Float>
+        get() = listOf(
+            sp.getFloat("chargeprice_battery_range_min", 20f),
+            sp.getFloat("chargeprice_battery_range_max", 80f),
+        )
+        set(value) {
+            sp.edit().putFloat("chargeprice_battery_range_min", value[0])
+                .putFloat("chargeprice_battery_range_max", value[1])
+                .apply()
+        }
 }

app/src/main/java/net/vonforst/evmap/ui/BalancedBreakingTextView.kt

@@ -0,0 +1,33 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.text.Layout
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import kotlin.math.ceil
+
+class BalancedBreakingTextView(context: Context, attrs: AttributeSet) :
+    AppCompatTextView(context, attrs) {
+
+    @Override
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+        if (layout != null) {
+            val width =
+                ceil(getMaxLineWidth(layout)).toInt() + compoundPaddingLeft + compoundPaddingRight
+            val height = measuredHeight
+            setMeasuredDimension(width, height)
+        }
+    }
+
+    private fun getMaxLineWidth(layout: Layout): Float {
+        var maxWidth = 0.0f
+        for (i in 0 until layout.lineCount) {
+            if (layout.getLineWidth(i) > maxWidth) {
+                maxWidth = layout.getLineWidth(i)
+            }
+        }
+        return maxWidth
+    }
+}

app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt

@@ -2,21 +2,26 @@ package net.vonforst.evmap.ui
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.text.SpannableString
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
 import androidx.core.text.HtmlCompat
 import androidx.databinding.BindingAdapter
+import androidx.databinding.InverseBindingAdapter
+import androidx.databinding.InverseBindingListener
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.slider.RangeSlider
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
-import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.api.iconForPlugType
 import kotlin.math.roundToInt
 
 
@@ -25,11 +30,49 @@ fun goneUnless(view: View, visible: Boolean) {
     view.visibility = if (visible) View.VISIBLE else View.GONE
 }
 
+@BindingAdapter("goneUnlessAnimated")
+fun goneUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
+    if (oldValue == newValue) return
+
+    view.animate().cancel()
+    if (newValue) {
+        view.visibility = View.VISIBLE
+        view.alpha = 0f
+        view.animate().alpha(1f).withEndAction {
+            view.alpha = 1f
+        }
+    } else {
+        view.animate().alpha(0f).withEndAction {
+            view.alpha = 1f
+            view.visibility = View.GONE
+        }
+    }
+}
+
 @BindingAdapter("invisibleUnless")
 fun invisibleUnless(view: View, visible: Boolean) {
     view.visibility = if (visible) View.VISIBLE else View.INVISIBLE
 }
 
+@BindingAdapter("invisibleUnlessAnimated")
+fun invisibleUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
+    if (oldValue == newValue) return
+
+    view.animate().cancel()
+    if (newValue) {
+        view.visibility = View.VISIBLE
+        view.alpha = 0f
+        view.animate().alpha(1f).withEndAction {
+            view.alpha = 1f
+        }
+    } else {
+        view.animate().alpha(0f).withEndAction {
+            view.alpha = 1f
+            view.visibility = View.INVISIBLE
+        }
+    }
+}
+
 @BindingAdapter("isFabActive")
 fun isFabActive(view: FloatingActionButton, isColored: Boolean) {
     val color = view.context.theme.obtainStyledAttributes(
@@ -60,20 +103,7 @@ fun <T> setRecyclerViewData(recyclerView: ViewPager2, items: List<T>?) {
 
 @BindingAdapter("connectorIcon")
 fun getConnectorItem(view: ImageView, type: String) {
-    view.setImageResource(
-        when (type) {
-            Chargepoint.CCS -> R.drawable.ic_connector_ccs
-            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.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
-        }
-    )
+    view.setImageResource(iconForPlugType(type))
 }
 
 @BindingAdapter("srcCompat")
@@ -131,19 +161,71 @@ fun setTopMargin(view: View, topMargin: Float) {
     view.layoutParams = layoutParams
 }
 
+/**
+ * Linkify is already possible using the autoLink and linksClickable attributes, but this does not
+ * remove spans correctly. So we implement a new version that manually removes the spans.
+ */
+@BindingAdapter("linkify")
+fun setLinkify(textView: TextView, oldValue: Int, newValue: Int) {
+    if (oldValue == newValue) return
+
+    textView.autoLinkMask = newValue
+    textView.linksClickable = newValue != 0
+
+    // remove spans
+    val text = textView.text
+    if (newValue == 0 && text != null && text is SpannableString) {
+        text.getSpans(0, text.length, Any::class.java).forEach {
+            text.removeSpan(it)
+        }
+    }
+}
+
+@BindingAdapter("chargepriceTagColor")
+fun setChargepriceTagColor(view: TextView, kind: String) {
+    view.backgroundTintList = ColorStateList.valueOf(
+        ContextCompat.getColor(
+            view.context,
+            when (kind) {
+                "star" -> R.color.chargeprice_star
+                "alert" -> R.color.chargeprice_alert
+                "info" -> R.color.chargeprice_info
+                "lock" -> R.color.chargeprice_lock
+                else -> R.color.chip_background
+            }
+        )
+    )
+}
+
+@BindingAdapter("chargepriceTagIcon")
+fun setChargepriceTagIcon(view: TextView, kind: String) {
+    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
+        when (kind) {
+            "star" -> R.drawable.ic_chargeprice_star
+            "alert" -> R.drawable.ic_chargeprice_alert
+            "info" -> R.drawable.ic_chargeprice_info
+            "lock" -> R.drawable.ic_chargeprice_lock
+            else -> 0
+        }, 0, 0, 0
+    )
+}
+
 private fun availabilityColor(
     status: List<ChargepointStatus>?,
     context: Context
 ): Int = if (status != null) {
     val unknown = status.any { it == ChargepointStatus.UNKNOWN }
     val available = status.count { it == ChargepointStatus.AVAILABLE }
+    val allFaulted = status.all { it == ChargepointStatus.FAULTED }
 
     if (unknown) {
         ContextCompat.getColor(context, R.color.unknown)
     } else if (available > 0) {
         ContextCompat.getColor(context, R.color.available)
-    } else {
+    } else if (allFaulted) {
         ContextCompat.getColor(context, R.color.unavailable)
+    } else {
+        ContextCompat.getColor(context, R.color.charging)
     }
 } else {
     val ta = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorControlNormal))
@@ -160,4 +242,64 @@ fun availabilityText(status: List<ChargepointStatus>?): String? {
     return if (unknown > 0) {
         if (unknown == total) "?" else "$available?"
     } else available.toString()
+}
+
+fun flatten(it: Iterable<Iterable<ChargepointStatus>>?): List<ChargepointStatus>? {
+    return it?.flatten()
+}
+
+fun currency(currency: String): String {
+    // shorthands for currencies
+    return when (currency) {
+        "EUR" -> "€"
+        "USD" -> "$"
+        "DKK", "SEK", "NOK" -> "kr."
+        "PLN" -> "zł"
+        "CHF" -> "Fr. "
+        "CZK" -> "Kč"
+        "GBP" -> "£"
+        "HRK" -> "kn"
+        "HUF" -> "Ft"
+        "ISK" -> "Kr"
+        else -> currency
+    }
+}
+
+@InverseBindingAdapter(attribute = "app:values")
+fun getRangeSliderValue(slider: RangeSlider) = slider.values
+
+@BindingAdapter("app:valuesAttrChanged")
+fun setRangeSliderListeners(slider: RangeSlider, attrChange: InverseBindingListener) {
+    slider.addOnChangeListener { _, _, _ ->
+        attrChange.onChange()
+    }
+}
+
+@ColorInt
+fun colorEnabled(ctx: Context, enabled: Boolean): Int {
+    val attr = if (enabled) {
+        android.R.attr.textColorSecondary
+    } else {
+        android.R.attr.textColorHint
+    }
+    val typedValue = ctx.obtainStyledAttributes(intArrayOf(attr))
+    val color = typedValue.getColor(0, 0)
+    typedValue.recycle()
+    return color
+}
+
+@BindingAdapter("app:tint")
+fun setImageTintList(view: ImageView, @ColorInt color: Int) {
+    view.imageTintList = ColorStateList.valueOf(color)
+}
+
+@BindingAdapter("myTariffsBackground")
+fun myTariffsBackground(view: View, myTariff: Boolean) {
+    if (myTariff) {
+        view.background = ContextCompat.getDrawable(view.context, R.drawable.my_tariff_background)
+    } else {
+        view.context.obtainStyledAttributes(intArrayOf(R.attr.selectableItemBackground)).use {
+            view.background = it.getDrawable(0)
+        }
+    }
 }

app/src/main/java/net/vonforst/evmap/ui/CheckableConstraintLayout.kt

@@ -0,0 +1,48 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.Checkable
+import androidx.constraintlayout.widget.ConstraintLayout
+
+
+class CheckableConstraintLayout(ctx: Context, attrs: AttributeSet) : ConstraintLayout(ctx, attrs),
+    Checkable {
+    private var onCheckedChangeListener: ((View, Boolean) -> Unit)? = null
+    private var checked = false
+    private val CHECKED_STATE_SET = intArrayOf(android.R.attr.state_checked)
+
+    override fun setChecked(b: Boolean) {
+        if (b != checked) {
+            checked = b;
+            refreshDrawableState();
+            onCheckedChangeListener?.invoke(this, checked);
+        }
+    }
+
+    override fun isChecked(): Boolean {
+        return checked
+    }
+
+    override fun toggle() {
+        checked = !checked
+    }
+
+    override fun onCreateDrawableState(extraSpace: Int): IntArray? {
+        val drawableState = super.onCreateDrawableState(extraSpace + 1)
+        if (isChecked) {
+            mergeDrawableStates(drawableState, CHECKED_STATE_SET)
+        }
+        return drawableState
+    }
+
+    /**
+     * Register a callback to be invoked when the checked state of this view changes.
+     *
+     * @param listener the callback to call on checked state change
+     */
+    fun setOnCheckedChangeListener(listener: (View, Boolean) -> Unit) {
+        onCheckedChangeListener = listener
+    }
+}

app/src/main/java/net/vonforst/evmap/ui/Clustering.kt

@@ -1,6 +1,6 @@
 package net.vonforst.evmap.ui;
 
-import com.google.android.libraries.maps.model.LatLng
+import com.car2go.maps.model.LatLng
 import com.google.maps.android.clustering.ClusterItem
 import com.google.maps.android.clustering.algo.NonHierarchicalDistanceBasedAlgorithm
 import net.vonforst.evmap.api.goingelectric.ChargeLocation

app/src/main/java/net/vonforst/evmap/ui/Dialogs.kt

@@ -0,0 +1,63 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.content.DialogInterface
+import android.view.Gravity
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.FrameLayout
+import androidx.appcompat.app.AlertDialog
+
+private fun dialogEditText(ctx: Context): Pair<View, EditText> {
+    val container = FrameLayout(ctx)
+    container.setPadding(
+        (16 * ctx.resources.displayMetrics.density).toInt(), 0,
+        (16 * ctx.resources.displayMetrics.density).toInt(), 0
+    )
+    val input = EditText(ctx)
+    input.isSingleLine = true
+    container.addView(input)
+    return container to input
+}
+
+fun showEditTextDialog(
+    ctx: Context,
+    customize: (AlertDialog.Builder, EditText) -> Unit
+): AlertDialog {
+    val (container, input) = dialogEditText(ctx)
+    val dialogBuilder = AlertDialog.Builder(ctx)
+        .setView(container)
+
+    customize(dialogBuilder, input)
+
+    val dialog = dialogBuilder.show()
+
+
+    // move dialog to top
+    val attrs = dialog.window?.attributes?.apply {
+        gravity = Gravity.TOP
+    }
+    dialog.window?.attributes = attrs
+
+    // focus and show keyboard
+    input.requestFocus()
+    input.postDelayed({
+        val imm =
+            ctx.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.showSoftInput(input, InputMethodManager.SHOW_IMPLICIT)
+    }, 100)
+    input.setOnEditorActionListener { _, actionId, _ ->
+        if (actionId == EditorInfo.IME_ACTION_DONE) {
+            val text = input.text
+            val button = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
+            if (text != null && button != null) {
+                button.performClick()
+                return@setOnEditorActionListener true
+            }
+        }
+        false
+    }
+    return dialog
+}

app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt

@@ -11,11 +11,12 @@ import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.widget.TextViewCompat
-import com.google.android.libraries.maps.model.BitmapDescriptor
-import com.google.android.libraries.maps.model.BitmapDescriptorFactory
+import com.car2go.maps.BitmapDescriptorFactory
+import com.car2go.maps.model.BitmapDescriptor
 import com.google.maps.android.ui.IconGenerator
 import com.google.maps.android.ui.SquareTextView
 import net.vonforst.evmap.R
+import kotlin.math.roundToInt
 
 class ClusterIconGenerator(context: Context) : IconGenerator(context) {
     init {
@@ -32,7 +33,7 @@ class ClusterIconGenerator(context: Context) : IconGenerator(context) {
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
             )
-            id = com.google.maps.android.R.id.amu_text
+            id = R.id.amu_text
             setPadding(twelveDpi, twelveDpi, twelveDpi, twelveDpi)
             TextViewCompat.setTextAppearance(this, R.style.TextAppearance_AppCompat)
             setTextColor(ContextCompat.getColor(context, android.R.color.white))
@@ -41,29 +42,30 @@ class ClusterIconGenerator(context: Context) : IconGenerator(context) {
 }
 
 
-class ChargerIconGenerator(val context: Context) {
-    data class BitmapData(
+class ChargerIconGenerator(
+    val context: Context,
+    val factory: BitmapDescriptorFactory?,
+    val scaleResolution: Int = 20,
+    val oversize: Float = 1.4f, // increase to add padding for fault icon or scale > 1
+    val height: Int = 44
+) {
+    private data class BitmapData(
         val tint: Int,
         val scale: Int,
         val alpha: Int,
         val highlight: Boolean,
-        val fault: Boolean
+        val fault: Boolean,
+        val multi: Boolean
     )
 
-    val cacheSize = 8 * 1024 * 1024; // 8MiB
-    val cache = object : LruCache<BitmapData, Bitmap>(cacheSize) {
-        override fun sizeOf(key: BitmapData, value: Bitmap): Int {
-            return value.byteCount
-        }
-    }
-    val oversize = 1.4f  // increase to add padding for fault icon or scale > 1
-    val icon = R.drawable.ic_map_marker_charging
-    val highlightIcon = R.drawable.ic_map_marker_highlight
-    val faultIcon = R.drawable.ic_map_marker_fault
-
-    init {
-        preloadCache()
-    }
+    // 230 items: (21 sizes, 5 colors, multi on/off) + highlight + fault (only with scale = 1)
+    private val cacheSize = (scaleResolution + 3) * 5 * 2;
+    private val cache = LruCache<BitmapData, BitmapDescriptor>(cacheSize)
+    private val icon = R.drawable.ic_map_marker_charging
+    private val multiIcon = R.drawable.ic_map_marker_charging_multiple
+    private val highlightIcon = R.drawable.ic_map_marker_highlight
+    private val highlightIconMulti = R.drawable.ic_map_marker_charging_highlight_multiple
+    private val faultIcon = R.drawable.ic_map_marker_fault
 
     fun preloadCache() {
         // pre-generates images for scale from 0 to 255 for all possible tint colors
@@ -76,10 +78,14 @@ class ChargerIconGenerator(val context: Context) {
         )
         for (fault in listOf(false, true)) {
             for (highlight in listOf(false, true)) {
-                for (tint in tints) {
-                    for (scale in 0..20) {
-                        val data = BitmapData(tint, scale, 255, highlight, fault)
-                        cache.put(data, generateBitmap(data))
+                for (multi in listOf(false, true)) {
+                    for (tint in tints) {
+                        for (scale in 0..scaleResolution) {
+                            getBitmapDescriptor(
+                                tint, scale.toFloat() / scaleResolution,
+                                255, highlight, fault, multi
+                            )
+                        }
                     }
                 }
             }
@@ -88,69 +94,102 @@ class ChargerIconGenerator(val context: Context) {
 
     fun getBitmapDescriptor(
         @ColorRes tint: Int,
-        scale: Int = 20,
+        scale: Float = 1f,
         alpha: Int = 255,
         highlight: Boolean = false,
-        fault: Boolean = false
+        fault: Boolean = false,
+        multi: Boolean = false
     ): BitmapDescriptor? {
-        val data = BitmapData(tint, scale, alpha, highlight, fault)
+        val data = BitmapData(
+            tint, (scale * scaleResolution).roundToInt(),
+            alpha,
+            if (scale == 1f) highlight else false,
+            if (scale == 1f) fault else false,
+            multi
+        )
         val cachedImg = cache[data]
         return if (cachedImg != null) {
-            BitmapDescriptorFactory.fromBitmap(cachedImg)
+            cachedImg
         } else {
             val bitmap = generateBitmap(data)
-            cache.put(data, bitmap)
-            BitmapDescriptorFactory.fromBitmap(bitmap)
+            val bmd = factory!!.fromBitmap(bitmap)
+            cache.put(data, bmd)
+            bmd
         }
     }
 
+    fun getBitmap(
+        @ColorRes tint: Int,
+        scale: Float = 1f,
+        alpha: Int = 255,
+        highlight: Boolean = false,
+        fault: Boolean = false,
+        multi: Boolean = false
+    ): Bitmap {
+        val data = BitmapData(
+            tint, (scale * scaleResolution).roundToInt(),
+            alpha,
+            if (scale == 1f) highlight else false,
+            if (scale == 1f) fault else false,
+            multi
+        )
+        return generateBitmap(data)
+    }
+
     private fun generateBitmap(data: BitmapData): Bitmap {
-        val vd: Drawable = context.getDrawable(icon)!!
+        val icon = if (data.multi) multiIcon else icon
+        val vd: Drawable = ContextCompat.getDrawable(context, icon)!!
 
         DrawableCompat.setTint(vd, ContextCompat.getColor(context, data.tint));
         DrawableCompat.setTintMode(vd, PorterDuff.Mode.MULTIPLY);
 
-        val leftPadding = vd.intrinsicWidth * (oversize - 1) / 2
-        val topPadding = vd.intrinsicWidth * (oversize - 1)
+        val density = context.resources.displayMetrics.density
+        val width =
+            (height.toFloat() * density / vd.intrinsicHeight * vd.intrinsicWidth).roundToInt()
+        val height = (height * density).roundToInt()
+
+        val leftPadding = width * (oversize - 1) / 2
+        val topPadding = height * (oversize - 1)
         vd.setBounds(
             leftPadding.toInt(), topPadding.toInt(),
-            leftPadding.toInt() + vd.intrinsicWidth,
-            topPadding.toInt() + vd.intrinsicHeight
+            leftPadding.toInt() + width,
+            topPadding.toInt() + height
         )
         vd.alpha = data.alpha
 
         val bm = Bitmap.createBitmap(
-            (vd.intrinsicWidth * oversize).toInt(), (vd.intrinsicHeight * oversize).toInt(),
+            (width * oversize).toInt(), (height * oversize).toInt(),
             Bitmap.Config.ARGB_8888
         )
         val canvas = Canvas(bm)
 
-        val scale = data.scale / 20f
+        val scale = data.scale.toFloat() / scaleResolution
         canvas.scale(
             scale,
             scale,
-            leftPadding + vd.intrinsicWidth / 2f,
-            topPadding + vd.intrinsicHeight.toFloat()
+            leftPadding + width / 2f,
+            topPadding + height.toFloat()
         )
 
         vd.draw(canvas)
 
         if (data.highlight) {
-            val highlightDrawable = context.getDrawable(highlightIcon)!!
+            val hIcon = if (data.multi) highlightIconMulti else highlightIcon
+            val highlightDrawable = ContextCompat.getDrawable(context, hIcon)!!
             highlightDrawable.setBounds(
                 leftPadding.toInt(), topPadding.toInt(),
-                leftPadding.toInt() + vd.intrinsicWidth,
-                topPadding.toInt() + vd.intrinsicHeight
+                leftPadding.toInt() + width,
+                topPadding.toInt() + height
             )
             highlightDrawable.alpha = data.alpha
             highlightDrawable.draw(canvas)
         }
 
         if (data.fault) {
-            val faultDrawable = context.getDrawable(faultIcon)!!
+            val faultDrawable = ContextCompat.getDrawable(context, faultIcon)!!
             val faultSize = 0.75
             val faultShift = 0.25
-            val base = vd.intrinsicWidth
+            val base = width
             faultDrawable.setBounds(
                 (leftPadding.toInt() + base * (1 - faultSize + faultShift)).toInt(),
                 (topPadding.toInt() - base * faultShift).toInt(),

app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt

@@ -5,52 +5,56 @@ import android.view.animation.BounceInterpolator
 import androidx.core.animation.addListener
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
-import com.google.android.libraries.maps.model.Marker
+import com.car2go.maps.model.Marker
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import kotlin.math.max
 
-fun getMarkerTint(charger: ChargeLocation): Int = when {
-    charger.maxPower >= 100 -> R.color.charger_100kw
-    charger.maxPower >= 43 -> R.color.charger_43kw
-    charger.maxPower >= 20 -> R.color.charger_20kw
-    charger.maxPower >= 11 -> R.color.charger_11kw
+fun getMarkerTint(
+    charger: ChargeLocation,
+    connectors: Set<String>? = null
+): Int = when {
+    charger.maxPower(connectors) >= 100 -> R.color.charger_100kw
+    charger.maxPower(connectors) >= 43 -> R.color.charger_43kw
+    charger.maxPower(connectors) >= 20 -> R.color.charger_20kw
+    charger.maxPower(connectors) >= 11 -> R.color.charger_11kw
     else -> R.color.charger_low
 }
 
 class MarkerAnimator(val gen: ChargerIconGenerator) {
-    val animatingMarkers = hashMapOf<Marker, ValueAnimator>()
+    private val animatingMarkers = hashMapOf<Marker, ValueAnimator>()
 
     fun animateMarkerAppear(
         marker: Marker,
         tint: Int,
         highlight: Boolean,
-        fault: Boolean
+        fault: Boolean,
+        multi: Boolean
     ) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker)
+        }
 
-        val anim = ValueAnimator.ofInt(0, 20).apply {
+        val anim = ValueAnimator.ofFloat(0f, 1f).apply {
             duration = 250
             interpolator = LinearOutSlowInInterpolator()
             addUpdateListener { animationState ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
-                val scale = animationState.animatedValue as Int
+                val scale = animationState.animatedValue as Float
                 marker.setIcon(
                     gen.getBitmapDescriptor(
                         tint,
                         scale = scale,
                         highlight = highlight,
-                        fault = fault
+                        fault = fault,
+                        multi = multi
                     )
                 )
             }
             addListener(onEnd = {
                 animatingMarkers.remove(marker)
+            }, onCancel = {
+                animatingMarkers.remove(marker)
             })
         }
         animatingMarkers[marker] = anim
@@ -61,55 +65,67 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         marker: Marker,
         tint: Int,
         highlight: Boolean,
-        fault: Boolean
+        fault: Boolean,
+        multi: Boolean
     ) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker)
+        }
 
-        val anim = ValueAnimator.ofInt(20, 0).apply {
+        val anim = ValueAnimator.ofFloat(1f, 0f).apply {
             duration = 200
             interpolator = FastOutLinearInInterpolator()
             addUpdateListener { animationState ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
-                val scale = animationState.animatedValue as Int
+                val scale = animationState.animatedValue as Float
                 marker.setIcon(
                     gen.getBitmapDescriptor(
                         tint,
                         scale = scale,
                         highlight = highlight,
-                        fault = fault
+                        fault = fault,
+                        multi = multi
                     )
                 )
             }
             addListener(onEnd = {
-                animatingMarkers.remove(marker)
                 marker.remove()
+                animatingMarkers.remove(marker)
+            }, onCancel = {
+                marker.remove()
+                animatingMarkers.remove(marker)
             })
         }
         animatingMarkers[marker] = anim
         anim.start()
     }
 
+    fun deleteMarker(marker: Marker) {
+        animatingMarkers[marker]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker)
+        }
+        marker.remove()
+    }
+
     fun animateMarkerBounce(marker: Marker) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker)
+        }
 
         val anim = ValueAnimator.ofFloat(0f, 1f).apply {
             duration = 700
             interpolator = BounceInterpolator()
             addUpdateListener { state ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
                 val t = max(1f - state.animatedValue as Float, 0f) / 2
                 marker.setAnchor(0.5f, 1.0f + t)
             }
+            addListener(onEnd = {
+                animatingMarkers.remove(marker)
+            }, onCancel = {
+                animatingMarkers.remove(marker)
+            })
         }
         animatingMarkers[marker] = anim
         anim.start()

app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt

@@ -0,0 +1,31 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.app.AppCompatActivity
+import androidx.preference.MultiSelectListPreference
+import net.vonforst.evmap.fragment.MultiSelectDialog
+
+class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) :
+    MultiSelectListPreference(ctx, attrs) {
+    override fun onClick() {
+        val dialog =
+            MultiSelectDialog.getInstance(
+                title.toString(),
+                entryValues.map { it.toString() }.zip(entries.map { it.toString() }).toMap(),
+                if (all) entryValues.map { it.toString() }.toSet() else values,
+                emptySet()
+            )
+        dialog.okListener = { selected ->
+            all = selected == entryValues.toSet()
+            values = selected
+        }
+        dialog.show((context as AppCompatActivity).supportFragmentManager, null)
+    }
+
+    var all: Boolean
+        get() = sharedPreferences.getBoolean(key + "_all", true)
+        set(value) {
+            sharedPreferences.edit().putBoolean(key + "_all", value).apply()
+        }
+}

app/src/main/java/net/vonforst/evmap/ui/NightModeUtils.kt

@@ -0,0 +1,14 @@
+package net.vonforst.evmap.ui
+
+import androidx.appcompat.app.AppCompatDelegate
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+fun updateNightMode(prefs: PreferenceDataSource) {
+    AppCompatDelegate.setDefaultNightMode(
+        when (prefs.darkmode) {
+            "on" -> AppCompatDelegate.MODE_NIGHT_YES
+            "off" -> AppCompatDelegate.MODE_NIGHT_NO
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+    )
+}

app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt

@@ -1,42 +1,41 @@
 package net.vonforst.evmap.utils
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.os.Build
+import androidx.core.os.ConfigurationCompat
 import java.util.*
 
 
 class LocaleContextWrapper(base: Context?) : ContextWrapper(base) {
     companion object {
         fun wrap(context: Context, language: String): ContextWrapper {
-            val config: Configuration = context.resources.configuration
-            var sysLocale: Locale? = null
-            sysLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                config.locales.get(0)
+            val sysConfig: Configuration = context.applicationContext.resources.configuration
+            val appConfig: Configuration = context.resources.configuration
+
+            if (language == "" || language == "default") {
+                // set default locale
+                Locale.setDefault(ConfigurationCompat.getLocales(sysConfig)[0])
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    appConfig.setLocales(sysConfig.locales)
+                } else {
+                    @Suppress("DEPRECATION")
+                    appConfig.locale = sysConfig.locale
+                }
             } else {
-                @Suppress("DEPRECATION")
-                config.locale
-            }
-            var ctx = context
-            if (language != "" && language != "default" && sysLocale.language != language) {
+                // set selected locale
                 val locale = Locale(language)
                 Locale.setDefault(locale)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    config.setLocale(locale)
+                    appConfig.setLocale(locale)
                 } else {
                     @Suppress("DEPRECATION")
-                    config.locale = locale
+                    appConfig.locale = locale
                 }
-                ctx = context.createConfigurationContext(config)
             }
-            return LocaleContextWrapper(ctx)
-        }
 
-        @TargetApi(Build.VERSION_CODES.N)
-        fun setSystemLocale(config: Configuration, locale: Locale?) {
-            config.setLocale(locale)
+            return LocaleContextWrapper(context.createConfigurationContext(appConfig))
         }
     }
 }