Release 0.3.4

add link “report new station” to main menu (fixes #53 )
Navigation component: add settings as top-level destination
2025-12-24 23:57:45 -05:00 · 2020-08-24 22:20:43 +02:00 · 2020-08-24 20:11:44 +02:00 · 2020-08-24 19:46:32 +02:00 · 2020-08-23 23:35:46 +02:00 · 2020-08-23 23:31:01 +02:00
96 changed files with 2624 additions and 452 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,7 @@
 .externalNativeBuild
 .cxx
 apikeys.xml
-/app/release/app-release.aab
-/_img/connectors/*.ai
+/app/**/*.aab
+/app/**/*.apk
+/_img/connectors/*.ai
+api-7125266970515251116-798419-8e2dda660c80.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,11 @@ 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=
 before_install:
  - openssl aes-256-cbc -K $encrypted_53968681344a_key -iv $encrypted_53968681344a_iv -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
 script:
-  - "./gradlew lintDebug testDebugUnitTest"
+  - "./gradlew lintFossDebug testFossDebugUnitTest lintGoogleDebug testGoogleDebugUnitTest"
  - "./gradlew assembleRelease"
 before_cache:
  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -25,7 +26,9 @@ 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
+  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
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
--- a/Gemfile.lock
+++ b/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
--- a/_img/map_marker_charging_multiple.svg
+++ b/_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>
--- a/_img/paypal.svg
+++ b/_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>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,14 +13,23 @@ android {
        applicationId "net.vonforst.evmap"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 20
-        versionName "0.2.2"
+        versionCode 25
+        versionName "0.3.4"

        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,16 @@ 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"
+            versionNameSuffix "-foss"
+        }
+        google {
+            dimension "dependencies"
+            versionNameSuffix "-google"
+        }
    }

    compileOptions {
@@ -61,29 +73,33 @@ android {
    // 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
+        }
    }
 }

 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.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.1'
    implementation "androidx.activity:activity-ktx:1.1.0"
    implementation "androidx.fragment:fragment-ktx:1.2.5"
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.2.0-beta01'
+    implementation 'com.google.android.material:material:1.2.0'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation 'androidx.recyclerview:recyclerview:1.1.0'
    implementation 'androidx.browser:browser:1.2.0'
@@ -97,21 +113,33 @@ dependencies {
    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
    implementation 'com.airbnb.android:lottie:3.4.0'
    implementation 'io.michaelrocks:bimap:1.0.2'
+    implementation 'com.mapzen.android:lost:3.0.2'
+
+    // AnyMaps
+    def anyMapsVersion = '894f6d62ac'
+    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.1.1'
+    googleImplementation 'com.google.android.gms:play-services-base:17.3.0'
+    googleImplementation 'com.google.android.gms:play-services-basement:17.3.0'
+    googleImplementation 'com.google.android.gms:play-services-gcm:17.0.0'
+    googleImplementation 'com.google.android.gms:play-services-location:17.0.0'
+    googleImplementation 'com.google.android.gms:play-services-tasks:17.1.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.3'
+    googleImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
+    // Mapbox places (autocomplete)
+    implementation('com.mapbox.mapboxsdk:mapbox-android-plugin-places-v9:0.12.0') {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+    }

    // navigation library
    def nav_version = "2.3.0"
@@ -131,8 +159,8 @@ dependencies {

    // billing library
    def billing_version = "3.0.0"
-    implementation "com.android.billingclient:billing:$billing_version"
-    implementation "com.android.billingclient:billing-ktx:$billing_version"
+    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'
--- a/app/src/foss/java/net/vonforst/evmap/Inits.kt
+++ b/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
+}
--- a/app/src/foss/java/net/vonforst/evmap/autocomplete/Autocomplete.kt
+++ b/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())
--- a/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -0,0 +1,37 @@
+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 kotlinx.android.synthetic.foss.fragment_donate.*
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+
+class DonateFragment : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_donate, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
+
+        val navController = findNavController()
+        toolbar.setupWithNavController(
+            navController,
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
+        btnDonate.setOnClickListener {
+            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
+        }
+    }
+}
--- a/app/src/foss/res/layout/fragment_donate.xml
+++ b/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>
--- a/app/src/foss/res/values-de/values.xml
+++ b/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>
--- a/app/src/foss/res/values/values.xml
+++ b/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>
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.vonforst.evmap">
+
+    <meta-data
+        android:name="com.google.android.geo.API_KEY"
+        android:value="@string/google_maps_key" />
+</manifest>
--- a/app/src/google/java/net/vonforst/evmap/Inits.kt
+++ b/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
+}
--- a/app/src/google/java/net/vonforst/evmap/adapter/DonationAdapter.kt
+++ b/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
+}
--- a/app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt
+++ b/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))
+}
--- a/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
--- a/app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt
+++ b/app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt
--- a/app/src/google/res/layout/fragment_donate.xml
+++ b/app/src/google/res/layout/fragment_donate.xml
--- a/app/src/google/res/layout/item_donation.xml
+++ b/app/src/google/res/layout/item_donation.xml
--- a/app/src/google/res/values-de/values.xml
+++ b/app/src/google/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>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>
+</resources>
--- a/app/src/google/res/values/values.xml
+++ b/app/src/google/res/values/values.xml
@@ -0,0 +1,13 @@
+<?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>
+</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <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" />

    <application
@@ -13,17 +14,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"
--- a/app/src/main/java/com/google/maps/android/clustering/Cluster.java
+++ b/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();
+}
--- a/app/src/main/java/com/google/maps/android/clustering/ClusterItem.java
+++ b/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();
+}
--- a/app/src/main/java/com/google/maps/android/clustering/algo/AbstractAlgorithm.java
+++ b/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();
+    }
+}
--- a/app/src/main/java/com/google/maps/android/clustering/algo/Algorithm.java
+++ b/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();
+}
--- a/app/src/main/java/com/google/maps/android/clustering/algo/NonHierarchicalDistanceBasedAlgorithm.java
+++ b/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);
+        }
+    }
+}
--- a/app/src/main/java/com/google/maps/android/clustering/algo/StaticCluster.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/com/google/maps/android/geometry/Bounds.java
+++ b/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;
+    }
+}
--- a/app/src/main/java/com/google/maps/android/geometry/Point.java
+++ b/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 +
+                '}';
+    }
+}
--- a/app/src/main/java/com/google/maps/android/projection/Point.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/com/google/maps/android/projection/SphericalMercatorProjection.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/com/google/maps/android/quadtree/PointQuadTree.java
+++ b/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);
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/google/maps/android/ui/IconGenerator.java
+++ b/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;
+        }
+    }
+}
--- a/app/src/main/java/com/google/maps/android/ui/RotationLayout.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/com/google/maps/android/ui/SquareTextView.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
+++ b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
@@ -2,7 +2,6 @@ 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

@@ -11,6 +10,6 @@ class EvMapApplication : Application() {
        super.onCreate()
        updateNightMode(PreferenceDataSource(this))
        Stetho.initializeWithDefaults(this);
-        Places.initialize(applicationContext, getString(R.string.google_maps_key));
+        init(applicationContext)
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -4,7 +4,6 @@ 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.CustomTabsIntent
@@ -14,8 +13,6 @@ 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
@@ -56,7 +53,8 @@ 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)
        )
@@ -64,7 +62,7 @@ class MapsActivity : AppCompatActivity() {

        prefs = PreferenceDataSource(this)

-        checkPlayServices()
+        checkPlayServices(this)
    }

    fun navigateTo(charger: ChargeLocation) {
@@ -110,19 +108,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
-    }
 }
--- a/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt
@@ -11,7 +11,6 @@ import net.vonforst.evmap.BR
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.goingelectric.Chargepoint
-import net.vonforst.evmap.viewmodel.DonationItem
 import net.vonforst.evmap.viewmodel.FavoritesViewModel

 interface Equatable {
@@ -89,8 +88,4 @@ class FavoritesAdapter(val vm: FavoritesViewModel) :
    override fun getItemViewType(position: Int): Int = R.layout.item_favorite

    override fun getItemId(position: Int): Long = getItem(position).charger.id
-}
-
-class DonationAdapter() : DataBindingAdapter<DonationItem>() {
-    override fun getItemViewType(position: Int): Int = R.layout.item_donation
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
+++ b/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)
        }
    }
--- a/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
+++ b/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,23 @@ class FavoritesFragment : Fragment() {
            )
        }

+        locationClient.connect()
+    }
+
+    override fun onConnected() {
        if (ContextCompat.checkSelfPermission(
                requireContext(),
                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() {
+
+    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -1,9 +1,8 @@
 package net.vonforst.evmap.fragment

-import android.Manifest
+import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -11,11 +10,12 @@ import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.view.*
-import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.app.ActivityCompat
 import androidx.core.app.SharedElementCallback
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
@@ -33,16 +33,13 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.TransitionInflater
 import androidx.transition.TransitionManager
-import com.google.android.gms.location.FusedLocationProviderClient
-import com.google.android.gms.location.LocationServices
-import com.google.android.libraries.maps.CameraUpdateFactory
-import com.google.android.libraries.maps.GoogleMap
-import com.google.android.libraries.maps.OnMapReadyCallback
-import com.google.android.libraries.maps.SupportMapFragment
-import com.google.android.libraries.maps.model.*
-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 com.car2go.maps.AnyMap
+import com.car2go.maps.MapFragment
+import com.car2go.maps.OnMapReadyCallback
+import com.car2go.maps.model.BitmapDescriptor
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.Marker
+import com.car2go.maps.model.MarkerOptions
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
@@ -50,6 +47,8 @@ import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
 import com.mahc.custombottomsheetbehavior.MergedAppBarLayoutBehavior
+import com.mapzen.android.lost.api.LocationServices
+import com.mapzen.android.lost.api.LostApiClient
 import io.michaelrocks.bimap.HashBiMap
 import io.michaelrocks.bimap.MutableBiMap
 import kotlinx.android.synthetic.main.fragment_map.*
@@ -60,7 +59,10 @@ import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.ChargeLocationCluster
 import net.vonforst.evmap.api.goingelectric.ChargepointListItem
+import net.vonforst.evmap.autocomplete.handleAutocompleteResult
+import net.vonforst.evmap.autocomplete.launchAutocomplete
 import net.vonforst.evmap.databinding.FragmentMapBinding
+import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.ClusterIconGenerator
 import net.vonforst.evmap.ui.MarkerAnimator
@@ -72,7 +74,8 @@ const val ARG_CHARGER_ID = "chargerId"
 const val ARG_LAT = "lat"
 const val ARG_LON = "lon"

-class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback {
+class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback,
+    LostApiClient.ConnectionCallbacks {
    private lateinit var binding: FragmentMapBinding
    private val vm: MapViewModel by viewModels(factoryProducer = {
        viewModelFactory {
@@ -83,13 +86,15 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        }
    })
    private val galleryVm: GalleryViewModel by activityViewModels()
-    private var map: GoogleMap? = null
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
+    private lateinit var mapFragment: MapFragment
+    private var map: AnyMap? = null
+    private lateinit var locationClient: LostApiClient
    private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
    private lateinit var detailAppBarBehavior: MergedAppBarLayoutBehavior
    private var markers: MutableBiMap<Marker, ChargeLocation> = HashBiMap()
    private var clusterMarkers: List<Marker> = emptyList()
    private var searchResultMarker: Marker? = null
+    private var searchResultIcon: BitmapDescriptor? = null
    private var connectionErrorSnackbar: Snackbar? = null
    private var previousChargepointIds: Set<Long>? = null

@@ -125,10 +130,37 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        binding.lifecycleOwner = this
        binding.vm = vm

-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(requireContext())
+        mapFragment = MapFragment()
+        val provider = PreferenceDataSource(requireContext()).mapProvider
+        mapFragment.setPriority(
+            arrayOf(
+                when (provider) {
+                    "mapbox" -> MapFragment.MAPBOX
+                    "google" -> MapFragment.GOOGLE
+                    else -> null
+                },
+                MapFragment.GOOGLE,
+                MapFragment.MAPBOX
+            )
+        )
+        requireActivity().supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.map, mapFragment)
+            .commit()
+
+        // reset map-related stuff (map provider may have changed)
+        map = null
+        markers.clear()
+        clusterMarkers = emptyList()
+        searchResultMarker = null
+        searchResultIcon = null
+
+
+        locationClient = LostApiClient.Builder(requireContext())
+            .addConnectionCallbacks(this)
+            .build()
+        locationClient.connect()
        clusterIconGenerator = ClusterIconGenerator(requireContext())
-        chargerIconGenerator = ChargerIconGenerator(requireContext())
-        animator = MarkerAnimator(chargerIconGenerator)

        setHasOptionsMenu(true)
        postponeEnterTransition()
@@ -153,7 +185,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val mapFragment = childFragmentManager.findFragmentById(R.id.map) as SupportMapFragment
        mapFragment.getMapAsync(this)
        bottomSheetBehavior = BottomSheetBehaviorGoogleMapsLike.from(binding.bottomSheet)
        detailAppBarBehavior = MergedAppBarLayoutBehavior.from(binding.detailAppBar)
@@ -181,13 +212,17 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

    private fun setupClickListeners() {
        binding.fabLocate.setOnClickListener {
-            if (!hasLocationPermission()) {
+            if (ContextCompat.checkSelfPermission(
+                    requireContext(),
+                    ACCESS_FINE_LOCATION
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
                requestPermissions(
-                    arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                    arrayOf(ACCESS_FINE_LOCATION),
                    REQUEST_LOCATION_PERMISSION
                )
            } else {
-                enableLocation(true, true)
+                enableLocation(moveTo = true, animate = true)
            }
        }
        binding.fabDirections.setOnClickListener {
@@ -216,17 +251,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT
        }
        binding.search.setOnClickListener {
-            val fields = listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)
-            val intent: Intent = Autocomplete.IntentBuilder(
-                AutocompleteActivityMode.OVERLAY, fields
-            )
-                .build(requireContext())
-                .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-            startActivityForResult(intent, REQUEST_AUTOCOMPLETE)
-
-            val imm =
-                requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.toggleSoftInput(0, 0)
+            launchAutocomplete(this)
        }
        binding.detailAppBar.toolbar.setNavigationOnClickListener {
            bottomSheetBehavior.state = STATE_COLLAPSED
@@ -351,12 +376,21 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

            if (place != null) {
                if (place.viewport != null) {
-                    map.animateCamera(CameraUpdateFactory.newLatLngBounds(place.viewport, 0))
+                    map.animateCamera(map.cameraUpdateFactory.newLatLngBounds(place.viewport, 0))
                } else {
-                    map.animateCamera(CameraUpdateFactory.newLatLngZoom(place.latLng, 12f))
+                    map.animateCamera(map.cameraUpdateFactory.newLatLngZoom(place.latLng, 12f))
                }

-                searchResultMarker = map.addMarker(MarkerOptions().position(place.latLng!!))
+                if (searchResultIcon == null) {
+                    searchResultIcon =
+                        map.bitmapDescriptorFactory.fromResource(R.drawable.ic_map_marker)
+                }
+                searchResultMarker = map.addMarker(
+                    MarkerOptions()
+                        .position(place.latLng)
+                        .icon(searchResultIcon)
+                        .anchor(0.5f, 1f)
+                )
            }

            updateBackPressedCallback()
@@ -367,10 +401,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            updateBackPressedCallback()
        })
        vm.mapType.observe(viewLifecycleOwner, Observer {
-            map?.mapType = it
+            map?.setMapType(it)
        })
        vm.mapTrafficEnabled.observe(viewLifecycleOwner, Observer {
-            map?.isTrafficEnabled = it
+            map?.setTrafficEnabled(it)
        })

        updateBackPressedCallback()
@@ -387,7 +421,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        markers.forEach { (m, c) ->
            m.setIcon(
                chargerIconGenerator.getBitmapDescriptor(
-                    getMarkerTint(c, vm.filteredConnectors.value), fault = c.faultReport != null
+                    getMarkerTint(c, vm.filteredConnectors.value),
+                    highlight = false,
+                    fault = c.faultReport != null,
+                    multi = getMarkerMulti(c, vm.filteredConnectors.value)
                )
            )
        }
@@ -400,7 +437,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            chargerIconGenerator.getBitmapDescriptor(
                getMarkerTint(charger, vm.filteredConnectors.value),
                highlight = true,
-                fault = charger.faultReport != null
+                fault = charger.faultReport != null,
+                multi = getMarkerMulti(charger, vm.filteredConnectors.value)
            )
        )
        animator.animateMarkerBounce(marker)
@@ -410,13 +448,31 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            if (m != marker) {
                m.setIcon(
                    chargerIconGenerator.getBitmapDescriptor(
-                        getMarkerTint(c, vm.filteredConnectors.value), fault = c.faultReport != null
+                        getMarkerTint(c, vm.filteredConnectors.value),
+                        highlight = false,
+                        fault = c.faultReport != null,
+                        multi = getMarkerMulti(c, vm.filteredConnectors.value)
                    )
                )
            }
        }
    }

+    private fun getMarkerMulti(charger: ChargeLocation, filteredConnectors: Set<String>?): Boolean {
+        var chargepoints = charger.chargepointsMerged
+            .filter { filteredConnectors?.contains(it.type) ?: true }
+        if (charger.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 }
+    }
+
    private fun updateFavoriteToggle() {
        val favs = vm.favorites.value ?: return
        val charger = vm.chargerSparse.value ?: return
@@ -528,11 +584,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            }.show()
    }

-    override fun onMapReady(map: GoogleMap) {
+    override fun onMapReady(map: AnyMap) {
        this.map = map
-        map.uiSettings.isTiltGesturesEnabled = false
-        map.isIndoorEnabled = false
-        map.uiSettings.isIndoorLevelPickerEnabled = false
+        chargerIconGenerator = ChargerIconGenerator(requireContext(), map.bitmapDescriptorFactory)
+        animator = MarkerAnimator(chargerIconGenerator)
+        map.uiSettings.setTiltGesturesEnabled(false)
+        map.setIndoorEnabled(false)
+        map.uiSettings.setIndoorLevelPickerEnabled(false)
        map.setOnCameraIdleListener {
            vm.mapPosition.value = MapPosition(
                map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
@@ -546,7 +604,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                }
                in clusterMarkers -> {
                    val newZoom = map.cameraPosition.zoom + 2
-                    map.animateCamera(CameraUpdateFactory.newLatLngZoom(marker.position, newZoom))
+                    map.animateCamera(
+                        map.cameraUpdateFactory.newLatLngZoom(
+                            marker.position,
+                            newZoom
+                        )
+                    )
                    true
                }
                else -> false
@@ -564,9 +627,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

        val mode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
        map.setMapStyle(
-            if (mode == Configuration.UI_MODE_NIGHT_YES) {
-                MapStyleOptions.loadRawResourceStyle(context, R.raw.maps_night_mode)
-            } else null
+            if (mode == Configuration.UI_MODE_NIGHT_YES) AnyMap.Style.DARK else AnyMap.Style.NORMAL
        )


@@ -577,12 +638,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

        if (position != null) {
            val cameraUpdate =
-                CameraUpdateFactory.newLatLngZoom(position.bounds.center, position.zoom)
+                map.cameraUpdateFactory.newLatLngZoom(position.bounds.center, position.zoom)
            map.moveCamera(cameraUpdate)
            positionSet = true
        } else if (lat != null && lon != null) {
            // show given position
-            val cameraUpdate = CameraUpdateFactory.newLatLngZoom(LatLng(lat, lon), 16f)
+            val cameraUpdate = map.cameraUpdateFactory.newLatLngZoom(LatLng(lat, lon), 16f)
            map.moveCamera(cameraUpdate)

            // show charger detail after chargers were loaded
@@ -603,13 +664,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

            positionSet = true
        }
-        if (hasLocationPermission()) {
+        if (ContextCompat.checkSelfPermission(
+                requireContext(),
+                ACCESS_FINE_LOCATION
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
            enableLocation(!positionSet, false)
            positionSet = true
        }
        if (!positionSet) {
            // center the camera on Europe
-            val cameraUpdate = CameraUpdateFactory.newLatLngZoom(LatLng(50.113388, 9.252536), 3.5f)
+            val cameraUpdate =
+                map.cameraUpdateFactory.newLatLngZoom(LatLng(50.113388, 9.252536), 3.5f)
            map.moveCamera(cameraUpdate)
        }

@@ -618,33 +684,29 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        )
    }

-    @SuppressLint("MissingPermission")
+    @RequiresPermission(ACCESS_FINE_LOCATION)
    private fun enableLocation(moveTo: Boolean, animate: Boolean) {
        val map = this.map ?: return
-        map.isMyLocationEnabled = true
+        map.setMyLocationEnabled(true)
        vm.myLocationEnabled.value = true
-        map.uiSettings.isMyLocationButtonEnabled = false
-        if (moveTo) {
-            fusedLocationClient.lastLocation.addOnSuccessListener { location ->
-                if (location != null) {
-                    val latLng = LatLng(location.latitude, location.longitude)
-                    val camUpdate = CameraUpdateFactory.newLatLngZoom(latLng, 13f)
-                    if (animate) {
-                        map.animateCamera(camUpdate)
-                    } else {
-                        map.moveCamera(camUpdate)
-                    }
-                }
-            }
+        map.uiSettings.setMyLocationButtonEnabled(false)
+        if (moveTo && locationClient.isConnected) {
+            moveToCurrentLocation(map, animate)
        }
    }

-    private fun hasLocationPermission(): Boolean {
-        val context = context ?: return false
-        return ContextCompat.checkSelfPermission(
-            context,
-            Manifest.permission.ACCESS_FINE_LOCATION
-        ) == PackageManager.PERMISSION_GRANTED
+    @RequiresPermission(ACCESS_FINE_LOCATION)
+    private fun moveToCurrentLocation(map: AnyMap, animate: Boolean) {
+        val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
+        if (location != null) {
+            val latLng = LatLng(location.latitude, location.longitude)
+            val camUpdate = map.cameraUpdateFactory.newLatLngZoom(latLng, 13f)
+            if (animate) {
+                map.animateCamera(camUpdate)
+            } else {
+                map.moveCamera(camUpdate)
+            }
+        }
    }

    @Synchronized
@@ -663,7 +725,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                chargerIconGenerator.getBitmapDescriptor(
                    getMarkerTint(charger, vm.filteredConnectors.value),
                    highlight = charger == vm.chargerSparse.value,
-                    fault = charger.faultReport != null
+                    fault = charger.faultReport != null,
+                    multi = getMarkerMulti(charger, vm.filteredConnectors.value)
                )
            )
        }
@@ -680,7 +743,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                        val tint = getMarkerTint(charger, vm.filteredConnectors.value)
                        val highlight = charger == vm.chargerSparse.value
                        val fault = charger.faultReport != null
-                        animator.animateMarkerDisappear(marker, tint, highlight, fault)
+                        val multi = getMarkerMulti(charger, vm.filteredConnectors.value)
+                        animator.animateMarkerDisappear(marker, tint, highlight, fault, multi)
                    } else {
                        animator.deleteMarker(marker)
                    }
@@ -694,12 +758,23 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                    val tint = getMarkerTint(charger, vm.filteredConnectors.value)
                    val highlight = charger == vm.chargerSparse.value
                    val fault = charger.faultReport != null
+                    val multi = getMarkerMulti(charger, vm.filteredConnectors.value)
                    val marker = map.addMarker(
                        MarkerOptions()
                            .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
-                            .visible(false)
+                            .icon(
+                                chargerIconGenerator.getBitmapDescriptor(
+                                    tint,
+                                    0,
+                                    255,
+                                    highlight,
+                                    fault,
+                                    multi
+                                )
+                            )
+                            .anchor(0.5f, 1f)
                    )
-                    animator.animateMarkerAppear(marker, tint, highlight, fault)
+                    animator.animateMarkerAppear(marker, tint, highlight, fault, multi)
                    markers[marker] = charger
                }
            }
@@ -709,11 +784,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            map.addMarker(
                MarkerOptions()
                    .position(LatLng(cluster.coordinates.lat, cluster.coordinates.lng))
-                    .icon(BitmapDescriptorFactory.fromBitmap(clusterIconGenerator.makeIcon(cluster.clusterCount.toString())))
+                    .icon(
+                        map.bitmapDescriptorFactory.fromBitmap(
+                            clusterIconGenerator.makeIcon(
+                                cluster.clusterCount.toString()
+                            )
+                        )
+                    )
+                    .anchor(0.5f, 0.5f)
            )
        }
    }

+    @SuppressLint("MissingPermission")
    override fun onRequestPermissionsResult(
        requestCode: Int,
        permissions: Array<out String>,
@@ -722,7 +805,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        when (requestCode) {
            REQUEST_LOCATION_PERMISSION -> {
                if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
-                    enableLocation(true, true)
+                    enableLocation(moveTo = true, animate = true)
                }
            }
            else -> super.onRequestPermissionsResult(requestCode, permissions, grantResults)
@@ -792,8 +875,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        when (requestCode) {
            REQUEST_AUTOCOMPLETE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    vm.searchResult.value = Autocomplete.getPlaceFromIntent(data!!)
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    vm.searchResult.value = handleAutocompleteResult(data)
                }
            }
            else -> super.onActivityResult(requestCode, resultCode, data)
@@ -829,4 +912,20 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            }
        }
    }
+
+    override fun onConnected() {
+        val map = this.map ?: return
+        if (vm.myLocationEnabled.value == true) {
+            if (ActivityCompat.checkSelfPermission(
+                    requireContext(),
+                    ACCESS_FINE_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                moveToCurrentLocation(map, false)
+            }
+        }
+    }
+
+    override fun onConnectionSuspended() {
+    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
@@ -71,7 +71,7 @@ class MultiSelectDialog : AppCompatDialogFragment() {
        list.layoutManager = LinearLayoutManager(view.context)

        items = data.entries.toList()
-            .sortedBy { it.value }
+            .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)
--- a/app/src/main/java/net/vonforst/evmap/navigation/ChromeCustomTabsNavigator.kt
+++ b/app/src/main/java/net/vonforst/evmap/navigation/ChromeCustomTabsNavigator.kt
@@ -0,0 +1,50 @@
+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.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()
+            .setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary))
+            .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))
+            }
+        }
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/navigation/NavHostFragment.kt
+++ b/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()
+            )
+        )
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -2,9 +2,10 @@ package net.vonforst.evmap.storage

 import android.content.Context
 import androidx.preference.PreferenceManager
+import net.vonforst.evmap.R
 import java.time.Instant

-class PreferenceDataSource(context: Context) {
+class PreferenceDataSource(val context: Context) {
    val sp = PreferenceManager.getDefaultSharedPreferences(context)

    var navigateUseMaps: Boolean
@@ -42,4 +43,10 @@ class PreferenceDataSource(context: Context) {

    val darkmode: String
        get() = sp.getString("darkmode", "default")!!
+
+    val mapProvider: String
+        get() = sp.getString(
+            "map_provider",
+            context.getString(R.string.pref_map_provider_default)
+        )!!
 }
--- a/app/src/main/java/net/vonforst/evmap/ui/Clustering.kt
+++ b/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
--- a/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt
@@ -11,8 +11,8 @@ 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
@@ -32,7 +32,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,20 +41,23 @@ class ClusterIconGenerator(context: Context) : IconGenerator(context) {
 }


-class ChargerIconGenerator(val context: Context) {
+class ChargerIconGenerator(val context: Context, val factory: BitmapDescriptorFactory) {
    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 = 420; // 420 items: 21 sizes, 5 colors, highlight on/off, fault on/off
+    val cacheSize = 840; // 840 items: 21 sizes, 5 colors, highlight, fault, multi on/off
    val cache = LruCache<BitmapData, BitmapDescriptor>(cacheSize)
    val oversize = 1.4f  // increase to add padding for fault icon or scale > 1
    val icon = R.drawable.ic_map_marker_charging
+    val multiIcon = R.drawable.ic_map_marker_charging_multiple
    val highlightIcon = R.drawable.ic_map_marker_highlight
+    val highlightIconMulti = R.drawable.ic_map_marker_charging_highlight_multiple
    val faultIcon = R.drawable.ic_map_marker_fault

    init {
@@ -72,9 +75,11 @@ 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) {
-                        getBitmapDescriptor(tint, scale, 255, highlight, fault)
+                for (multi in listOf(false, true)) {
+                    for (tint in tints) {
+                        for (scale in 0..20) {
+                            getBitmapDescriptor(tint, scale, 255, highlight, fault, multi)
+                        }
                    }
                }
            }
@@ -86,28 +91,30 @@ class ChargerIconGenerator(val context: Context) {
        scale: Int = 20,
        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, alpha, highlight, fault, multi)
        val cachedImg = cache[data]
        return if (cachedImg != null) {
            cachedImg
        } else {
            val bitmap = generateBitmap(data)
-            val bmd = BitmapDescriptorFactory.fromBitmap(bitmap)
+            val bmd = factory.fromBitmap(bitmap)
            cache.put(data, bmd)
            bmd
        }
    }

    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 topPadding = vd.intrinsicHeight * (oversize - 1)
        vd.setBounds(
            leftPadding.toInt(), topPadding.toInt(),
            leftPadding.toInt() + vd.intrinsicWidth,
@@ -132,7 +139,8 @@ class ChargerIconGenerator(val context: Context) {
        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,
@@ -143,7 +151,7 @@ class ChargerIconGenerator(val context: Context) {
        }

        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
--- a/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt
@@ -5,7 +5,7 @@ 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
@@ -22,17 +22,18 @@ fun getMarkerTint(
 }

 class MarkerAnimator(val gen: ChargerIconGenerator) {
-    private val animatingMarkers = hashMapOf<String, ValueAnimator>()
+    private val animatingMarkers = hashMapOf<Marker, ValueAnimator>()

    fun animateMarkerAppear(
        marker: Marker,
        tint: Int,
        highlight: Boolean,
-        fault: Boolean
+        fault: Boolean,
+        multi: Boolean
    ) {
-        animatingMarkers[marker.id]?.let {
+        animatingMarkers[marker]?.let {
            it.cancel()
-            animatingMarkers.remove(marker.id)
+            animatingMarkers.remove(marker)
        }

        val anim = ValueAnimator.ofInt(0, 20).apply {
@@ -45,18 +46,18 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                        tint,
                        scale = scale,
                        highlight = highlight,
-                        fault = fault
+                        fault = fault,
+                        multi = multi
                    )
                )
-                marker.isVisible = true
            }
            addListener(onEnd = {
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            }, onCancel = {
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            })
        }
-        animatingMarkers[marker.id] = anim
+        animatingMarkers[marker] = anim
        anim.start()
    }

@@ -64,11 +65,12 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
        marker: Marker,
        tint: Int,
        highlight: Boolean,
-        fault: Boolean
+        fault: Boolean,
+        multi: Boolean
    ) {
-        animatingMarkers[marker.id]?.let {
+        animatingMarkers[marker]?.let {
            it.cancel()
-            animatingMarkers.remove(marker.id)
+            animatingMarkers.remove(marker)
        }

        val anim = ValueAnimator.ofInt(20, 0).apply {
@@ -81,34 +83,35 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                        tint,
                        scale = scale,
                        highlight = highlight,
-                        fault = fault
+                        fault = fault,
+                        multi = multi
                    )
                )
            }
            addListener(onEnd = {
                marker.remove()
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            }, onCancel = {
                marker.remove()
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            })
        }
-        animatingMarkers[marker.id] = anim
+        animatingMarkers[marker] = anim
        anim.start()
    }

    fun deleteMarker(marker: Marker) {
-        animatingMarkers[marker.id]?.let {
+        animatingMarkers[marker]?.let {
            it.cancel()
-            animatingMarkers.remove(marker.id)
+            animatingMarkers.remove(marker)
        }
        marker.remove()
    }

    fun animateMarkerBounce(marker: Marker) {
-        animatingMarkers[marker.id]?.let {
+        animatingMarkers[marker]?.let {
            it.cancel()
-            animatingMarkers.remove(marker.id)
+            animatingMarkers.remove(marker)
        }

        val anim = ValueAnimator.ofFloat(0f, 1f).apply {
@@ -119,12 +122,12 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                marker.setAnchor(0.5f, 1.0f + t)
            }
            addListener(onEnd = {
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            }, onCancel = {
-                animatingMarkers.remove(marker.id)
+                animatingMarkers.remove(marker)
            })
        }
-        animatingMarkers[marker.id] = anim
+        animatingMarkers[marker] = anim
        anim.start()
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
+++ b/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
@@ -4,32 +4,40 @@ 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)
-            } else {
-                @Suppress("DEPRECATION")
-                config.locale
-            }
+            val sysConfig: Configuration = context.applicationContext.resources.configuration
+            val appConfig: Configuration = context.resources.configuration
            var ctx = context
-            if (language != "" && language != "default" && sysLocale.language != language) {
+
+
+            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 {
+                // 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)
            }
+
+            ctx = context.createConfigurationContext(appConfig)
            return LocaleContextWrapper(ctx)
        }
    }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt
@@ -2,7 +2,7 @@ package net.vonforst.evmap.viewmodel

 import android.app.Application
 import androidx.lifecycle.*
-import com.google.android.libraries.maps.model.LatLng
+import com.car2go.maps.model.LatLng
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
@@ -193,7 +193,7 @@ data class SliderFilter(
    val unit: String? = ""
 ) : Filter<SliderFilterValue>() {
    override val valueClass: KClass<SliderFilterValue> = SliderFilterValue::class
-    override fun defaultValue() = SliderFilterValue(key, 0)
+    override fun defaultValue() = SliderFilterValue(key, min)
 }

 sealed class FilterValue : BaseObservable(), Equatable {
@@ -230,4 +230,4 @@ data class SliderFilterValue(
    var value: Int
 ) : FilterValue()

-data class FilterWithValue<T : FilterValue>(val filter: Filter<T>, val value: T) : Equatable
+data class FilterWithValue<T : FilterValue>(val filter: Filter<T>, val value: T) : Equatable
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -2,9 +2,9 @@ package net.vonforst.evmap.viewmodel

 import android.app.Application
 import androidx.lifecycle.*
-import com.google.android.libraries.maps.GoogleMap
-import com.google.android.libraries.maps.model.LatLngBounds
-import com.google.android.libraries.places.api.model.Place
+import com.car2go.maps.AnyMap
+import com.car2go.maps.model.LatLng
+import com.car2go.maps.model.LatLngBounds
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -20,6 +20,8 @@ import java.io.IOException

 data class MapPosition(val bounds: LatLngBounds, val zoom: Float)

+data class PlaceWithBounds(val latLng: LatLng, val viewport: LatLngBounds?)
+
 internal fun getClusterDistance(zoom: Float): Int? {
    return when (zoom) {
        in 0.0..7.0 -> 100
@@ -152,13 +154,13 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
        db.chargeLocationsDao().getAllChargeLocations()
    }

-    val searchResult: MutableLiveData<Place> by lazy {
-        MutableLiveData<Place>()
+    val searchResult: MutableLiveData<PlaceWithBounds> by lazy {
+        MutableLiveData<PlaceWithBounds>()
    }

-    val mapType: MutableLiveData<Int> by lazy {
-        MutableLiveData<Int>().apply {
-            value = GoogleMap.MAP_TYPE_NORMAL
+    val mapType: MutableLiveData<AnyMap.Type> by lazy {
+        MutableLiveData<AnyMap.Type>().apply {
+            value = AnyMap.Type.NORMAL
        }
    }

@@ -177,7 +179,7 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
        }
    }

-    fun setMapType(type: Int) {
+    fun setMapType(type: AnyMap.Type) {
        mapType.value = type
    }

--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
--- a/app/src/main/res/drawable/ic_map_marker.xml
+++ b/app/src/main/res/drawable/ic_map_marker.xml
@@ -0,0 +1,12 @@
+<vector android:height="44.11976dp"
+    android:viewportHeight="368.4"
+    android:viewportWidth="233.8"
+    android:width="28dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00e676"
+        android:pathData="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.4c-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.9c-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.6c4.4,-21.1 15.4,-40.6 30.6,-55.7C53.3,14 81.1,1.8 109.8,0zM107.2,74.1c-16.1,3.6 -29.6,17.8 -31,34.5c-1.7,15.5 7.4,31.3 21.3,38.1c15.1,8 34.9,5.5 47.5,-6c11.8,-10.4 16,-28.3 9.9,-42.9C147.6,79.7 126,69.3 107.2,74.1z" />
+    <path
+        android:fillColor="#007e41"
+        android:pathData="M107.2,74.1c18.9,-4.8 40.4,5.5 47.7,23.7c6.1,14.5 1.9,32.5 -9.9,42.9c-12.6,11.5 -32.4,14 -47.5,6c-13.9,-6.8 -23,-22.6 -21.3,-38.1C77.6,92 91.1,77.7 107.2,74.1z" />
+</vector>
--- a/app/src/main/res/drawable/ic_map_marker_charging_highlight_multiple.xml
+++ b/app/src/main/res/drawable/ic_map_marker_charging_highlight_multiple.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="44.11976dp"
+    android:viewportWidth="233.8"
+    android:viewportHeight="368.4">
+  <path
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.8"
+      android:pathData="M143.2,109.4l-19.7,33.8l0,38.1l43.4,-74.4l-22.2,0z" />
+  <path
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.8"
+      android:pathData="M122.2,101.9h16.7h5.7l22.3,-44.6c0,0 -10.2,0 -22.4,0l-1.1,2.2L122.2,101.9z" />
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="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.8l43.4,-74.4h-24.8L138.9,57.3z" />
+</vector>
--- a/app/src/main/res/drawable/ic_map_marker_charging_multiple.xml
+++ b/app/src/main/res/drawable/ic_map_marker_charging_multiple.xml
@@ -0,0 +1,18 @@
+<vector android:height="44.11976dp"
+    android:viewportHeight="368.4"
+    android:viewportWidth="233.8"
+    android:width="28dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="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.4c-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.9c-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,34C53.3,14 81.1,1.8 109.8,0z" />
+  <path
+      android:fillColor="#B5B5B5"
+      android:pathData="M143.2,109.4l-19.7,33.8l0,38.1l43.4,-74.4l-22.2,0z" />
+  <path
+      android:fillColor="#B5B5B5"
+      android:pathData="M122.2,101.9h16.7h5.7l22.3,-44.6c0,0 -10.2,0 -22.4,0l-1.1,2.2L122.2,101.9z" />
+  <path
+      android:fillColor="#808080"
+      android:pathData="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.8l43.4,-74.4h-24.8L138.9,57.3z" />
+</vector>
--- a/app/src/main/res/drawable/ic_paypal.xml
+++ b/app/src/main/res/drawable/ic_paypal.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="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.009c-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.56C3,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.173C6.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.963c0.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.713zM5.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.151l-1.034,5.093L7.183,16H5.137zM18.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,19H8.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.751C18.971,9.557 19.108,10.337 18.906,11.287z"
+        android:fillColor="#000000" />
+</vector>
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -7,7 +7,7 @@

    <fragment
        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:name="net.vonforst.evmap.navigation.NavHostFragment"
        android:layout_height="match_parent"
        android:layout_width="match_parent"
        android:fitsSystemWindows="true"
--- a/app/src/main/res/layout/amu_text_bubble.xml
+++ b/app/src/main/res/layout/amu_text_bubble.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.maps.android.ui.RotationLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@id/amu_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingBottom="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="5dp" />
+
+    </com.google.maps.android.ui.RotationLayout>
+
+</LinearLayout>
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -139,6 +139,8 @@
                android:layout_marginTop="2dp"
                android:text="@{charger.data.amenities}"
                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:autoLink="web"
+                android:linksClickable="true"
                app:goneUnless="@{charger.data.amenities != null}"
                app:layout_constraintEnd_toStartOf="@+id/guideline2"
                app:layout_constraintHorizontal_bias="0.0"
@@ -167,6 +169,8 @@
                android:layout_marginTop="2dp"
                android:text="@{charger.data.generalInformation}"
                android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                android:autoLink="web"
+                android:linksClickable="true"
                app:goneUnless="@{charger.data.generalInformation != null}"
                app:layout_constraintEnd_toStartOf="@+id/guideline2"
                app:layout_constraintHorizontal_bias="0.0"
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -19,12 +19,10 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <fragment
+        <FrameLayout
            android:id="@+id/map"
-            android:name="com.google.android.libraries.maps.SupportMapFragment"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context=".MapsActivity" />
+            android:layout_height="match_parent" />

        <FrameLayout
            android:id="@+id/toolbar_container"
@@ -160,8 +158,8 @@
            android:layout_gravity="top|end"
            android:layout_marginEnd="12dp"
            android:layout_marginTop="96dp"
-            android:tint="?colorControlNormal"
            android:elevation="-1dp"
+            app:tint="?android:colorControlNormal"
            app:backgroundTint="?android:colorBackground"
            app:borderWidth="0dp"
            app:fabSize="mini"
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -41,7 +41,7 @@
            android:layout_marginStart="16dp"
            android:layout_marginTop="16dp"
            android:contentDescription="@{item.contentDescription}"
-            android:tint="?colorPrimary"
+            app:tint="?colorPrimary"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:srcCompat="@{item.icon}"
--- a/app/src/main/res/layout/item_detail_openinghours.xml
+++ b/app/src/main/res/layout/item_detail_openinghours.xml
@@ -47,7 +47,7 @@
            android:layout_marginStart="16dp"
            android:layout_marginTop="16dp"
            android:contentDescription="@{item.contentDescription}"
-            android:tint="?colorPrimary"
+            app:tint="?colorPrimary"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:srcCompat="@{item.icon}"
--- a/app/src/main/res/layout/map_layers.xml
+++ b/app/src/main/res/layout/map_layers.xml
@@ -6,7 +6,7 @@

        <import type="net.vonforst.evmap.viewmodel.MapViewModel" />

-        <import type="com.google.android.libraries.maps.GoogleMap" />
+        <import type="com.car2go.maps.AnyMap" />

        <variable
            name="vm"
@@ -51,24 +51,24 @@
                android:id="@+id/rbStandard"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_NORMAL)}"
-                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_NORMAL)}"
+                android:checked="@{vm.mapType.equals(AnyMap.Type.NORMAL)}"
+                android:onClick="@{() -> vm.setMapType(AnyMap.Type.NORMAL)}"
                android:text="@string/map_type_normal" />

            <RadioButton
                android:id="@+id/rbSatellite"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_HYBRID)}"
-                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_HYBRID)}"
+                android:checked="@{vm.mapType.equals(AnyMap.Type.HYBRID)}"
+                android:onClick="@{() -> vm.setMapType(AnyMap.Type.HYBRID)}"
                android:text="@string/map_type_satellite" />

            <RadioButton
                android:id="@+id/rbTerrain"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_TERRAIN)}"
-                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_TERRAIN)}"
+                android:checked="@{vm.mapType.equals(AnyMap.Type.TERRAIN)}"
+                android:onClick="@{() -> vm.setMapType(AnyMap.Type.TERRAIN)}"
                android:text="@string/map_type_terrain" />
        </RadioGroup>

--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -13,6 +13,14 @@
            android:icon="@drawable/ic_fav"
            android:title="@string/menu_favs" />
    </group>
+    <group
+        android:id="@+id/nav_group_links"
+        android:checkableBehavior="single">
+        <item
+            android:id="@+id/report_new_charger"
+            android:icon="@drawable/ic_add"
+            android:title="@string/menu_report_new_charger" />
+    </group>
    <group
        android:id="@+id/nav_group_settings"
        android:checkableBehavior="single">
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -63,4 +63,7 @@
        android:name="net.vonforst.evmap.fragment.DonateFragment"
        android:label="@string/donate"
        tools:layout="@layout/fragment_donate" />
+    <chrome
+        android:id="@+id/report_new_charger"
+        app:url="@string/report_new_charger_url" />
 </navigation>
--- a/app/src/main/res/raw/maps_night_mode.json
+++ b/app/src/main/res/raw/maps_night_mode.json
@@ -1,191 +0,0 @@
-[
-  {
-    "featureType": "all",
-    "elementType": "geometry",
-    "stylers": [
-      {
-        "color": "#242f3e"
-      }
-    ]
-  },
-  {
-    "featureType": "all",
-    "elementType": "labels.text.stroke",
-    "stylers": [
-      {
-        "lightness": -80
-      }
-    ]
-  },
-  {
-    "featureType": "administrative",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#746855"
-      }
-    ]
-  },
-  {
-    "featureType": "administrative.locality",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#d59563"
-      }
-    ]
-  },
-  {
-    "featureType": "poi",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#d59563"
-      }
-    ]
-  },
-  {
-    "featureType": "poi.park",
-    "elementType": "geometry",
-    "stylers": [
-      {
-        "color": "#263c3f"
-      }
-    ]
-  },
-  {
-    "featureType": "poi.park",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#6b9a76"
-      }
-    ]
-  },
-  {
-    "featureType": "road",
-    "elementType": "geometry.fill",
-    "stylers": [
-      {
-        "color": "#2b3544"
-      }
-    ]
-  },
-  {
-    "featureType": "road",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#9ca5b3"
-      }
-    ]
-  },
-  {
-    "featureType": "road.arterial",
-    "elementType": "geometry.fill",
-    "stylers": [
-      {
-        "color": "#38414e"
-      }
-    ]
-  },
-  {
-    "featureType": "road.arterial",
-    "elementType": "geometry.stroke",
-    "stylers": [
-      {
-        "color": "#212a37"
-      }
-    ]
-  },
-  {
-    "featureType": "road.highway",
-    "elementType": "geometry.fill",
-    "stylers": [
-      {
-        "color": "#746855"
-      }
-    ]
-  },
-  {
-    "featureType": "road.highway",
-    "elementType": "geometry.stroke",
-    "stylers": [
-      {
-        "color": "#1f2835"
-      }
-    ]
-  },
-  {
-    "featureType": "road.highway",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#f3d19c"
-      }
-    ]
-  },
-  {
-    "featureType": "road.local",
-    "elementType": "geometry.fill",
-    "stylers": [
-      {
-        "color": "#38414e"
-      }
-    ]
-  },
-  {
-    "featureType": "road.local",
-    "elementType": "geometry.stroke",
-    "stylers": [
-      {
-        "color": "#212a37"
-      }
-    ]
-  },
-  {
-    "featureType": "transit",
-    "elementType": "geometry",
-    "stylers": [
-      {
-        "color": "#2f3948"
-      }
-    ]
-  },
-  {
-    "featureType": "transit.station",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#d59563"
-      }
-    ]
-  },
-  {
-    "featureType": "water",
-    "elementType": "geometry",
-    "stylers": [
-      {
-        "color": "#17263c"
-      }
-    ]
-  },
-  {
-    "featureType": "water",
-    "elementType": "labels.text.fill",
-    "stylers": [
-      {
-        "color": "#515c6d"
-      }
-    ]
-  },
-  {
-    "featureType": "water",
-    "elementType": "labels.text.stroke",
-    "stylers": [
-      {
-        "lightness": -20
-      }
-    ]
-  }
-]
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -34,6 +34,8 @@
    <string name="github_link_title">Quellcode</string>
    <string name="oss_licenses">Open Source-Lizenzen</string>
    <string name="settings">Einstellungen</string>
+    <string name="settings_ui">Oberfläche</string>
+    <string name="settings_map">Karte</string>
    <string name="copyright">Copyright</string>
    <string name="copyright_summary">©2020 Johan von Forstner</string>
    <string name="other">Sonstiges</string>
@@ -66,7 +68,6 @@
    <string name="show_less">weniger…</string>
    <string name="favorites_empty_state">Wenn du Ladestationen als Favorit markierst, tauchen sie hier auf.</string>
    <string name="donate">Spenden</string>
-    <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="donation_successful">Vielen Dank! ❤️</string>
    <string name="donation_failed">Etwas ist schiefgelaufen. 😕</string>
    <string name="map_type_normal">Standard</string>
@@ -101,6 +102,11 @@
    <string name="filter_exclude_faults">Ladesäulen mit Störung ausschließen</string>
    <string name="charge_cards">Ladetarife</string>
    <string name="and_n_others">und %d weitere</string>
+    <string name="pref_map_provider">Kartenanbieter</string>
+    <string name="twitter">Twitter</string>
+    <string name="goingelectric_forum">Forenthread bei GoingElectric.de</string>
+    <string name="contact">Kontakt</string>
+    <string name="menu_report_new_charger">Ladesäule melden</string>
    <plurals name="charge_cards_compatible_num">
        <item quantity="one">%d kompatibler Ladetarif</item>
        <item quantity="other">%d kompatible Ladetarife</item>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="ChromeCustomTabsNavigator">
+        <attr name="url" format="reference" />
+    </declare-styleable>
+</resources>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -4,4 +4,8 @@
    <string name="github_link">https://github.com/johan12345/EVMap</string>
    <string name="privacy_link">https://evmap.vonforst.net/privacy.html</string>
    <string name="faq_link">https://evmap.vonforst.net/faq.html</string>
+    <string name="twitter_handle">\@ev_map</string>
+    <string name="twitter_url">https://twitter.com/ev_map</string>
+    <string name="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
+    <string name="report_new_charger_url">https://www.goingelectric.de/stromtankstellen/new/</string>
 </resources>
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="amu_text" type="id" />
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,8 @@
    <string name="github_link_title">Source code</string>
    <string name="oss_licenses">Open Source Licenses</string>
    <string name="settings">Settings</string>
+    <string name="settings_ui">User Interface</string>
+    <string name="settings_map">Map</string>
    <string name="copyright">Copyright</string>
    <string name="copyright_summary">©2020 Johan von Forstner</string>
    <string name="other">Other</string>
@@ -65,7 +67,6 @@
    <string name="show_less">less…</string>
    <string name="favorites_empty_state">If you add chargers as favorites, they will show up here.</string>
    <string name="donate">Donate</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="donation_successful">Thank you! ❤️</string>
    <string name="donation_failed">Something went wrong. 😕</string>
    <string name="map_type_normal">Default</string>
@@ -100,6 +101,11 @@
    <string name="filter_exclude_faults">Exclude chargers with reported faults</string>
    <string name="charge_cards">Payment methods</string>
    <string name="and_n_others">and %d others</string>
+    <string name="pref_map_provider">Map provider</string>
+    <string name="twitter">Twitter</string>
+    <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
+    <string name="contact">Contact</string>
+    <string name="menu_report_new_charger">Report new charger</string>
    <plurals name="charge_cards_compatible_num">
        <item quantity="one">%d compatible payment method</item>
        <item quantity="other">%d compatible payment methods</item>
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -21,6 +21,18 @@
        <Preference
            android:key="donate"
            android:title="@string/donate" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/contact">
+
+        <Preference
+            android:key="twitter"
+            android:title="@string/twitter"
+            android:summary="@string/twitter_handle" />
+
+        <Preference
+            android:key="goingelectric"
+            android:title="@string/goingelectric_forum" />

    </PreferenceCategory>

--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

-    <PreferenceCategory android:title="@string/settings">
-
-        <CheckBoxPreference
-            android:key="navigate_use_maps"
-            android:title="@string/pref_navigate_use_maps"
-            android:summaryOn="@string/pref_navigate_use_maps_on"
-            android:summaryOff="@string/pref_navigate_use_maps_off"
-            android:defaultValue="true" />
+    <PreferenceCategory android:title="@string/settings_ui">

        <ListPreference
            android:key="language"
@@ -27,4 +20,22 @@
            android:summary="@string/pref_darkmode_summary" />

    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/settings_map">
+
+        <ListPreference
+            android:key="map_provider"
+            android:title="@string/pref_map_provider"
+            android:entries="@array/pref_map_provider_names"
+            android:entryValues="@array/pref_map_provider_values"
+            android:defaultValue="@string/pref_map_provider_default"
+            android:summary="%s" />
+
+        <CheckBoxPreference
+            android:key="navigate_use_maps"
+            android:title="@string/pref_navigate_use_maps"
+            android:summaryOn="@string/pref_navigate_use_maps_on"
+            android:summaryOff="@string/pref_navigate_use_maps_off"
+            android:defaultValue="true" />
+
+    </PreferenceCategory>
 </PreferenceScreen>
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"

@@ -25,6 +25,7 @@ allprojects {
        google()
        jcenter()
        maven { url 'https://jitpack.io' }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
        flatDir {
            dirs 'libs'
        }
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file("api-7125266970515251116-798419-8e2dda660c80.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("net.vonforst.evmap") # e.g. com.krausefx.app
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end
--- a/fastlane/metadata/android/de-DE/changelogs/20.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/20.txt
@@ -0,0 +1,4 @@
+Verbesserungen:
+- Verändertes Layout für Filter nach Anschluss (bessere Stabilität)
+- Absturz bei fehlender Internetverbindung behoben
+- Fehlende Übersetzungen eingefügt
--- a/fastlane/metadata/android/de-DE/changelogs/25.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/25.txt
@@ -0,0 +1,6 @@
+Verbesserungen:
+- Sortierung in Filterdialogen unabhängig von Groß- und Kleinschreibung
+- Vertikale Position der Marker auf der Karte korrigiert
+- Neues Icon für Ladestationen mit mehr als einem Anschluss (bei Schnelladern: mehr als ein schnelladefähiger Anschluss)
+- "Über EVMap": Links zu Twitter-Account @ev_map und Thread im GoingElectric-Forum hinzugefügt
+- Button "Ladesäule melden" im Hauptmenü hinzugefügt
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -0,0 +1,17 @@
+Mit EVMap kannst du Stromtankstellen in deiner Nähe komfortabel über dein Android-Smartphone finden. Die Datenbank von GoingElectric.de wird als Datenquelle genutzt und bietet Community-gepflegte Informationen zu mehr als 100.000 Ladepunkten an über 40.000 Standorten in 48 Ländern (die meisten in Europa). Für viele Ladepunkte kann zusätzlich der aktuelle Status (verfügbar oder belegt) angezeigt werden.
+
+Funktionen:
+- Zeitgemäßes Material Design
+- Anzeige der Stromtankstellen aus dem GoingElectric-Stromtankstellenverzeichnis
+- Echtzeit-Verfügbarkeitsanzeige für viele Ladesäulen
+- Direkte Links zu Chargeprice.app für einen Preisvergleich für die jeweilige Ladesäule
+- Markierung des aktuellen Standorts
+- Google Maps-Verkehrsdaten
+- Suche nach Orten
+- Erweiterte Filterfunktionen
+- Favoritenliste, auch mit Anzeige der Verfügbarkeit
+- Keine nervige Werbung
+
+EVMap ist ein Open-Source-Projekt und unter https://github.com/johan12345/EVMap zu finden.
+
+Die App ist kein offizielles Angebot von GoingElectric.de, sondern nutzt die öffentliche API dieser Seite.
--- a/fastlane/metadata/android/de-DE/images/featureGraphic.png
+++ b/fastlane/metadata/android/de-DE/images/featureGraphic.png
--- a/fastlane/metadata/android/de-DE/images/icon.png
+++ b/fastlane/metadata/android/de-DE/images/icon.png
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
--- a/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
+++ b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -0,0 +1 @@
+Finde Elektroauto-Ladestationen in deiner Nähe
--- a/fastlane/metadata/android/de-DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -0,0 +1 @@
+EVMap - Elektroauto-Ladestationen
--- a/fastlane/metadata/android/de-DE/video.txt
+++ b/fastlane/metadata/android/de-DE/video.txt
--- a/fastlane/metadata/android/en-US/changelogs/20.txt
+++ b/fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1,4 @@
+Improvements:
+- Different layout for filtering by connector (with better stability)
+- Crash fixed when internet is not available
+- Added missing German translations
--- a/fastlane/metadata/android/en-US/changelogs/25.txt
+++ b/fastlane/metadata/android/en-US/changelogs/25.txt
@@ -0,0 +1,6 @@
+Improvements:
+- Sorting of filter dialogs is case-insensitive
+- Vertical positions of map markers fixed
+- New icon for chargers with more than one connector (for fast chargers: more than one fast-charging connector)
+- "About EVMap": Added links to Twitter account @ev_map and GoingElectric.de forum thread
+- Added button "rerport new charger" in main menu
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,16 @@
+Using EVMap, you can find electric vehicle chargers comfortably using your Android phone. It provides mobile access to the community-driven database from GoingElectric.de, containing more than 100,000 chargepoints at 40,000 locations in 48 countries (focusing on Europe). For many chargepoints, you can see real-time status information.
+
+Features:
+- Material Design
+- Shows all charging stations from the community-maintained GoingElectric.de directory
+- Realtime availability information (beta)
+- Direct link to Chargeprice.app for comparing prices
+- Marker for current location
+- Search places
+- Favorites list, also with availability information
+- Advanced filtering options
+- No ads, fully open source
+
+EVMap is an open source project and can be found at https://github.com/johan12345/EVMap.
+
+This app is not an official product of GoingElectric.de, but only uses its public API.
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Find electric vehicle charging stations
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+EVMap - Electric vehicle chargers
--- a/fastlane/metadata/android/en-US/video.txt
+++ b/fastlane/metadata/android/en-US/video.txt
Author	SHA1	Message	Date
johan12345	dfaf841160	Release 0.3.4	2020-08-24 22:20:43 +02:00
johan12345	c18ea5b15d	add link “report new station” to main menu (fixes #53 )	2020-08-24 20:11:44 +02:00
johan12345	62116473c8	Navigation component: add settings as top-level destination	2020-08-24 19:46:32 +02:00
johan12345	bc8106bd81	add Google Maps API key only to Google variant	2020-08-23 23:35:46 +02:00
johan12345	7bd89b9ecb	get rid of Mapbox telemetry dependency	2020-08-23 23:31:01 +02:00
Johan von Forstner	898b61945e	Make links under "general information" and "amenities" clickable	2020-08-23 12:25:38 +02:00
Johan von Forstner	38e022b547	Add links to Twitter account and GoingElectric.de forum thread	2020-08-22 20:07:33 +02:00
Johan von Forstner	b8c438503c	add new icon for "more than one connector"	2020-08-22 09:20:05 +02:00
Johan von Forstner	2ca6a8e3e8	fix vertical position of markers	2020-08-22 08:21:13 +02:00
Johan von Forstner	0ae201e363	MultiSelectDialog: case-insensitive sorting (fixes #44 )	2020-08-22 08:11:50 +02:00
Johan von Forstner	9e0f535a13	Release 0.3.3	2020-08-16 13:47:23 +02:00
Johan von Forstner	d4a6789b00	Dark mode: fix icon tint for layers FAB	2020-08-16 13:46:00 +02:00
Johan von Forstner	d9415ed7a0	fix LocaleContextWrapper	2020-08-16 13:42:13 +02:00
Johan von Forstner	778d7293f4	set up fastlane and download metadata	2020-08-13 21:18:38 +02:00
Johan von Forstner	19a8b5c9fe	Release 0.3.2	2020-08-12 19:50:54 +02:00
Johan von Forstner	7f3c481dcb	allow to configure API keys with Gradle properties (necessary for F-Droid)	2020-08-12 19:50:31 +02:00
Johan von Forstner	8a54b5cb05	SliderFilter: fix default value for min > 0	2020-08-12 19:30:57 +02:00
johan12345	91b3234a45	fix URL of sonatype snapshots repo	2020-08-12 08:23:16 +02:00
johan12345	ab7cbc981b	fix URL of sonatype snapshots repo	2020-08-12 08:12:02 +02:00
johan12345	a2c1a2cf82	move signingConfigs configuration for F-Droid	2020-08-11 20:10:14 +02:00
johan12345	167ede4e62	Release 0.3.1	2020-08-11 19:41:38 +02:00
johan12345	63900996e7	update .gitignore	2020-08-11 19:41:05 +02:00
johan12345	c626f3d5a5	update AnyMaps (fixes crash)	2020-08-11 19:40:22 +02:00
johan12345	8779e65846	set default map provider in google flavor back to google	2020-08-11 19:23:34 +02:00
johan12345	0c8bf84e56	adjust signingConfig configuration for compatibility with F-Droid	2020-08-11 19:18:46 +02:00
johan12345	90972cf933	fix lint errors	2020-08-10 20:49:18 +02:00
johan12345	7d9a9605fb	Release 0.3.0	2020-08-10 20:43:04 +02:00
johan12345	a0bc0f2981	update dependencies	2020-08-10 20:35:53 +02:00
johan12345	f3b4c8a8ff	implement donations for FOSS version (PayPal)	2020-08-10 20:31:35 +02:00
Johan von Forstner	6a8220c1c2	implement autocomplete for Mapbox	2020-08-09 17:35:31 +02:00
Johan von Forstner	84c28748a4	update travis configuration with build flavors	2020-08-09 13:21:55 +02:00
Johan von Forstner	7c29b619a5	implement switching between map providers in settings Google Maps and Mapbox	2020-08-09 13:09:48 +02:00
Johan von Forstner	ccfdbbe826	update AnyMaps	2020-08-09 12:37:31 +02:00
Johan von Forstner	7052ce3c3c	fixes for Google Maps and OSM variants	2020-08-09 12:22:58 +02:00
Johan von Forstner	d73ca8aa9d	Travis CI: add Mapbox API Key	2020-08-08 19:50:42 +02:00
Johan von Forstner	64703a8c28	update AnyMaps	2020-08-08 19:46:28 +02:00
Johan von Forstner	eb54658bf4	update Gradle plugin	2020-08-06 19:54:20 +02:00
Johan von Forstner	54d1c8ba61	update anymap with mapbox fixes	2020-08-06 19:54:08 +02:00
Johan von Forstner	1c04f6211f	update anymap, use mapbox	2020-07-31 18:40:46 +02:00
Johan von Forstner	45497f9208	OSM: implement night mode	2020-07-24 20:27:12 +02:00
Johan von Forstner	140c634397	start splitting app in FOSS and Google variants	2020-07-23 12:20:09 +02:00
johan12345	be1b3813a9	update AnyMaps	2020-07-20 22:52:50 +02:00
johan12345	f7ed7f1e93	use AnyMaps to make the map view able to use OSM maps	2020-07-20 22:39:22 +02:00
johan12345	0df72ac4ad	update Material Components library	2020-07-19 21:03:43 +02:00
				`@@ -0,0 +1 @@`
				`Finde Elektroauto-Ladestationen in deiner Nähe`