AA/AAOS: implement TabTemplate for detail view

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: johan12345
-custom: ['https://paypal.me/johan98', 'https://ev-map.app/donate/']
+custom: ['https://paypal.me/johan98', 'http://ts.la/johan94494']

.github/workflows/apikeys-ci.xml

@@ -1,12 +1,9 @@
 <resources>
    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
    <string name="mapbox_key" translatable="false">ci</string>
-   <string name="jawg_key" translatable="false">ci</string>
-   <string name="arcgis_key" translatable="false">ci</string>
    <string name="goingelectric_key" translatable="false">ci</string>
+   <string name="chargeprice_key" translatable="false">ci</string>
    <string name="openchargemap_key" translatable="false">ci</string>
-   <string name="nobil_key" translatable="false">ci</string>
    <string name="fronyx_key" translatable="false">ci</string>
    <string name="acra_credentials" translatable="false">ci:ci</string>
-   <string name="evmap_key" translatable="false">ci</string>
 </resources>

.github/workflows/release.yml

@@ -11,41 +11,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Set up Java environment
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v2
         with:
-          java-version: 21
+          java-version: 17
           distribution: 'zulu'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
-
+          cache: 'gradle'
       - name: Decrypt keystore
         run: openssl aes-256-cbc -K  ${{ secrets.encrypted_53968681344a_key }} -iv  ${{ secrets.encrypted_53968681344a_iv }} -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
       - name: Extract version code
-        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s*=\s*[0-9]\+" app/build.gradle.kts | awk '{ print $3 }' | tr -d \''"\\')" >> $GITHUB_ENV
+        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s\+[0-9]*" app/build.gradle | awk '{ print $2 }' | tr -d \''"\\')" >> $GITHUB_ENV
 
-      - name: Build app release & export licenses
+      - name: Build app release
         env:
-          EVMAP_API_KEY: ${{ secrets.EVMAP_API_KEY }}
           GOINGELECTRIC_API_KEY: ${{ secrets.GOINGELECTRIC_API_KEY }}
           OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
           CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
-          JAWG_API_KEY: ${{ secrets.JAWG_API_KEY }}
-          ARCGIS_API_KEY: ${{ secrets.ARCGIS_API_KEY }}
           GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
-          ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}
-          NOBIL_API_KEY: ${{ secrets.NOBIL_API_KEY }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}
-        run: ./gradlew exportLibraryDefinitions assembleRelease
-
-      - name: Export licenses in Appning format
-        run: python3 _ci/export_licenses_appning.py
+        run: ./gradlew assembleRelease --no-daemon
 
       - name: release
         uses: actions/create-release@v1
@@ -95,40 +85,3 @@ jobs:
           asset_path: app/build/outputs/apk/fossAutomotive/release/app-foss-automotive-release.apk
           asset_name: app-foss-automotive-release.apk
           asset_content_type: application/vnd.android.package-archive
-      - name: upload Licenses
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/generated/aboutLibraries/aboutlibraries.json
-          asset_name: aboutlibraries.json
-          asset_content_type: application/json
-      - name: upload Licenses Appning
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: licenses_fossAutomotiveRelease_appning.csv
-          asset_name: licenses_fossAutomotiveRelease_appning.csv
-          asset_content_type: text/csv
-      - name: upload Licenses Appning
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: licenses_fossNormalRelease_appning.csv
-          asset_name: licenses_fossNormalRelease_appning.csv
-          asset_content_type: text/csv
-
-      - name: Trigger Website update
-        run: |
-          curl -L \
-            -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: Bearer ${{ github.token }}" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/ev-map/ev-map.github.io/dispatches \
-            -d "{\"event_type\": \"trigger-workflow\"}"

.github/workflows/tests.yml

@@ -16,77 +16,21 @@ jobs:
         buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
 
       - name: Set up Java environment
-        uses: actions/setup-java@v5
-        with:
-          java-version: 21
-          distribution: 'zulu'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
-
-      - name: Copy apikeys.xml
-        run: cp _ci/apikeys-ci.xml app/src/main/res/values/apikeys.xml
-
-      - name: Build app
-        run: ./gradlew assemble${{ matrix.buildvariant }}Debug
-      - name: Run unit tests
-        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest
-      - name: Run Android Lint
-        run: ./gradlew lint${{ matrix.buildvariant }}Debug
-      - name: Check licenses
-        run: ./gradlew exportLibraryDefinitions
-
-  apk_check:
-    name: Release APK checks (${{ matrix.buildvariant }})
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
-
-    steps:
-      - name: Install checksec
-        run: sudo apt install -y checksec
-
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Java environment
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v2
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
 
       - name: Copy apikeys.xml
-        run: cp _ci/apikeys-ci.xml app/src/main/res/values/apikeys.xml
+        run: cp .github/workflows/apikeys-ci.xml app/src/main/res/values/apikeys.xml
 
       - name: Build app
-        run: ./gradlew assemble${{ matrix.buildvariant }}Release
-
-      - name: Unpack native libraries from APK
-        run: |
-          VARIANT_FILENAME=$(echo ${{ matrix.buildvariant }} | sed -E 's/([a-z])([A-Z])/\1-\2/g' | tr 'A-Z' 'a-z')
-          VARIANT_FOLDER=$(echo ${{ matrix.buildvariant }} | sed -E 's/^([A-Z])/\L\1/')
-          APK_FILE="app/build/outputs/apk/$VARIANT_FOLDER/release/app-$VARIANT_FILENAME-release-unsigned.apk"
-          unzip $APK_FILE "lib/*"
-
-      - name: Run checksec on native libraries
-        run: |
-          checksec --output=json --dir=lib > checksec_output.json
-          jq --argjson exceptions '[
-            "lib/arm64-v8a/libc++_shared.so",
-            "lib/armeabi-v7a/libc++_shared.so",
-            "lib/x86/libc++_shared.so",
-            "lib/x86_64/libc++_shared.so"
-          ]' '
-            to_entries
-            | map(select(.value.fortify_source == "no" and (.key as $lib | $exceptions | index($lib) | not)))
-            | if length > 0 then
-                error("The following libraries do not have fortify enabled (and are not in the exception list): " + (map(.key) | join(", ")))
-              else
-                "All libraries have fortify enabled or are in the exception list."
-            end
-          ' checksec_output.json
+        run: ./gradlew assemble${{ matrix.buildvariant }}Debug --no-daemon
+      - name: Run unit tests
+        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
+      - name: Run Android Lint
+        run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon

.gitignore

@@ -1,6 +1,5 @@
 *.iml
 .gradle
-.kotlin
 /local.properties
 /.idea/*
 .DS_Store
@@ -13,6 +12,4 @@ apikeys.xml
 /app/**/*.apk
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
-output-metadata.json
-licenses_*.csv
-gradle/gradle-daemon-jvm.properties
+output-metadata.json

Gemfile.lock

@@ -2,40 +2,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    abbrev (0.1.2)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    artifactory (3.0.17)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1196.0)
-    aws-sdk-core (3.240.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      bigdecimal
-      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.208.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    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.5)
-    aws-sigv4 (1.12.1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.3)
-    base64 (0.3.0)
-    benchmark (0.5.0)
-    bigdecimal (4.0.1)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    csv (3.3.5)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
     declarative (0.0.20)
     declarative-option (0.1.0)
     digest-crc (0.6.1)
@@ -44,174 +35,118 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.0.0)
-    excon (1.5.0)
-      logger
-    faraday (1.10.6)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
+    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-em_http (1.0.0)
-    faraday-em_synchrony (1.0.1)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.2.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.4)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.0)
-    fastlane (2.237.0)
-      CFPropertyList (>= 2.3, < 5.0.0)
-      abbrev (~> 0.1)
-      addressable (>= 2.9.0, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.197)
+    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)
-      base64 (~> 0.2)
-      benchmark (>= 0.1.0)
-      bundler (>= 2.4.0, < 5.0.0)
-      colored (~> 1.2)
-      commander (~> 4.6)
-      csv (~> 3.3)
+      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, < 2.0.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)
-      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.3.0)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      http-cookie (~> 1.0.5)
+      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.10.3, < 4)
-      logger (>= 1.6, < 2.0)
+      jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multi_json (~> 1.12)
-      multipart-post (>= 2.0.0, < 3.0.0)
-      mutex_m (~> 0.3)
-      naturally (~> 2.2)
-      nkf (~> 0.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      ostruct (>= 0.1.0)
+      multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
+      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 (~> 3)
+      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.4.1)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.1.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.104.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.18.0)
+    google-api-client (0.38.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
-      mutex_m
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-    google-apis-iamcredentials_v1 (0.28.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.18.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.64.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.9.0)
-      google-cloud-env (>= 1.0, < 3.a)
+      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 (2.2.2)
-      base64 (~> 0.2)
-      faraday (>= 1.0, < 3.a)
+    google-cloud-env (1.3.3)
+      faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.62.0)
-      addressable (~> 2.8)
+    google-cloud-storage (1.27.0)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-apis-core (>= 0.18, < 2)
-      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (>= 0.42)
-      google-cloud-core (~> 1.6)
-      googleauth (~> 1.9)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    google-logging-utils (0.2.0)
-    googleauth (1.17.1)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.2)
-      google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 4.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)
-      pstore (~> 0.1)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.8)
+      signet (~> 0.14)
+    highline (1.7.10)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.2)
+    jmespath (1.6.1)
     json (2.3.1)
-    jwt (3.2.0)
-      base64
-    logger (1.7.0)
+    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.4.1)
-    mutex_m (0.3.0)
+    multipart-post (2.0.0)
     nanaimo (0.3.0)
     naturally (2.2.0)
-    nkf (0.3.0)
-    optparse (0.8.1)
     os (1.1.1)
-    ostruct (0.6.3)
     plist (3.5.0)
-    pstore (0.2.1)
-    public_suffix (7.0.5)
+    public_suffix (4.0.6)
     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 (3.28.0)
-    ruby2_keywords (0.0.5)
+    rouge (2.0.7)
     rubyzip (2.3.0)
-    security (0.1.5)
-    signet (0.22.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 4.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 (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    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)
@@ -220,6 +155,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.18.0)
@@ -228,13 +164,13 @@ GEM
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-    xcpretty (0.4.1)
-      rouge (~> 3.28.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  x64-mingw-ucrt
+  x64-mingw32
   x86_64-linux
 
 DEPENDENCIES

LICENSE

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

README.md

@@ -20,11 +20,11 @@ Features
 - Search for places
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
+- Integrated price comparison using [Chargeprice.app](https://chargeprice.app) (only in Europe)
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
-- Can use Google Maps or OpenStreetMap as map backends - the version available on F-Droid only uses
-  OSM.
+- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
 
 Screenshots
 -----------
@@ -37,18 +37,17 @@ Development setup
 The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
 the Git repository and open the project with Android Studio.
 
-The only exception is that you need to obtain some API keys for the different data sources that
+The only exception is that you need to obtain some free API keys for the different data sources that
 EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-There are four different build flavors, `googleNormal`, `fossNormal`, `googleAutomotive`, and
-`fossAutomotive`.
-
-- The `foss` variants only use OSM data for the base map and place search. They should run on most Android devices, even those without Google Play Services.
+There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
+- The `foss` variants only use Mapbox data and should run on most Android devices, even without
+  Google Play Services.
     - `fossNormal` is intended to run on smartphones and tablets, and also includes the Android
-      Auto app for use on the car display (however Android Auto may not work if the app is not
-      installed from Google Play, see https://github.com/ev-map/EVMap/issues/319).
+      Auto app for use on the car display (however for that to work, the Android Auto app is
+      necessary, which in turn does require Google Play Services).
     - `fossAutomotive` can be installed directly on
       [Android Automotive OS (AAOS)](https://source.android.com/docs/automotive/start/what_automotive)
       headunits without Google services.
@@ -76,15 +75,5 @@ You can use our [Weblate page](https://hosted.weblate.org/projects/evmap/) to he
 into new languages.
 
 <a href="https://hosted.weblate.org/engage/evmap/">
-<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="400" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="500" alt="Translation status" />
 </a>
-
-Sponsors
---------
-
-Many users currently support the development of EVMap with their donations. You can find more
-information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
-
-<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="38"/></a><br>
-Since May 2024, **JawgMaps** provide their OpenStreetMap vector map tiles service to EVMap for
-free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.

_ci/export_licenses_appning.py

@@ -1,20 +0,0 @@
-import subprocess
-import json
-
-build_types = ["fossNormalRelease", "fossAutomotiveRelease"]
-
-for build_type in build_types:
-    data = json.load(
-        open(f"app/build/generated/aboutLibraries/{build_type}/res/raw/aboutlibraries.json"))
-
-    with open(f"licenses_{build_type}_appning.csv", "w") as f:
-        f.write("component_name;license_title;license_url;public_repository;copyrights\n")
-        for lib in data["libraries"]:
-            license = data["licenses"][lib["licenses"][0]] if len(lib["licenses"]) > 0 else None
-            license_name = license["name"] if license is not None else " "
-            license_url = license["url"] if license is not None else " "
-            copyrights = ", ".join([dev["name"] for dev in lib["developers"] if "name" in dev])
-            if copyrights == "":
-                copyrights = " "
-            repo_url = lib['scm']['url'] if 'scm' in lib else ''
-            f.write(f"{lib['name']};{license_name};{license_url};\"{copyrights}\";{repo_url}\n")

_img/appicon_monochrome.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" version="1.1"
-    viewBox="0 0 108 108">
-    <defs>
-        <style>
-            .cls-1 {
-            fill: #000;
-            stroke-width: 0px;
-            }
-        </style>
-    </defs>
-    <path class="cls-1"
-        d="M53.9,28c-8.8,0-15.9,7.1-15.9,15.9s13.4,18.2,15,35.3c0,.5.5.9,1,.9s.9-.4,1-.9c1.6-17.1,15-23.3,15-35.3-.1-8.8-7.2-15.9-16-15.9ZM59,43.1l-6.1,10.5v-7.9h-2.6v-9.6s8.8,0,8.7,0l-3.5,7h3.5Z" />
-</svg>

_img/connectors/connector_mcs.svg

@@ -1,14 +0,0 @@
-<svg id="vector" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <title>connector_mcs</title>
-
-    <path fill="#000000" d="M7.57,2.904A5.168,5.168 0,0 0,2.4 8.074a5.168,5.168 0,0 0,1.097 3.181l5.656,7.24A3.616,3.616 0,0 0,12 19.885a3.616,3.616 0,0 0,2.843 -1.389l5.656,-7.24 A5.168,5.168 0,0 0,21.6 8.074a5.168,5.168 0,0 0,-5.17 -5.17z" fill-opacity="0" stroke="#000" stroke-width="2" id="path_0"/>
-
-    <path d="M11.5 10.159a1.0 1.0 0 0 0 -1.0 1.0 1.0 1.0 0 0 0 1.0 1.0h1.0a1.0 1.0 0 0 0 1.0 -1.0 1.0 1.0 0 0 0 -1.0 -1.0z"/>
-    <circle fill="none" stroke="black" stroke-width="1px" cx="7.5" cy="8.074" r="2.9" />
-    <circle fill="none" stroke="black" stroke-width="1px" cx="16.5" cy="8.074" r="2.9" />
-
-    <circle cx="9" cy="13" r="1" />
-    <circle cx="15" cy="13" r="1" />
-
-    <circle fill="none" stroke="black" stroke-width="1px" cx="12" cy="15.5" r="1.8" />
-</svg>

_img/connectors/connector_unknown.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path
-        d="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z" />
-</svg>

_img/ic_launcher-playstore.svg

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-    <defs>
-        <style>
-            .cls-1 {
-            fill: #00e676;
-            }
-
-            .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8 {
-            stroke-width: 0px;
-            }
-
-            .cls-2 {
-            fill: rgba(255, 255, 255, .2);
-            }
-
-            .cls-3 {
-            fill: #ffb300;
-            }
-
-            .cls-4 {
-            fill: #000;
-            isolation: isolate;
-            opacity: .45;
-            }
-
-            .cls-5 {
-            fill: #fff;
-            }
-
-            .cls-6 {
-            fill: #90a4ae;
-            }
-
-            .cls-7 {
-            fill: #546e7a;
-            }
-
-            .cls-8 {
-            fill: rgba(62, 39, 35, .2);
-            }
-        </style>
-    </defs>
-    <g id="Layer_1" data-name="Layer 1">
-        <g>
-            <rect class="cls-5" width="512" height="512" />
-            <g>
-                <g>
-                    <path class="cls-3"
-                        d="M159.42,338.98l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01ZM194.26,334.92l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01Z" />
-                    <path class="cls-6"
-                        d="M212.53,411.37c-3.04,3.72-5.41,6.09-5.75,6.43-8.79,7.1-15.9,9.13-21.65,6.43-10.15-5.07-9.47-24.02-9.13-26.05l7.1.34c-.34,5.41.68,16.91,5.41,19.28,2.71,1.35,7.44-.34,13.53-5.41h0s19.62-19.62,15.56-35.18c-4.74-18.6,16.91-45.33,24.02-54.46l1.01-1.01,5.75,4.4-1.01,1.35c-21.99,27.06-24.35,40.93-22.66,48.03,3.38,13.53-5.75,28.08-12.18,35.85Z" />
-                    <path class="cls-6"
-                        d="M137.78,338.3l2.71,23,21.31,14.21,28.75-3.04,17.59-18.6-2.71-23-67.65,7.44Z" />
-                    <path class="cls-7"
-                        d="M190.21,372.47l-28.75,3.04,6.09,25.37,22.66-2.71v-25.71h0ZM210.84,311.58l2.37,20.97-82.53,9.47-2.37-20.97,82.53-9.47Z" />
-                </g>
-                <g>
-                    <g>
-                        <path class="cls-1"
-                            d="M275.45,80.22c-59.19,0-107.23,48.03-107.23,107.23,0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47-.68-59.53-48.71-107.23-107.9-107.23Z" />
-                        <path class="cls-2"
-                            d="M275.45,82.58c58.86,0,106.55,47.36,107.23,105.87v-1.01c0-59.19-48.03-107.23-107.23-107.23s-107.23,47.69-107.23,107.23v1.01c.68-58.52,48.37-105.87,107.23-105.87h0Z" />
-                        <path class="cls-8"
-                            d="M281.87,423.21c-.34,3.38-3.04,5.75-6.43,5.75s-6.09-2.37-6.43-5.75c-10.49-115.01-100.12-157.29-100.8-237.12v1.69c0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47v-1.69c-1.35,79.83-90.99,122.11-101.48,237.12h0Z" />
-                    </g>
-                    <path class="cls-4"
-                        d="M250.75,135.01v64.94h17.59v53.11l41.27-71.03h-23.68l23.68-47.36c.34.34-58.86.34-58.86.34Z" />
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

_misc/taginfo.json

@@ -1,231 +0,0 @@
-{
-  "data_format": 1,
-  "data_url": "https://raw.githubusercontent.com/ev-map/evmap/master/_misc/taginfo.json",
-  "data_updated": "20250921T140000Z",
-  "project": {
-    "name": "EVMap",
-    "description": "Find electric vehicle chargers comfortably using your Android phone.",
-    "project_url": "https://ev-map.app/",
-    "doc_url": "https://github.com/ev-map/evmap-osm",
-    "icon_url": "https://avatars.githubusercontent.com/u/115927597?s=32",
-    "contact_name": "Johan von Forstner",
-    "contact_email": "evmap@vonforst.net"
-  },
-  "tags": [
-    {
-      "key": "amenity",
-      "value": "charging_station",
-      "description": "Used to display charging stations."
-    },
-    {
-      "key": "name"
-    },
-    {
-      "key": "network"
-    },
-    {
-      "key": "authentication:none",
-      "value": "yes"
-    },
-    {
-      "key": "operator"
-    },
-    {
-      "key": "description"
-    },
-    {
-      "key": "website"
-    },
-    {
-      "key": "addr:city"
-    },
-    {
-      "key": "addr:country"
-    },
-    {
-      "key": "addr:postcode"
-    },
-    {
-      "key": "addr:street"
-    },
-    {
-      "key": "addr:housenumber"
-    },
-    {
-      "key": "addr:housename"
-    },
-    {
-      "key": "socket:type1"
-    },
-    {
-      "key": "socket:type1:output"
-    },
-    {
-      "key": "socket:type1_combo"
-    },
-    {
-      "key": "socket:type1_combo:output"
-    },
-    {
-      "key": "socket:type2"
-    },
-    {
-      "key": "socket:type2:output"
-    },
-    {
-      "key": "socket:type2_cable"
-    },
-    {
-      "key": "socket:type2_cable:output"
-    },
-    {
-      "key": "socket:type2_combo"
-    },
-    {
-      "key": "socket:type2_combo:output"
-    },
-    {
-      "key": "socket:chademo"
-    },
-    {
-      "key": "socket:chademo:output"
-    },
-    {
-      "key": "socket:tesla_standard"
-    },
-    {
-      "key": "socket:tesla_standard:output"
-    },
-    {
-      "key": "socket:tesla_supercharger"
-    },
-    {
-      "key": "socket:tesla_supercharger:output"
-    },
-    {
-      "key": "socket:tesla_supercharger_ccs"
-    },
-    {
-      "key": "socket:tesla_supercharger_ccs:output"
-    },
-    {
-      "key": "socket:cee_blue"
-    },
-    {
-      "key": "socket:cee_blue:output"
-    },
-    {
-      "key": "socket:cee_red_16a"
-    },
-    {
-      "key": "socket:cee_red_16a:output"
-    },
-    {
-      "key": "socket:cee_red_32a"
-    },
-    {
-      "key": "socket:cee_red_32a:output"
-    },
-    {
-      "key": "socket:cee_red_63a"
-    },
-    {
-      "key": "socket:cee_red_63a:output"
-    },
-    {
-      "key": "socket:cee_red_125a"
-    },
-    {
-      "key": "socket:cee_red_125a:output"
-    },
-    {
-      "key": "socket:schuko"
-    },
-    {
-      "key": "socket:schuko:output"
-    },
-    {
-      "key": "socket:sev1011_t13"
-    },
-    {
-      "key": "socket:sev1011_t13:output"
-    },
-    {
-      "key": "socket:sev1011_t15"
-    },
-    {
-      "key": "socket:sev1011_t15:output"
-    },
-    {
-      "key": "socket:sev1011_t23"
-    },
-    {
-      "key": "socket:sev1011_t23:output"
-    },
-    {
-      "key": "socket:sev1011_t25"
-    },
-    {
-      "key": "socket:sev1011_t25:output"
-    },
-    {
-      "key": "opening_hours",
-      "value": "24/7"
-    },
-    {
-      "key": "fee",
-      "value": "yes"
-    },
-    {
-      "key": "fee",
-      "value": "no"
-    },
-    {
-      "key": "parking:fee",
-      "value": "yes"
-    },
-    {
-      "key": "parking:fee",
-      "value": "no"
-    },
-    {
-      "key": "charge"
-    },
-    {
-      "key": "charge:conditional"
-    },
-    {
-      "key": "image"
-    },
-    {
-      "key": "image:0"
-    },
-    {
-      "key": "image:1"
-    },
-    {
-      "key": "image:2"
-    },
-    {
-      "key": "image:3"
-    },
-    {
-      "key": "image:4"
-    },
-    {
-      "key": "image:5"
-    },
-    {
-      "key": "image:6"
-    },
-    {
-      "key": "image:7"
-    },
-    {
-      "key": "image:8"
-    },
-    {
-      "key": "image:9"
-    }
-  ]
-}

app/build.gradle

@@ -0,0 +1,298 @@
+plugins {
+    id 'com.adarshr.test-logger' version '3.1.0'
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'androidx.navigation.safeargs.kotlin'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'pt.jcosta.resourceplaceholders'
+
+def supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"
+
+android {
+    defaultConfig {
+        applicationId "net.vonforst.evmap"
+        compileSdk 34
+        minSdkVersion 21
+        targetSdkVersion 34
+        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
+        versionCode 194
+        versionName "1.6.7"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resConfigs supportedLocales.split(',')
+        buildConfigField("String", "supportedLocales", '"' + supportedLocales + '"')
+    }
+
+    signingConfigs {
+        release {
+            def isRunningOnCI = System.getenv("CI") == "true"
+            if (isRunningOnCI) {
+                // configure keystore
+                storeFile = file("../_ci/keystore.jks")
+                storePassword = System.getenv("KEYSTORE_PASSWORD")
+                keyAlias = System.getenv("KEYSTORE_ALIAS")
+                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            debuggable true
+        }
+    }
+
+    flavorDimensions "dependencies", "automotive"
+    productFlavors {
+        foss {
+            dimension "dependencies"
+        }
+        google {
+            dimension "dependencies"
+            versionNameSuffix "-google"
+        }
+        normal {
+            dimension "automotive"
+        }
+        automotive {
+            dimension "automotive"
+            versionNameSuffix "-automotive"
+            versionCode defaultConfig.versionCode + 1
+            minSdkVersion 29
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs).configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+        viewBinding true
+    }
+    lint {
+        disable 'NullSafeMutableLiveData'
+        warning 'MissingTranslation'
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources true
+    }
+
+    resourcePlaceholders {
+        files = ['xml/shortcuts.xml']
+    }
+    namespace 'net.vonforst.evmap'
+
+    // 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 ?: project.findProperty("GOINGELECTRIC_API_KEY")
+        if (goingelectricKey != null) {
+            variant.resValue "string", "goingelectric_key", goingelectricKey
+        }
+        def openchargemapKey = env.OPENCHARGEMAP_API_KEY ?: project.findProperty("OPENCHARGEMAP_API_KEY")
+        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
+            openchargemapKey = decode(project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (openchargemapKey != null) {
+            variant.resValue "string", "openchargemap_key", openchargemapKey
+        }
+        def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
+        if (googleMapsKey != null && variant.flavorName.startsWith('google')) {
+            variant.resValue "string", "google_maps_key", googleMapsKey
+        }
+        def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (mapboxKey != null) {
+            variant.resValue "string", "mapbox_key", mapboxKey
+        }
+        def chargepriceKey = env.CHARGEPRICE_API_KEY ?: project.findProperty("CHARGEPRICE_API_KEY")
+        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
+            chargepriceKey = decode(project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (chargepriceKey != null) {
+            variant.resValue "string", "chargeprice_key", chargepriceKey
+        }
+        def fronyxKey = env.FRONYX_API_KEY ?: project.findProperty("FRONYX_API_KEY")
+        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
+            fronyxKey = decode(project.findProperty("FRONYX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (fronyxKey != null) {
+            variant.resValue "string", "fronyx_key", fronyxKey
+        }
+        def acraKey = env.ACRA_CRASHREPORT_CREDENTIALS ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")
+        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
+            acraKey = decode(project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (acraKey != null) {
+            variant.resValue "string", "acra_credentials", acraKey
+        }
+    }
+
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    }
+}
+
+configurations {
+    googleNormalImplementation {}
+    googleAutomotiveImplementation {}
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.browser:browser:1.6.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
+    implementation "androidx.work:work-runtime-ktx:2.8.1"
+    implementation 'com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.11.0'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
+    implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
+    implementation 'io.coil-kt:coil:2.4.0'
+    implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
+    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
+    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
+    implementation 'com.airbnb.android:lottie:4.1.0'
+    implementation 'io.michaelrocks.bimap:bimap:1.1.0'
+    implementation 'com.google.guava:guava:29.0-android'
+    implementation 'com.github.pengrad:mapscaleview:1.6.0'
+    implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
+
+    // Android Auto
+    def carAppVersion = '1.4.0-beta01'
+    implementation "androidx.car.app:app:$carAppVersion"
+    normalImplementation "androidx.car.app:app-projected:$carAppVersion"
+    automotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
+
+    // AnyMaps
+    def anyMapsVersion = '8f1226e1c5'
+    implementation "com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion"
+    googleImplementation "com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion"
+    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
+    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-core'
+    }
+    // original version of mapbox-android-core
+    googleImplementation 'com.mapbox.mapboxsdk:mapbox-android-core:2.0.1'
+    // patched version that removes build-time dependency on GMS (-> no Google location services)
+    fossImplementation 'com.github.ev-map:mapbox-events-android:a21c324501'
+
+    // Google Places
+    googleImplementation 'com.google.android.libraries.places:places:3.2.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1'
+
+    // Mapbox Geocoding
+    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
+
+    // navigation library
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+
+    // viewmodel library
+    def lifecycle_version = "2.6.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+
+    // room library
+    def room_version = "2.6.0-beta01"
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    implementation 'com.github.anboralabs:spatia-room:0.2.7'
+
+    // billing library
+    def billing_version = "6.0.1"
+    googleImplementation "com.android.billingclient:billing:$billing_version"
+    googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
+
+    // ACRA (crash reporting)
+    def acraVersion = "5.11.1"
+    implementation("ch.acra:acra-mail:$acraVersion")
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-dialog:$acraVersion")
+    implementation("ch.acra:acra-limiter:$acraVersion")
+
+    // debug tools
+    debugImplementation 'com.facebook.flipper:flipper:0.190.0'
+    debugImplementation 'com.facebook.soloader:soloader:0.10.5'
+    debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.190.0'
+
+    // testing
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0"
+    //noinspection GradleDependency
+    testImplementation 'org.json:json:20080701'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'androidx.arch.core:core-testing:2.2.0'
+
+    // testing for car app
+    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
+    testGoogleImplementation 'androidx.test:core:1.5.0'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.arch.core:core-testing:2.2.0'
+
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.15.0"
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+}
+
+private static String decode(String s, String key) {
+    return new String(xorWithKey(s.decodeBase64(), key.getBytes()), "UTF-8");
+}
+
+private static byte[] xorWithKey(byte[] a, byte[] key) {
+    byte[] out = new byte[a.length];
+    for (int i = 0; i < a.length; i++) {
+        out[i] = (byte) (a[i] ^ key[i%key.length]);
+    }
+    return out;
+}

app/build.gradle.kts

@@ -1,416 +0,0 @@
-import com.android.build.api.dsl.ApplicationBaseFlavor
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.util.Base64
-
-plugins {
-    alias(libs.plugins.test.logger)
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.moshix)
-    alias(libs.plugins.navigation.safeargs)
-    alias(libs.plugins.aboutlibraries)
-}
-
-
-android {
-    useLibrary("android.car")
-
-    defaultConfig {
-        applicationId = "net.vonforst.evmap"
-        compileSdk = 36
-        minSdk = 23
-        targetSdk = 36
-        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 280
-        versionName = "2.1.4"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        addApiKeys()
-    }
-
-    val isRunningOnCI = System.getenv("CI") == "true"
-    val isCIKeystoreAvailable = System.getenv("KEYSTORE_PASSWORD") != null
-
-    signingConfigs {
-        create("release") {
-            if (isRunningOnCI && isCIKeystoreAvailable) {
-                // configure keystore
-                storeFile = file("../_ci/keystore.jks")
-                storePassword = System.getenv("KEYSTORE_PASSWORD")
-                keyAlias = System.getenv("KEYSTORE_ALIAS")
-                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            signingConfig = if (isRunningOnCI && !isCIKeystoreAvailable) {
-                null
-            } else {
-                signingConfigs.getByName("release")
-            }
-        }
-        create("releaseAutomotivePackageName") {
-            // Faurecia Aptoide requires the automotive variant to use a separate package name
-            initWith(getByName("release"))
-            applicationIdSuffix = ".automotive"
-        }
-        debug {
-            applicationIdSuffix = ".debug"
-            isDebuggable = true
-        }
-    }
-
-    sourceSets {
-        getByName("releaseAutomotivePackageName").setRoot("src/release")
-    }
-
-    flavorDimensions += listOf("dependencies", "automotive")
-    productFlavors {
-        create("foss") {
-            dimension = "dependencies"
-            isDefault = true
-        }
-        create("google") {
-            dimension = "dependencies"
-            versionNameSuffix = "-google"
-            addGoogleApiKey()
-        }
-        create("normal") {
-            dimension = "automotive"
-            isDefault = true
-        }
-        create("automotive") {
-            dimension = "automotive"
-            versionNameSuffix = "-automotive"
-            versionCode = defaultConfig.versionCode!! + 1
-            minSdk = 29
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        targetCompatibility = JavaVersion.VERSION_17
-        sourceCompatibility = JavaVersion.VERSION_17
-    }
-
-    buildFeatures {
-        viewBinding = true
-        buildConfig = true
-        resValues = true
-    }
-    lint {
-        disable += listOf("NullSafeMutableLiveData")
-        warning += listOf("MissingTranslation")
-    }
-    androidResources {
-        generateLocaleConfig = true
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
-
-    namespace = "net.vonforst.evmap"
-
-    packaging {
-        jniLibs {
-            pickFirsts.addAll(
-                listOf(
-                    "lib/x86/libc++_shared.so",
-                    "lib/arm64-v8a/libc++_shared.so",
-                    "lib/x86_64/libc++_shared.so",
-                    "lib/armeabi-v7a/libc++_shared.so"
-                )
-            )
-        }
-    }
-}
-
-/**
- * add API keys from environment variable if not set in apikeys.xml
- */
-fun ApplicationBaseFlavor.addApiKeys() {
-    var evmapKey =
-        System.getenv("EVMAP_API_KEY") ?: project.findProperty("EVMAP_API_KEY")?.toString()
-    if (evmapKey == null && project.hasProperty("EVMAP_API_KEY_ENCRYPTED")) {
-        evmapKey = decode(
-            project.findProperty("EVMAP_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (evmapKey != null) {
-        resValue("string", "evmap_key", evmapKey)
-    }
-    val goingelectricKey =
-        System.getenv("GOINGELECTRIC_API_KEY") ?: project.findProperty("GOINGELECTRIC_API_KEY")
-            ?.toString()
-    if (goingelectricKey != null) {
-        resValue("string", "goingelectric_key", goingelectricKey)
-    }
-    var nobilKey =
-        System.getenv("NOBIL_API_KEY") ?: project.findProperty("NOBIL_API_KEY")?.toString()
-    if (nobilKey == null && project.hasProperty("NOBIL_API_KEY_ENCRYPTED")) {
-        nobilKey = decode(
-            project.findProperty("NOBIL_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (nobilKey != null) {
-        resValue("string", "nobil_key", nobilKey)
-    }
-    var openchargemapKey =
-        System.getenv("OPENCHARGEMAP_API_KEY") ?: project.findProperty("OPENCHARGEMAP_API_KEY")
-            ?.toString()
-    if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
-        openchargemapKey = decode(
-            project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (openchargemapKey != null) {
-        resValue("string", "openchargemap_key", openchargemapKey)
-    }
-    var mapboxKey =
-        System.getenv("MAPBOX_API_KEY") ?: project.findProperty("MAPBOX_API_KEY")?.toString()
-    if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
-        mapboxKey = decode(
-            project.findProperty("MAPBOX_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (mapboxKey != null) {
-        resValue("string", "mapbox_key", mapboxKey)
-    }
-    var jawgKey =
-        System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
-    if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
-        jawgKey = decode(
-            project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (jawgKey != null) {
-        resValue("string", "jawg_key", jawgKey)
-    }
-    var arcgisKey =
-        System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
-    if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
-        arcgisKey = decode(
-            project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (arcgisKey != null) {
-        resValue("string", "arcgis_key", arcgisKey)
-    }
-    var fronyxKey =
-        System.getenv("FRONYX_API_KEY") ?: project.findProperty("FRONYX_API_KEY")?.toString()
-    if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
-        fronyxKey = decode(
-            project.findProperty("FRONYX_API_KEY_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (fronyxKey != null) {
-        resValue("string", "fronyx_key", fronyxKey)
-    }
-    var acraKey = System.getenv("ACRA_CRASHREPORT_CREDENTIALS")
-        ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")?.toString()
-    if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
-        acraKey = decode(
-            project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED").toString(),
-            "FmK.d,-f*p+rD+WK!eds"
-        )
-    }
-    if (acraKey != null) {
-        resValue("string", "acra_credentials", acraKey)
-    }
-}
-
-fun ApplicationBaseFlavor.addGoogleApiKey() {
-    val googleMapsKey =
-        System.getenv("GOOGLE_MAPS_API_KEY") ?: project.findProperty("GOOGLE_MAPS_API_KEY")
-            ?.toString()
-    if (googleMapsKey != null) {
-        resValue("string", "google_maps_key", googleMapsKey)
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.fromTarget("17")
-    }
-}
-
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
-}
-
-androidComponents {
-    beforeVariants { variantBuilder ->
-        if (variantBuilder.buildType == "releaseAutomotivePackageName"
-            && !variantBuilder.productFlavors.containsAll(
-                listOf(
-                    "automotive" to "automotive",
-                    "dependencies" to "foss"
-                )
-            )
-        ) {
-            // releaseAutomotivePackageName type is only needed for fossAutomotive
-            variantBuilder.enable = false
-        }
-    }
-}
-
-configurations {
-    create("googleNormalImplementation") {}
-    create("googleAutomotiveImplementation") {}
-}
-
-aboutLibraries {
-    license {
-        allowedLicenses = setOf(
-            "Apache-2.0", "mit", "BSD-2-Clause", "BSD-3-Clause", "EPL-1.0",
-            "asdkl",  // Android SDK
-            "Dual OpenSSL and SSLeay License",  // Android NDK OpenSSL
-            "Google Maps Platform Terms of Service",  // Google Maps SDK
-            "Unicode/ICU License", "Unicode-3.0",  // icu4j
-            "Bouncy Castle Licence",  // bcprov
-            "CDDL + GPLv2 with classpath exception",  // javax.annotation-api
-        )
-        strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
-    }
-    export {
-        excludeFields = setOf("generated")
-    }
-}
-
-dependencies {
-    val normalImplementation by configurations
-    val googleImplementation by configurations
-    val automotiveImplementation by configurations
-
-    implementation(libs.kotlin.stdlib.jdk7)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.activity.ktx)
-    implementation(libs.androidx.fragment.ktx)
-    implementation(libs.androidx.cardview)
-    implementation(libs.androidx.preference.ktx)
-    implementation(libs.material)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.recyclerview)
-    implementation(libs.androidx.browser)
-    implementation(libs.androidx.swiperefreshlayout)
-    implementation(libs.androidx.viewpager2)
-    implementation(libs.androidx.security.crypto)
-    implementation(libs.androidx.work.runtime.ktx)
-    implementation(libs.custom.bottom.sheet.behavior)
-    implementation(libs.retrofit)
-    implementation(libs.retrofit.converter.moshi)
-    implementation(libs.okhttp)
-    implementation(libs.okhttp.urlconnection)
-    implementation(libs.moshi.kotlin)
-    implementation(libs.moshi.adapters)
-    implementation(libs.coil)
-    implementation(libs.stfalcon.image.viewer)
-    implementation(libs.aboutlibraries.core)
-    implementation(libs.aboutlibraries)
-    implementation(libs.lottie)
-    implementation(libs.bimap)
-    implementation(libs.mapscaleview)
-    implementation(libs.page.indicator.view)
-    implementation(libs.locale.config.x)
-
-    // Android Auto
-    implementation(libs.androidx.car.app)
-    normalImplementation(libs.androidx.car.app.projected)
-    automotiveImplementation(libs.androidx.car.app.automotive)
-
-    // AnyMaps
-    implementation(libs.anymaps.base)
-    googleImplementation(libs.anymaps.google)
-    googleImplementation(libs.play.services.maps)
-    implementation(libs.anymaps.maplibre) {
-        // exclude default (Vulkan) version and use Vulkan + OpenGL ES 3.0 version for better compatibility
-        exclude("org.maplibre.gl", "android-sdk")
-    }
-    implementation(libs.maplibre.android.sdk.vulkan.opengl)
-
-    // Google Places
-    googleImplementation(libs.places)
-    googleImplementation(libs.kotlinx.coroutines.play.services)
-
-    // Mapbox Geocoding
-    implementation(libs.mapbox.sdk.services)
-
-    // navigation library
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
-
-    // viewmodel library
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
-
-    // room library
-    implementation(libs.androidx.room.runtime)
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.ktx)
-    implementation(libs.spatia.room) {
-        exclude("com.github.dalgarins", "android-spatialite")
-    }
-    // forked version with upgraded libxml 2.15.2 & APP_STL := c++_static
-    implementation(libs.android.spatialite)
-
-    // billing library
-    googleImplementation(libs.billing)
-    googleImplementation(libs.billing.ktx)
-
-    // ACRA (crash reporting)
-    implementation(libs.acra.http)
-    implementation(libs.acra.dialog)
-    implementation(libs.acra.limiter)
-
-    // debug tools
-    debugImplementation(libs.timber)
-    debugImplementation(libs.leakcanary.android)
-
-    // testing
-    testImplementation(libs.junit4)
-    testImplementation(libs.okhttp.mockwebserver)
-    //noinspection GradleDependency
-    testImplementation(libs.robolectric)
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.androidx.arch.core.testing)
-    testImplementation(libs.androidx.car.app.testing)
-
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.androidx.test.espresso.core)
-    androidTestImplementation(libs.androidx.arch.core.testing)
-
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
-}
-
-fun decode(s: String, key: String): String {
-    return String(xorWithKey(Base64.getDecoder().decode(s), key.toByteArray()), Charsets.UTF_8)
-}
-
-fun xorWithKey(a: ByteArray, key: ByteArray): ByteArray {
-    val out = ByteArray(a.size)
-    for (i in a.indices) {
-        out[i] = (a[i].toInt() xor key[i % key.size].toInt()).toByte()
-    }
-    return out
-}

app/lint.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <issue id="MissingQuantity">
-        <ignore regexp=".*?Czech.*?many" />
-    </issue>
-</lint>

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/schemas/net.vonforst.evmap.storage.AppDatabase/22.json

@@ -1,904 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 22,
-    "identityHash": "5dbaaa5adf8cb9b6e8a8314bb7766447",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `url` TEXT NOT NULL, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5dbaaa5adf8cb9b6e8a8314bb7766447')"
-    ]
-  }
-}

app/schemas/net.vonforst.evmap.storage.AppDatabase/23.json

@@ -1,997 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 23,
-    "identityHash": "e9e169ba4257824c82e4acb030730e97",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `url` TEXT NOT NULL, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "OSMNetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e9e169ba4257824c82e4acb030730e97')"
-    ]
-  }
-}

app/schemas/net.vonforst.evmap.storage.AppDatabase/24.json

@@ -1,928 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 24,
-    "identityHash": "b2b3f39d450f4f7c8280ca850161bbb3",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `url` TEXT NOT NULL, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinatesProjected",
-            "columnName": "coordinatesProjected",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OSMNetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b2b3f39d450f4f7c8280ca850161bbb3')"
-    ]
-  }
-}

app/schemas/net.vonforst.evmap.storage.AppDatabase/27.json

@@ -1,938 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 27,
-    "identityHash": "84f71cce385c444726ba336834ddf6b4",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `dataSourceUrl` TEXT NOT NULL, `url` TEXT, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `accessibility` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "dataSourceUrl",
-            "columnName": "dataSourceUrl",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "accessibility",
-            "columnName": "accessibility",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinatesProjected",
-            "columnName": "coordinatesProjected",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OSMNetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '84f71cce385c444726ba336834ddf6b4')"
-    ]
-  }
-}

app/schemas/net.vonforst.evmap.storage.AppDatabase/28.json

@@ -1,938 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 28,
-    "identityHash": "84f71cce385c444726ba336834ddf6b4",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `dataSourceUrl` TEXT NOT NULL, `url` TEXT, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `accessibility` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "dataSourceUrl",
-            "columnName": "dataSourceUrl",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "accessibility",
-            "columnName": "accessibility",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinatesProjected",
-            "columnName": "coordinatesProjected",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OSMNetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '84f71cce385c444726ba336834ddf6b4')"
-    ]
-  }
-}

app/schemas/net.vonforst.evmap.storage.AppDatabase/29.json

@@ -1,938 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 29,
-    "identityHash": "84f71cce385c444726ba336834ddf6b4",
-    "entities": [
-      {
-        "tableName": "ChargeLocation",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `dataSourceUrl` TEXT NOT NULL, `url` TEXT, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `accessibility` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinates",
-            "columnName": "coordinates",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargepoints",
-            "columnName": "chargepoints",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "network",
-            "columnName": "network",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "dataSourceUrl",
-            "columnName": "dataSourceUrl",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "editUrl",
-            "columnName": "editUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "verified",
-            "columnName": "verified",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "barrierFree",
-            "columnName": "barrierFree",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "operator",
-            "columnName": "operator",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "generalInformation",
-            "columnName": "generalInformation",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "amenities",
-            "columnName": "amenities",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "locationDescription",
-            "columnName": "locationDescription",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "photos",
-            "columnName": "photos",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargecards",
-            "columnName": "chargecards",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "accessibility",
-            "columnName": "accessibility",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "license",
-            "columnName": "license",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "networkUrl",
-            "columnName": "networkUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargerUrl",
-            "columnName": "chargerUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "coordinatesProjected",
-            "columnName": "coordinatesProjected",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address.city",
-            "columnName": "city",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.country",
-            "columnName": "country",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.postcode",
-            "columnName": "postcode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "address.street",
-            "columnName": "street",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "faultReport.created",
-            "columnName": "fault_report_created",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "faultReport.description",
-            "columnName": "fault_report_description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.twentyfourSeven",
-            "columnName": "twentyfourSeven",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "openinghours.description",
-            "columnName": "description",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.start",
-            "columnName": "mostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.monday.end",
-            "columnName": "moend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.start",
-            "columnName": "tustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.tuesday.end",
-            "columnName": "tuend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.start",
-            "columnName": "westart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.wednesday.end",
-            "columnName": "weend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.start",
-            "columnName": "thstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.thursday.end",
-            "columnName": "thend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.start",
-            "columnName": "frstart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.friday.end",
-            "columnName": "frend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.start",
-            "columnName": "sastart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.saturday.end",
-            "columnName": "saend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.start",
-            "columnName": "sustart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.sunday.end",
-            "columnName": "suend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.start",
-            "columnName": "hostart",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "openinghours.days.holiday.end",
-            "columnName": "hoend",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.freecharging",
-            "columnName": "freecharging",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.freeparking",
-            "columnName": "freeparking",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "cost.descriptionShort",
-            "columnName": "descriptionShort",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "cost.descriptionLong",
-            "columnName": "descriptionLong",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.country",
-            "columnName": "chargepricecountry",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.network",
-            "columnName": "chargepricenetwork",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "chargepriceData.plugTypes",
-            "columnName": "chargepriceplugTypes",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "Favorite",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "favoriteId",
-            "columnName": "favoriteId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerId",
-            "columnName": "chargerId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "chargerDataSource",
-            "columnName": "chargerDataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "favoriteId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_Favorite_chargerId_chargerDataSource",
-            "unique": false,
-            "columnNames": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "ChargeLocation",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "chargerId",
-              "chargerDataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "BooleanFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_BooleanFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "MultipleChoiceFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "values",
-            "columnName": "values",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "all",
-            "columnName": "all",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SliderFilterValue",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "key",
-            "columnName": "key",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "profile",
-            "columnName": "profile",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "key",
-            "profile",
-            "dataSource"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SliderFilterValue_profile_dataSource",
-            "unique": false,
-            "columnNames": [
-              "profile",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "FilterProfile",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "profile",
-              "dataSource"
-            ],
-            "referencedColumns": [
-              "id",
-              "dataSource"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "FilterProfile",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "dataSource",
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_FilterProfile_dataSource_name",
-            "unique": true,
-            "columnNames": [
-              "dataSource",
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "RecentAutocompletePlace",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "primaryText",
-            "columnName": "primaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondaryText",
-            "columnName": "secondaryText",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "latLng",
-            "columnName": "latLng",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "viewport",
-            "columnName": "viewport",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "types",
-            "columnName": "types",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id",
-            "dataSource"
-          ]
-        }
-      },
-      {
-        "tableName": "GEPlug",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GENetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "GEChargeCard",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMConnectionType",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "formalName",
-            "columnName": "formalName",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "discontinued",
-            "columnName": "discontinued",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "obsolete",
-            "columnName": "obsolete",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMCountry",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isoCode",
-            "columnName": "isoCode",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "continentCode",
-            "columnName": "continentCode",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OCMOperator",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "websiteUrl",
-            "columnName": "websiteUrl",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "contactEmail",
-            "columnName": "contactEmail",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone1",
-            "columnName": "contactTelephone1",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "contactTelephone2",
-            "columnName": "contactTelephone2",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "OSMNetwork",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "name"
-          ]
-        }
-      },
-      {
-        "tableName": "SavedRegion",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
-        "fields": [
-          {
-            "fieldPath": "region",
-            "columnName": "region",
-            "affinity": "BLOB",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dataSource",
-            "columnName": "dataSource",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timeRetrieved",
-            "columnName": "timeRetrieved",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filters",
-            "columnName": "filters",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "isDetailed",
-            "columnName": "isDetailed",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_SavedRegion_filters_dataSource",
-            "unique": false,
-            "columnNames": [
-              "filters",
-              "dataSource"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '84f71cce385c444726ba336834ddf6b4')"
-    ]
-  }
-}

app/src/androidTest/java/com/johan/evmap/storage/SavedRegionDaoTest.kt

@@ -1,4 +1,4 @@
-package net.vonforst.evmap.storage
+package com.johan.evmap.storage
 
 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule

app/src/androidTest/java/net/vonforst/evmap/storage/ChargeLocationsDaoTest.kt

@@ -1,115 +0,0 @@
-package net.vonforst.evmap.storage
-
-import android.content.Context
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.ChargeLocationCluster
-import net.vonforst.evmap.model.ChargepointListItem
-import net.vonforst.evmap.model.Coordinate
-import net.vonforst.evmap.ui.cluster
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.Instant
-import kotlin.random.Random
-
-@RunWith(AndroidJUnit4::class)
-class ChargeLocationsDaoTest {
-    private lateinit var database: AppDatabase
-    private lateinit var dao: ChargeLocationsDao
-
-    @get:Rule
-    var instantExecutorRule = InstantTaskExecutorRule()
-
-    @Before
-    fun setUp() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        database = AppDatabase.createInMemory(context)
-        dao = database.chargeLocationsDao()
-    }
-
-    @After
-    fun tearDown() {
-        database.close()
-    }
-
-    @Test
-    fun testClustering() {
-        val lat1 = 53.0
-        val lng1 = 9.0
-        val lat2 = 54.0
-        val lng2 = 10.0
-
-        val chargeLocations = (0..100).map { i ->
-            val lat = Random.nextDouble(lat1, lat2)
-            val lng = Random.nextDouble(lng1, lng2)
-            ChargeLocation(
-                i.toLong(),
-                "test",
-                "test",
-                Coordinate(lat, lng),
-                null,
-                emptyList(),
-                null,
-                "https://google.com",
-                null,
-                null,
-                null,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null, null, null, null, null, null, null, null, Instant.now(), true
-            )
-        }
-        runBlocking {
-            dao.insert(*chargeLocations.toTypedArray())
-        }
-
-        val zoom = 10f
-
-        val clusteredInMemory = cluster(chargeLocations, zoom).sorted()
-        val clusteredInDB = runBlocking {
-            dao.getChargeLocationsClustered(lat1, lat2, lng1, lng2, "test", 0L, zoom)
-        }.sorted()
-        assertEquals(clusteredInMemory.size, clusteredInDB.size)
-        clusteredInDB.zip(clusteredInMemory).forEach { (a, b) ->
-            when (a) {
-                is ChargeLocation -> {
-                    assertTrue(b is ChargeLocation)
-                    assertEquals(a, b)
-                }
-                is ChargeLocationCluster -> {
-                    assertTrue(b is ChargeLocationCluster)
-                    assertEquals(a.clusterCount, (b as ChargeLocationCluster).clusterCount)
-                    assertEquals(a.coordinates.lat, b.coordinates.lat, 1e-5)
-                    assertEquals(a.coordinates.lng, b.coordinates.lng, 1e-5)
-                }
-            }
-        }
-    }
-
-    private fun List<ChargepointListItem>.sorted() = sortedBy {
-        when (it) {
-            is ChargeLocationCluster -> it.coordinates.lat
-            is ChargeLocation -> it.coordinates.lat
-            else -> 0.0
-        }
-    }.sortedBy {
-        when (it) {
-            is ChargeLocationCluster -> it.coordinates.lng
-            is ChargeLocation -> it.coordinates.lng
-            else -> 0.0
-        }
-    }
-}

app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt

@@ -1,171 +0,0 @@
-import android.car.Car
-import android.car.VehiclePropertyIds
-import android.car.VehicleUnit
-import android.car.hardware.CarPropertyValue
-import android.car.hardware.property.CarPropertyManager
-import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback
-import androidx.annotation.OptIn
-import androidx.car.app.CarContext
-import androidx.car.app.annotations.ExperimentalCarApi
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.common.CarUnit
-import androidx.car.app.hardware.common.CarValue
-import androidx.car.app.hardware.common.OnCarDataAvailableListener
-import androidx.car.app.hardware.info.CarInfo
-import androidx.car.app.hardware.info.EnergyLevel
-import androidx.car.app.hardware.info.EnergyProfile
-import androidx.car.app.hardware.info.EvStatus
-import androidx.car.app.hardware.info.Mileage
-import androidx.car.app.hardware.info.Model
-import androidx.car.app.hardware.info.Speed
-import androidx.car.app.hardware.info.TollCard
-import java.util.concurrent.Executor
-
-
-val CarContext.patchedCarInfo: CarInfo
-    get() = CarInfoWrapper(this)
-
-class CarInfoWrapper(ctx: CarContext) : CarInfo {
-    private val wrapped =
-        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
-    private val carPropertyManager = try {
-        val car = Car.createCar(ctx)
-        car.getCarManager(Car.PROPERTY_SERVICE) as CarPropertyManager
-    } catch (e: NoClassDefFoundError) {
-        null
-    }
-    private val callbacks = mutableMapOf<OnCarDataAvailableListener<*>, CarPropertyEventCallback>()
-
-    override fun fetchModel(executor: Executor, listener: OnCarDataAvailableListener<Model>) =
-        wrapped.fetchModel(executor, listener)
-
-    override fun fetchEnergyProfile(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyProfile>
-    ) = wrapped.fetchEnergyProfile(executor, listener)
-
-    override fun addTollListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<TollCard>
-    ) = wrapped.addTollListener(executor, listener)
-
-    override fun removeTollListener(listener: OnCarDataAvailableListener<TollCard>) =
-        wrapped.removeTollListener(listener)
-
-    override fun addEnergyLevelListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyLevel>
-    ) = wrapped.addEnergyLevelListener(executor, listener)
-
-    override fun removeEnergyLevelListener(listener: OnCarDataAvailableListener<EnergyLevel>) =
-        wrapped.removeEnergyLevelListener(listener)
-
-    override fun addSpeedListener(executor: Executor, listener: OnCarDataAvailableListener<Speed>) {
-        // TODO: This is a emporary workaround until Car App Library 1.7.0 is released - previous versions would crash if the car reported an invalid speed display unit
-        carPropertyManager ?: return
-        val callback = object : CarPropertyEventCallback {
-            private var speedRaw: CarPropertyValue<Float>? = null
-            private var speedDisplay: CarPropertyValue<Float>? = null
-            private var speedUnit: CarPropertyValue<Int>? = null
-
-            override fun onChangeEvent(value: CarPropertyValue<*>?) {
-                when (value?.propertyId) {
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED -> speedRaw =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY -> speedDisplay =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS -> speedUnit =
-                        value as CarPropertyValue<Int>?
-                }
-
-                executor.execute {
-                    listener.onCarDataAvailable(Speed.Builder().apply {
-                        speedRaw?.let {
-                            setRawSpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedDisplay?.let {
-                            setDisplaySpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedUnit?.let {
-                            val unit = when (it.value) {
-                                VehicleUnit.METER_PER_SEC -> CarUnit.METERS_PER_SEC
-                                VehicleUnit.MILES_PER_HOUR -> CarUnit.MILES_PER_HOUR
-                                VehicleUnit.KILOMETERS_PER_HOUR -> CarUnit.KILOMETERS_PER_HOUR
-                                else -> null
-                            }
-                            setSpeedDisplayUnit(
-                                CarValue(
-                                    unit,
-                                    it.timestamp,
-                                    if (unit != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                    }.build())
-                }
-            }
-
-            override fun onErrorEvent(propertyId: Int, areaId: Int) {
-                listener.onCarDataAvailable(
-                    Speed.Builder()
-                        .setRawSpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setDisplaySpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setSpeedDisplayUnit(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .build()
-                )
-            }
-        }
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-    }
-
-    override fun removeSpeedListener(listener: OnCarDataAvailableListener<Speed>) {
-        val callback = callbacks[listener] ?: return
-        carPropertyManager?.unregisterCallback(callback)
-    }
-
-    override fun addMileageListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<Mileage>
-    ) = wrapped.addMileageListener(executor, listener)
-
-    override fun removeMileageListener(listener: OnCarDataAvailableListener<Mileage>) =
-        wrapped.removeMileageListener(listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun addEvStatusListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EvStatus>
-    ) = wrapped.addEvStatusListener(executor, listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun removeEvStatusListener(listener: OnCarDataAvailableListener<EvStatus>) =
-        wrapped.removeEvStatusListener(listener)
-}

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="grant_on_phone">Povolit</string>
-    <string name="auto_location_permission_needed">Pro spuštění aplikace EVMap ve vašem autě musíte povolit přístup k vaší poloze.</string>
-</resources>

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

@@ -2,4 +2,4 @@
 <resources>
     <string name="grant_on_phone">Zulassen</string>
     <string name="auto_location_permission_needed">Um EVMap auf deinem Fahrzeug zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
-</resources>
+</resources>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="grant_on_phone">Luba</string>
-    <string name="auto_location_permission_needed">Et EVMap toimiks sinu autos, palun luba tal asukohta tuvastada.</string>
-</resources>

app/src/automotive/res/values-fr/strings.xml

@@ -2,4 +2,4 @@
 <resources>
     <string name="grant_on_phone">Autoriser</string>
     <string name="auto_location_permission_needed">Pour exécuter EVMap sur Android Auto, vous devez autoriser l\'accès à votre emplacement.</string>
-</resources>
+</resources>

app/src/automotive/res/values-it/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="grant_on_phone">Consenti</string>
-    <string name="auto_location_permission_needed">Per eseguire EVMap sulla propria auto, è necessario concedere l\'accesso alla propria posizione.</string>
-</resources>

app/src/automotive/res/values-nb-rNO/strings.xml

@@ -2,4 +2,4 @@
 <resources>
     <string name="auto_location_permission_needed">Du må du innvilge posisjonstilgang for å kjøre EVMap i bilen din.</string>
     <string name="grant_on_phone">Tillat</string>
-</resources>
+</resources>

app/src/automotive/res/values-nl/strings.xml

@@ -2,4 +2,4 @@
 <resources>
     <string name="grant_on_phone">Toestaan</string>
     <string name="auto_location_permission_needed">Om EVmap te gebruiken in je wagen, moet je toegang geven tot je locatie.</string>
-</resources>
+</resources>

app/src/automotive/res/values-pt/strings.xml

@@ -2,4 +2,4 @@
 <resources>
     <string name="grant_on_phone">Permitir</string>
     <string name="auto_location_permission_needed">Para usar o EVMap no seu carro, permita o acesso à sua localização.</string>
-</resources>
+</resources>

app/src/automotive/res/values-ro/strings.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    </resources>
+<resources></resources>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="grant_on_phone">Tillåt</string>
-    <string name="auto_location_permission_needed">Du måste tillåta platsåtkomst för att använda EVMap i din bil.</string>
-</resources>

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+    </application>
+</manifest>

app/src/debug/java/net/vonforst/evmap/DebugInits.kt

@@ -2,15 +2,41 @@ package net.vonforst.evmap
 
 import android.content.Context
 import android.os.Build
+import com.facebook.flipper.android.AndroidFlipperClient
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
+import com.facebook.flipper.plugins.inspector.DescriptorMapping
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
+import com.facebook.soloader.SoLoader
 import okhttp3.OkHttpClient
-import timber.log.Timber
+
+private val networkFlipperPlugin = NetworkFlipperPlugin()
 
 fun addDebugInterceptors(context: Context) {
     if (Build.FINGERPRINT == "robolectric") return
 
-    Timber.plant(Timber.DebugTree())
+    SoLoader.init(context, false)
+    val client = AndroidFlipperClient.getInstance(context)
+    client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+    client.addPlugin(networkFlipperPlugin)
+    client.addPlugin(DatabasesFlipperPlugin(context))
+    client.addPlugin(SharedPreferencesFlipperPlugin(context))
+    client.start()
 }
 
 fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {
+    // Flipper does not work during unit tests - so check whether we are running tests first
+    var isRunningTest = true
+    try {
+        Class.forName("org.junit.Test")
+    } catch (e: ClassNotFoundException) {
+        isRunningTest = false
+    }
+    
+    if (!isRunningTest) {
+        this.addNetworkInterceptor(FlipperOkhttpInterceptor(networkFlipperPlugin))
+    }
     return this
 }

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="chargeprice_api_url">https://staging-api.chargeprice.app/v1/</string>
+    <string name="chargeprice_key">20c0d68918c9dc96c564784b711a6570</string>
+</resources>

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

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

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

@@ -5,17 +5,16 @@ 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 com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
-import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 
-class DonateFragment : DonateFragmentBase() {
+class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
-    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -29,7 +28,6 @@ class DonateFragment : DonateFragmentBase() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
-        referrals = binding.referrals
         return binding.root
     }
 
@@ -42,9 +40,11 @@ class DonateFragment : DonateFragmentBase() {
         )
 
         binding.btnDonate.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link), binding.root)
+            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
 
-        setupReferrals(referrals)
+        binding.referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
     }
 }

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
-    <string name="donate_paypal">Přispět pomocí PayPalu</string>
-    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap.</string>
-</resources>

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

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
-    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap.</string>
-</resources>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
+</resources>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Kas EVMap on sulle kasulik? Oma arendajale saadetava rahalise toetusega edendad ka arendustegevust.</string>
-    <string name="donate_paypal">Toeta PayPali abil</string>
-    <string name="data_sources_hint">Selles rakenduses näidatavad kaardiandmed on pärit OpenStreetMapist.</string>
-</resources>

app/src/foss/res/values-fr/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile ? Soutenez son développement en envoyant un don au développeur.</string>
-    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap.</string>
+    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
     <string name="donate_paypal">Faire un don avec PayPal</string>
-</resources>
+</resources>

app/src/foss/res/values-it/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Trovi utile EVMap? Sostieni il suo sviluppo inviando una donazione allo sviluppatore.</string>
-    <string name="donate_paypal">Dona attraverso PayPal</string>
-    <string name="data_sources_hint">I dati cartografici dell\'applicazione sono forniti da OpenStreetMap.</string>
-</resources>

app/src/foss/res/values-nb-rNO/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donate_paypal">Doner med PayPal</string>
-    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap.</string>
-    <string name="donations_info" formatted="false">Synes du EVMap er nyttig? Støtt utviklingen ved å sende en slant til utvikleren.</string>
-</resources>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
+    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
+</resources>

app/src/foss/res/values-nl/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Vond je EVMap nuttig? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
+    <string name="donations_info" formatted="false">Vond je EVMap nuttig\? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
     <string name="donate_paypal">Doneer via PayPal</string>
-    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap.</string>
-</resources>
+    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap (Mapbox).</string>
+</resources>

app/src/foss/res/values-pt/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap.</string>
+    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap (Mapbox).</string>
     <string name="donate_paypal">Doar com o PayPal</string>
-    <string name="donations_info" formatted="false">Acha que o EVMap é útil? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.</string>
-</resources>
+    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.</string>
+</resources>

app/src/foss/res/values-ro/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Crezi ca EVMap este util? Sprijina dezvoltarea printr-o donatie pentru dezvoltator.</string>
     <string name="donate_paypal">Doneaza cu PayPal</string>
-    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap.</string>
+    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap (Mapbox).</string>
 </resources>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Har du nytta av EVMap? Stöd utvecklingen genom att skicka en donation till utvecklaren.</string>
-    <string name="donate_paypal">Donera med PayPal</string>
-    <string name="data_sources_hint">Kartdata i appen tillhandahålls av OpenStreetMap.</string>
-</resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="pref_map_provider_names">
-        <item>@string/pref_provider_osm</item>
+        <item>@string/pref_provider_osm_mapbox</item>
     </string-array>
     <string-array name="pref_map_provider_values" translatable="false">
         <item>mapbox</item>

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

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
     <string name="donate_paypal">Donate with PayPal</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap.</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
 </resources>

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

@@ -1,25 +1,8 @@
 package net.vonforst.evmap.adapter
 
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
-import net.vonforst.evmap.databinding.ItemDonationBinding
 import net.vonforst.evmap.viewmodel.DonationItem
 
-class DonationAdapter : DataBindingAdapter<DonationItem>() {
+class DonationAdapter() : DataBindingAdapter<DonationItem>() {
     override fun getItemViewType(position: Int): Int = R.layout.item_donation
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = ItemDonationBinding.inflate(inflater, parent, false)
-
-    override fun bind(holder: ViewHolder, item: DonationItem) {
-        super.bind(holder, item)
-        val binding = holder.binding as ItemDonationBinding
-        binding.txtName.text = item.product.title
-        binding.txtPrice.text = item.product.oneTimePurchaseOfferDetails?.formattedPrice
-    }
 }

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

@@ -19,6 +19,7 @@ import com.google.android.libraries.places.api.net.FetchPlaceRequest
 import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRequest
 import com.google.android.libraries.places.api.net.PlacesStatusCodes
 import kotlinx.coroutines.tasks.await
+import net.vonforst.evmap.R
 import java.io.IOException
 import java.util.concurrent.ExecutionException
 import kotlin.math.sqrt
@@ -52,7 +53,7 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
                     it.getSecondaryText(bold),
                     it.placeId,
                     it.distanceMeters?.toDouble(),
-                    it.types.mapNotNull { AutocompletePlaceType.valueOfOrNull(it.uppercase()) })
+                    it.placeTypes.map { AutocompletePlaceType.valueOf(it.name) })
             }
         } catch (e: ExecutionException) {
             val cause = e.cause
@@ -74,13 +75,12 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
 
     override suspend fun getDetails(id: String): PlaceWithBounds {
         val request =
-            FetchPlaceRequest.builder(id, listOf(Place.Field.LOCATION, Place.Field.VIEWPORT))
-                .build()
+            FetchPlaceRequest.builder(id, listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)).build()
         try {
             val place = client.fetchPlace(request).await().place
             token = AutocompleteSessionToken.newInstance()
             return PlaceWithBounds(
-                AnyMapAdapter.adapt(place.location),
+                AnyMapAdapter.adapt(place.latLng),
                 AnyMapAdapter.adapt(place.viewport)
             )
         } catch (e: ApiException) {

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

@@ -5,7 +5,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.ConcatAdapter
@@ -20,11 +23,9 @@ import net.vonforst.evmap.adapter.SingleViewAdapter
 import net.vonforst.evmap.databinding.FragmentDonateBinding
 import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
-import net.vonforst.evmap.ui.goneUnless
 import net.vonforst.evmap.viewmodel.DonateViewModel
-import net.vonforst.evmap.viewmodel.Status
 
-class DonateFragment : DonateFragmentBase() {
+class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
     private lateinit var header: FragmentDonateHeaderBinding
@@ -41,7 +42,9 @@ class DonateFragment : DonateFragmentBase() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = FragmentDonateBinding.inflate(inflater, container, false)
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
+        binding.lifecycleOwner = this
+        binding.vm = vm
 
         header = FragmentDonateHeaderBinding.inflate(inflater, container, false)
         referrals = FragmentDonateReferralBinding.inflate(inflater, container, false)
@@ -74,7 +77,6 @@ class DonateFragment : DonateFragmentBase() {
 
         vm.products.observe(viewLifecycleOwner) {
             donationAdapter.submitList(it.data)
-            binding.progressBar.visibility = goneUnless(it.status == Status.LOADING)
         }
 
         vm.purchaseSuccessful.observe(viewLifecycleOwner) {
@@ -84,7 +86,9 @@ class DonateFragment : DonateFragmentBase() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         }
 
-        setupReferrals(referrals)
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
 
         // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))

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

@@ -4,18 +4,8 @@ import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.*
 import com.android.billingclient.api.BillingClient.ProductType
-import com.android.billingclient.api.BillingClientStateListener
-import com.android.billingclient.api.BillingFlowParams
-import com.android.billingclient.api.BillingResult
-import com.android.billingclient.api.ConsumeParams
-import com.android.billingclient.api.PendingPurchasesParams
-import com.android.billingclient.api.ProductDetails
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.PurchasesUpdatedListener
-import com.android.billingclient.api.QueryProductDetailsParams
-import com.android.billingclient.api.QueryPurchasesParams
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.adapter.Equatable
 
@@ -23,7 +13,7 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
     PurchasesUpdatedListener {
     private var billingClient = BillingClient.newBuilder(application)
         .setListener(this)
-        .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
+        .enablePendingPurchases()
         .build()
     
     val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
@@ -77,7 +67,6 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         billingClient.queryProductDetailsAsync(params) { result, details ->
             if (result.responseCode == BillingClient.BillingResponseCode.OK) {
                 products.postValue(Resource.success(details
-                    .productDetailsList
                     .sortedBy { it.oneTimePurchaseOfferDetails!!.priceAmountMicros }
                     .map { DonationItem(it) }
                 ))

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

@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout2"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="net.vonforst.evmap.viewmodel.DonateViewModel" />
+
+        <import type="net.vonforst.evmap.viewmodel.Status" />
+
+        <variable
+            name="vm"
+            type="DonateViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        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"
@@ -33,13 +46,15 @@
             tools:itemCount="1"
             tools:listitem="@layout/fragment_donate_preview" />
 
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/products_list" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <ProgressBar
+            android:id="@+id/progressBar3"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/products_list"
+            app:goneUnless="@{vm.products.status == Status.LOADING}" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    android:layout_marginBottom="16dp">
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="net.vonforst.evmap.viewmodel.DonationItem" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -15,27 +24,32 @@
             android:padding="16dp">
 
             <TextView
-                android:id="@+id/txtName"
+                android:id="@+id/textView15"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:text="@{item.product.title}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/txtPrice"
+                app:layout_constraintEnd_toStartOf="@+id/textView21"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Spende (extrem langer Beschreibungstext)" />
 
             <TextView
-                android:id="@+id/txtPrice"
+                android:id="@+id/textView21"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="@{item.product.oneTimePurchaseOfferDetails.formattedPrice}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 android:textColor="?android:textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="1,00 €" />
+
+
         </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
+    </androidx.cardview.widget.CardView>
+</layout>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři. \n \nGoogle si z každého daru strhne 15 %.</string>
-    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap.</string>
-</resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
-    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap für die Kartendaten wechseln.</string>
-</resources>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
+</resources>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="data_sources_hint">Seadistustes saad valida kahe kaardiandmete allika vahel: Google Maps ja OpenStreetMap.</string>
-    <string name="donations_info" formatted="false">EVMap on sinu jaoks kasulik? Toeta edasist arendust oma rahalise panusega.\n\nGoogle võtab igast toestussummast teenustasuna 15%.</string>
-</resources>

app/src/google/res/values-fr/strings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile ? Soutenez son développement en envoyant un don au développeur. \n \nGoogle prend 15% sur chaque don.</string>
-    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap pour les données cartographiques.</string>
-</resources>
+    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
+\n
+\nGoogle prend 15% sur chaque don.</string>
+    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
+</resources>

app/src/google/res/values-it/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Trovi utile EVMap? Sostieni il suo sviluppo inviando una donazione allo sviluppatore.\n\nGoogle si prende il 15% su ogni donazione.</string>
-    <string name="data_sources_hint">Nelle impostazioni si può anche scegliere tra Google Maps e OpenStreetMap per i dati cartografici.</string>
-</resources>

app/src/google/res/values-nb-rNO/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
+\n
+\nGoogle tar 15% av alle donasjoner.</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
+</resources>

app/src/google/res/values-nb/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Synes du EVMap er nyttig? Støtt utviklingen ved å sende penger til utvikleren. \n \nGoogle tar 15% av alle donasjoner.</string>
-    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap for kartdata.</string>
-</resources>

app/src/google/res/values-nl/strings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Vind je EVMap nuttig? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar. \n \nGoogle houdt 15% in van elke donatie.</string>
-    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap voor de kaartgegevens.</string>
-</resources>
+    <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
+\n
+\nGoogle houdt 15% in van elke donatie.</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
+</resources>

app/src/google/res/values-pt/strings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Acha que o EVMap é útil? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app. \n \nA Google cobra 15% de cada doação.</string>
-    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap nas definições da app.</string>
-</resources>
+    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
+\n
+\nA Google cobra 15% de cada doação.</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
+</resources>

app/src/google/res/values-ro/strings.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    </resources>
+<resources></resources>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="donations_info" formatted="false">Har du nytta av EVMap? Stöd utvecklingen genom att skicka en donation till utvecklaren.\n\nGoogle tar 15% av alla donationer.</string>
-    <string name="data_sources_hint">I inställningarna kan du välja mellan Google Maps och OpenStreetMap som kartleverantör.</string>
-</resources>

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

@@ -2,7 +2,7 @@
 <resources>
     <string-array name="pref_map_provider_names">
         <item>@string/pref_provider_google_maps</item>
-        <item>@string/pref_provider_osm</item>
+        <item>@string/pref_provider_osm_mapbox</item>
     </string-array>
     <string-array name="pref_map_provider_values" translatable="false">
         <item>google</item>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
-    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap for the map data.</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -7,9 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
-    <uses-permission android:name="androidx.car.app.ACCESS_SURFACE" />
     <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
     <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
 
@@ -25,14 +23,9 @@
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />
         </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="http" />
-        </intent>
 
         <package android:name="com.google.android.projection.gearhead" />
         <package android:name="com.google.android.apps.automotive.templates.host" />
-        <package android:name="com.google.android.apps.maps" />
     </queries>
 
     <application
@@ -46,20 +39,13 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">
 
         <meta-data
             android:name="com.mapbox.ACCESS_TOKEN"
             android:value="@string/mapbox_key" />
 
-        <meta-data
-            android:name="io.jawg.ACCESS_TOKEN"
-            android:value="@string/jawg_key" />
-
-        <meta-data
-            android:name="com.arcgis.ACCESS_TOKEN"
-            android:value="@string/arcgis_key" />
-
         <activity
             android:name=".MapsActivity"
             android:label="@string/app_name"
@@ -286,10 +272,6 @@
                     android:host="openchargemap.org"
                     android:pathPattern="/site/poi/details/..*"
                     android:scheme="https" />
-                <data
-                    android:host="map.openchargemap.io"
-                    android:path="/"
-                    android:scheme="https" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -307,10 +289,6 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <activity android:name=".auto.OAuthLoginActivity">
-
-        </activity>
-
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
@@ -352,8 +330,9 @@
             android:exported="true"
             android:foregroundServiceType="location">
             <intent-filter>
-                <action android:name="androidx.car.app.CarAppService" />
-                <category android:name="androidx.car.app.category.POI" />
+                <action
+                    android:name="androidx.car.app.CarAppService"
+                    android:category="androidx.car.app.category.POI" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.clustering;
+
+import com.car2go.maps.model.LatLng;
+
+import java.util.Collection;
+
+/**
+ * A collection of ClusterItems that are nearby each other.
+ */
+public interface Cluster<T extends ClusterItem> {
+    LatLng getPosition();
+
+    Collection<T> getItems();
+
+    int getSize();
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.clustering;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.car2go.maps.model.LatLng;
+
+/**
+ * ClusterItem represents a marker on the map.
+ */
+public interface ClusterItem {
+
+    /**
+     * The position of this marker. This must always return the same value.
+     */
+    @NonNull
+    LatLng getPosition();
+
+    /**
+     * The title of this marker.
+     */
+    @Nullable
+    String getTitle();
+
+    /**
+     * The description of this marker.
+     */
+    @Nullable
+    String getSnippet();
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.maps.android.clustering.algo;
+
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * Base Algorithm class that implements lock/unlock functionality.
+ */
+public abstract class AbstractAlgorithm<T extends ClusterItem> implements Algorithm<T> {
+
+    private final ReadWriteLock mLock = new ReentrantReadWriteLock();
+
+    @Override
+    public void lock() {
+        mLock.writeLock().lock();
+    }
+
+    @Override
+    public void unlock() {
+        mLock.writeLock().unlock();
+    }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.clustering.algo;
+
+import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * Logic for computing clusters
+ */
+public interface Algorithm<T extends ClusterItem> {
+
+    /**
+     * Adds an item to the algorithm
+     *
+     * @param item the item to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    boolean addItem(T item);
+
+    /**
+     * Adds a collection of items to the algorithm
+     *
+     * @param items the items to be added
+     * @return true if the algorithm contents changed as a result of the call
+     */
+    boolean addItems(Collection<T> items);
+
+    void clearItems();
+
+    /**
+     * Removes an item from the algorithm
+     *
+     * @param item the item to be removed
+     * @return true if this algorithm contained the specified element (or equivalently, if this
+     * algorithm changed as a result of the call).
+     */
+    boolean removeItem(T item);
+
+    /**
+     * Updates the provided item in the algorithm
+     *
+     * @param item the item to be updated
+     * @return true if the item existed in the algorithm and was updated, or false if the item did
+     * not exist in the algorithm and the algorithm contents remain unchanged.
+     */
+    boolean updateItem(T item);
+
+    /**
+     * Removes a collection of items from the algorithm
+     *
+     * @param items the items to be removed
+     * @return true if this algorithm contents changed as a result of the call
+     */
+    boolean removeItems(Collection<T> items);
+
+    Set<? extends Cluster<T>> getClusters(float zoom);
+
+    Collection<T> getItems();
+
+    void setMaxDistanceBetweenClusteredItems(int maxDistance);
+
+    int getMaxDistanceBetweenClusteredItems();
+
+    void lock();
+
+    void unlock();
+}

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

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

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.clustering.algo;
+
+import com.car2go.maps.model.LatLng;
+import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterItem;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * A cluster whose center is determined upon creation.
+ */
+public class StaticCluster<T extends ClusterItem> implements Cluster<T> {
+    private final LatLng mCenter;
+    private final List<T> mItems = new ArrayList<T>();
+
+    public StaticCluster(LatLng center) {
+        mCenter = center;
+    }
+
+    public boolean add(T t) {
+        return mItems.add(t);
+    }
+
+    @Override
+    public LatLng getPosition() {
+        return mCenter;
+    }
+
+    public boolean remove(T t) {
+        return mItems.remove(t);
+    }
+
+    @Override
+    public Collection<T> getItems() {
+        return mItems;
+    }
+
+    @Override
+    public int getSize() {
+        return mItems.size();
+    }
+
+    @Override
+    public String toString() {
+        return "StaticCluster{" +
+                "mCenter=" + mCenter +
+                ", mItems.size=" + mItems.size() +
+                '}';
+    }
+
+    @Override
+    public int hashCode() {
+        return mCenter.hashCode() + mItems.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof StaticCluster<?>)) {
+            return false;
+        }
+
+        return ((StaticCluster<?>) other).mCenter.equals(mCenter)
+                && ((StaticCluster<?>) other).mItems.equals(mItems);
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.geometry;
+
+/**
+ * Represents an area in the cartesian plane.
+ */
+public class Bounds {
+    public final double minX;
+    public final double minY;
+
+    public final double maxX;
+    public final double maxY;
+
+    public final double midX;
+    public final double midY;
+
+    public Bounds(double minX, double maxX, double minY, double maxY) {
+        this.minX = minX;
+        this.minY = minY;
+        this.maxX = maxX;
+        this.maxY = maxY;
+
+        midX = (minX + maxX) / 2;
+        midY = (minY + maxY) / 2;
+    }
+
+    public boolean contains(double x, double y) {
+        return minX <= x && x <= maxX && minY <= y && y <= maxY;
+    }
+
+    public boolean contains(Point point) {
+        return contains(point.x, point.y);
+    }
+
+    public boolean intersects(double minX, double maxX, double minY, double maxY) {
+        return minX < this.maxX && this.minX < maxX && minY < this.maxY && this.minY < maxY;
+    }
+
+    public boolean intersects(Bounds bounds) {
+        return intersects(bounds.minX, bounds.maxX, bounds.minY, bounds.maxY);
+    }
+
+    public boolean contains(Bounds bounds) {
+        return bounds.minX >= minX && bounds.maxX <= maxX && bounds.minY >= minY && bounds.maxY <= maxY;
+    }
+}

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.geometry;
+
+public class Point {
+    public final double x;
+    public final double y;
+
+    public Point(double x, double y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @Override
+    public String toString() {
+        return "Point{" +
+                "x=" + x +
+                ", y=" + y +
+                '}';
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.projection;
+
+/**
+ * @deprecated since 0.2. Use {@link com.google.maps.android.geometry.Point} instead.
+ */
+@Deprecated
+public class Point extends com.google.maps.android.geometry.Point {
+    public Point(double x, double y) {
+        super(x, y);
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.projection;
+
+import com.car2go.maps.model.LatLng;
+
+public class SphericalMercatorProjection {
+    final double mWorldWidth;
+
+    public SphericalMercatorProjection(final double worldWidth) {
+        mWorldWidth = worldWidth;
+    }
+
+    @SuppressWarnings("deprecation")
+    public Point toPoint(final LatLng latLng) {
+        final double x = latLng.longitude / 360 + .5;
+        final double siny = Math.sin(Math.toRadians(latLng.latitude));
+        final double y = 0.5 * Math.log((1 + siny) / (1 - siny)) / -(2 * Math.PI) + .5;
+
+        return new Point(x * mWorldWidth, y * mWorldWidth);
+    }
+
+    public LatLng toLatLng(com.google.maps.android.geometry.Point point) {
+        final double x = point.x / mWorldWidth - 0.5;
+        final double lng = x * 360;
+
+        double y = .5 - (point.y / mWorldWidth);
+        final double lat = 90 - Math.toDegrees(Math.atan(Math.exp(-y * 2 * Math.PI)) * 2);
+
+        return new LatLng(lat, lng);
+    }
+}

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

@@ -0,0 +1,226 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.maps.android.quadtree;
+
+import com.google.maps.android.geometry.Bounds;
+import com.google.maps.android.geometry.Point;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A quad tree which tracks items with a Point geometry.
+ * See http://en.wikipedia.org/wiki/Quadtree for details on the data structure.
+ * This class is not thread safe.
+ */
+public class PointQuadTree<T extends PointQuadTree.Item> {
+    public interface Item {
+        Point getPoint();
+    }
+
+    /**
+     * The bounds of this quad.
+     */
+    private final Bounds mBounds;
+
+    /**
+     * The depth of this quad in the tree.
+     */
+    private final int mDepth;
+
+    /**
+     * Maximum number of elements to store in a quad before splitting.
+     */
+    private final static int MAX_ELEMENTS = 50;
+
+    /**
+     * The elements inside this quad, if any.
+     */
+    private Set<T> mItems;
+
+    /**
+     * Maximum depth.
+     */
+    private final static int MAX_DEPTH = 40;
+
+    /**
+     * Child quads.
+     */
+    private List<PointQuadTree<T>> mChildren = null;
+
+    /**
+     * Creates a new quad tree with specified bounds.
+     *
+     * @param minX
+     * @param maxX
+     * @param minY
+     * @param maxY
+     */
+    public PointQuadTree(double minX, double maxX, double minY, double maxY) {
+        this(new Bounds(minX, maxX, minY, maxY));
+    }
+
+    public PointQuadTree(Bounds bounds) {
+        this(bounds, 0);
+    }
+
+    private PointQuadTree(double minX, double maxX, double minY, double maxY, int depth) {
+        this(new Bounds(minX, maxX, minY, maxY), depth);
+    }
+
+    private PointQuadTree(Bounds bounds, int depth) {
+        mBounds = bounds;
+        mDepth = depth;
+    }
+
+    /**
+     * Insert an item.
+     */
+    public void add(T item) {
+        Point point = item.getPoint();
+        if (this.mBounds.contains(point.x, point.y)) {
+            insert(point.x, point.y, item);
+        }
+    }
+
+    private void insert(double x, double y, T item) {
+        if (this.mChildren != null) {
+            if (y < mBounds.midY) {
+                if (x < mBounds.midX) { // top left
+                    mChildren.get(0).insert(x, y, item);
+                } else { // top right
+                    mChildren.get(1).insert(x, y, item);
+                }
+            } else {
+                if (x < mBounds.midX) { // bottom left
+                    mChildren.get(2).insert(x, y, item);
+                } else {
+                    mChildren.get(3).insert(x, y, item);
+                }
+            }
+            return;
+        }
+        if (mItems == null) {
+            mItems = new LinkedHashSet<>();
+        }
+        mItems.add(item);
+        if (mItems.size() > MAX_ELEMENTS && mDepth < MAX_DEPTH) {
+            split();
+        }
+    }
+
+    /**
+     * Split this quad.
+     */
+    private void split() {
+        mChildren = new ArrayList<PointQuadTree<T>>(4);
+        mChildren.add(new PointQuadTree<T>(mBounds.minX, mBounds.midX, mBounds.minY, mBounds.midY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.midX, mBounds.maxX, mBounds.minY, mBounds.midY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.minX, mBounds.midX, mBounds.midY, mBounds.maxY, mDepth + 1));
+        mChildren.add(new PointQuadTree<T>(mBounds.midX, mBounds.maxX, mBounds.midY, mBounds.maxY, mDepth + 1));
+
+        Set<T> items = mItems;
+        mItems = null;
+
+        for (T item : items) {
+            // re-insert items into child quads.
+            insert(item.getPoint().x, item.getPoint().y, item);
+        }
+    }
+
+    /**
+     * Remove the given item from the set.
+     *
+     * @return whether the item was removed.
+     */
+    public boolean remove(T item) {
+        Point point = item.getPoint();
+        if (this.mBounds.contains(point.x, point.y)) {
+            return remove(point.x, point.y, item);
+        } else {
+            return false;
+        }
+    }
+
+    private boolean remove(double x, double y, T item) {
+        if (this.mChildren != null) {
+            if (y < mBounds.midY) {
+                if (x < mBounds.midX) { // top left
+                    return mChildren.get(0).remove(x, y, item);
+                } else { // top right
+                    return mChildren.get(1).remove(x, y, item);
+                }
+            } else {
+                if (x < mBounds.midX) { // bottom left
+                    return mChildren.get(2).remove(x, y, item);
+                } else {
+                    return mChildren.get(3).remove(x, y, item);
+                }
+            }
+        } else {
+            if (mItems == null) {
+                return false;
+            } else {
+                return mItems.remove(item);
+            }
+        }
+    }
+
+    /**
+     * Removes all points from the quadTree
+     */
+    public void clear() {
+        mChildren = null;
+        if (mItems != null) {
+            mItems.clear();
+        }
+    }
+
+    /**
+     * Search for all items within a given bounds.
+     */
+    public Collection<T> search(Bounds searchBounds) {
+        final List<T> results = new ArrayList<T>();
+        search(searchBounds, results);
+        return results;
+    }
+
+    private void search(Bounds searchBounds, Collection<T> results) {
+        if (!mBounds.intersects(searchBounds)) {
+            return;
+        }
+
+        if (this.mChildren != null) {
+            for (PointQuadTree<T> quad : mChildren) {
+                quad.search(searchBounds, results);
+            }
+        } else if (mItems != null) {
+            if (searchBounds.contains(mBounds)) {
+                results.addAll(mItems);
+            } else {
+                for (T item : mItems) {
+                    if (searchBounds.contains(item.getPoint())) {
+                        results.add(item);
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -3,20 +3,15 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.app.Application
 import android.os.Build
-import androidx.work.Configuration
-import androidx.work.Constraints
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
+import androidx.work.*
 import net.vonforst.evmap.storage.CleanupCacheWorker
 import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.storage.UpdateFullDownloadWorker
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 import org.acra.config.dialog
 import org.acra.config.httpSender
 import org.acra.config.limiter
+import org.acra.config.mailSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
@@ -30,7 +25,7 @@ class EvMapApplication : Application(), Configuration.Provider {
 
         // Convert to new AppCompat storage for app language
         val lang = prefs.language
-        if (lang != null) {
+        if (lang != null && lang !in listOf("", "default")) {
             updateAppLocale(lang)
             prefs.language = null
         }
@@ -42,14 +37,21 @@ class EvMapApplication : Application(), Configuration.Provider {
             initAcra {
                 buildConfigClass = BuildConfig::class.java
 
-                // Vehicles often don't have an email app, so use HTTP to send instead
                 reportFormat = StringFormat.JSON
-                httpSender {
-                    uri = getString(R.string.acra_backend_url)
-                    val creds = getString(R.string.acra_credentials).split(":")
-                    basicAuthLogin = creds[0]
-                    basicAuthPassword = creds[1]
-                    httpMethod = HttpSender.Method.POST
+
+                if (BuildConfig.FLAVOR_automotive == "automotive") {
+                    // Vehicles often don't have an email app, so use HTTP to send instead
+                    httpSender {
+                        uri = getString(R.string.acra_backend_url)
+                        val creds = getString(R.string.acra_credentials).split(":")
+                        basicAuthLogin = creds[0]
+                        basicAuthPassword = creds[1]
+                        httpMethod = HttpSender.Method.POST
+                    }
+                } else {
+                    mailSender {
+                        mailTo = "evmap+crashreport@vonforst.net"
+                    }
                 }
 
                 dialog {
@@ -70,7 +72,6 @@ class EvMapApplication : Application(), Configuration.Provider {
             }
         }
 
-        val workManager = WorkManager.getInstance(this)
         val cleanupCacheRequest = PeriodicWorkRequestBuilder<CleanupCacheWorker>(Duration.ofDays(1))
             .setConstraints(Constraints.Builder().apply {
                 setRequiresBatteryNotLow(true)
@@ -78,25 +79,12 @@ class EvMapApplication : Application(), Configuration.Provider {
                     setRequiresDeviceIdle(true)
                 }
             }.build()).build()
-        workManager.enqueueUniquePeriodicWork(
-            "CleanupCacheWorker", ExistingPeriodicWorkPolicy.UPDATE, cleanupCacheRequest
-        )
-
-        val updateFullDownloadRequest =
-            PeriodicWorkRequestBuilder<UpdateFullDownloadWorker>(Duration.ofDays(7))
-                .setConstraints(Constraints.Builder().apply {
-                    setRequiresBatteryNotLow(true)
-                    setRequiredNetworkType(NetworkType.UNMETERED)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        setRequiresDeviceIdle(true)
-                    }
-                }.build()).build()
-        workManager.enqueueUniquePeriodicWork(
-            "UpdateOsmWorker",
-            ExistingPeriodicWorkPolicy.UPDATE,
-            updateFullDownloadRequest
+        WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "CleanupCacheWorker", ExistingPeriodicWorkPolicy.REPLACE, cleanupCacheRequest
         )
     }
 
-    override val workManagerConfiguration = Configuration.Builder().build()
+    override fun getWorkManagerConfiguration(): Configuration {
+        return Configuration.Builder().build()
+    }
 }

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

@@ -3,24 +3,20 @@ package net.vonforst.evmap
 import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.pm.ResolveInfo
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
-import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
@@ -48,21 +44,22 @@ const val EXTRA_DONATE = "donate"
 
 class MapsActivity : AppCompatActivity(),
     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+    interface FragmentCallback {
+        fun getRootView(): View
+    }
 
     private var reenterState: Bundle? = null
     private lateinit var navController: NavController
-    private lateinit var navHostFragment: NavHostFragment
     lateinit var appBarConfiguration: AppBarConfiguration
+    var fragmentCallback: FragmentCallback? = null
     private lateinit var prefs: PreferenceDataSource
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
-        WindowCompat.enableEdgeToEdge(window)
 
         setContentView(R.layout.activity_maps)
 
-        val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.map,
@@ -70,9 +67,9 @@ class MapsActivity : AppCompatActivity(),
                 R.id.about,
                 R.id.settings
             ),
-            drawerLayout
+            findViewById<DrawerLayout>(R.id.drawer_layout)
         )
-        navHostFragment =
+        val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
         navController = navHostFragment.navController
         val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
@@ -90,17 +87,6 @@ class MapsActivity : AppCompatActivity(),
 
         checkPlayServices(this)
 
-        navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
-        var deepLink: PendingIntent? = null
-
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            if (destination.id == R.id.onboarding) {
-                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-            } else {
-                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
-            }
-        }
-
         if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 // wait for splash screen animation to finish on first start
@@ -118,128 +104,133 @@ class MapsActivity : AppCompatActivity(),
                     }
                 })
             }
-        } else if (intent?.scheme == "geo") {
-            val query = intent.data?.query?.split("=")?.get(1)
-            val coords = getLocationFromIntent(intent)
+            navGraph.setStartDestination(R.id.onboarding)
+            navController.graph = navGraph
+            return
+        } else if (!prefs.privacyAccepted) {
+            navGraph.setStartDestination(R.id.onboarding)
+            navController.graph = navGraph
+            return
+        } else {
+            navGraph.setStartDestination(R.id.map)
+            navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
+            var deepLink: PendingIntent? = null
 
-            if (coords != null) {
-                val lat = coords[0]
-                val lon = coords[1]
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
-                    .createPendingIntent()
-            } else if (!query.isNullOrEmpty()) {
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(locationName = query).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-            val id = intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
-            if (id != null) {
-                if (prefs.dataSource != "goingelectric") {
-                    prefs.dataSource = "goingelectric"
-                    Toast.makeText(
-                        this,
-                        getString(
-                            R.string.data_source_switched_to,
-                            getString(R.string.data_source_goingelectric)
-                        ),
-                        Toast.LENGTH_LONG
-                    ).show()
+            if (intent?.scheme == "geo") {
+                val query = intent.data?.query?.split("=")?.get(1)
+                val coords = getLocationFromIntent(intent)
+
+                if (coords != null) {
+                    val lat = coords[0]
+                    val lon = coords[1]
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
+                        .createPendingIntent()
+                } else if (!query.isNullOrEmpty()) {
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(locationName = query).toBundle())
+                        .createPendingIntent()
                 }
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent?.scheme == "https" && intent?.data?.host in listOf(
-                "openchargemap.org",
-                "map.openchargemap.io"
-            )
-        ) {
-            val id = when (intent.data?.host) {
-                "openchargemap.org" -> intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
-                "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
-                else -> null
-            }
-            if (id != null) {
-                if (prefs.dataSource != "openchargemap") {
-                    prefs.dataSource = "openchargemap"
-                    Toast.makeText(
-                        this,
-                        getString(
-                            R.string.data_source_switched_to,
-                            getString(R.string.data_source_openchargemap)
-                        ),
-                        Toast.LENGTH_LONG
-                    ).show()
+            } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                if (id != null) {
+                    if (prefs.dataSource != "goingelectric") {
+                        prefs.dataSource = "goingelectric"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_goingelectric)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
                 }
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent.scheme == "net.vonforst.evmap") {
-            intent.data?.let {
-                if (it.host == "find_charger") {
-                    val lat = it.getQueryParameter("latitude")?.toDouble()
-                    val lon = it.getQueryParameter("longitude")?.toDouble()
-                    val name = it.getQueryParameter("name")
-                    if (lat != null && lon != null) {
-                        deepLink = navController.createDeepLink()
-                            .setGraph(R.navigation.nav_graph)
-                            .setDestination(R.id.map)
-                            .setArguments(
-                                MapFragmentArgs(
-                                    latLng = LatLng(lat, lon),
-                                    locationName = name
-                                ).toBundle()
-                            )
-                            .createPendingIntent()
-                    } else if (name != null) {
-                        deepLink = navController.createDeepLink()
-                            .setGraph(R.navigation.nav_graph)
-                            .setDestination(R.id.map)
-                            .setArguments(MapFragmentArgs(locationName = name).toBundle())
-                            .createPendingIntent()
+            } else if (intent?.scheme == "https" && intent?.data?.host == "openchargemap.org") {
+                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                if (id != null) {
+                    if (prefs.dataSource != "openchargemap") {
+                        prefs.dataSource = "openchargemap"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_openchargemap)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
+                }
+            } else if (intent.scheme == "net.vonforst.evmap") {
+                intent.data?.let {
+                    if (it.host == "find_charger") {
+                        val lat = it.getQueryParameter("latitude")?.toDouble()
+                        val lon = it.getQueryParameter("longitude")?.toDouble()
+                        val name = it.getQueryParameter("name")
+                        if (lat != null && lon != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(
+                                    MapFragmentArgs(
+                                        latLng = LatLng(lat, lon),
+                                        locationName = name
+                                    ).toBundle()
+                                )
+                                .createPendingIntent()
+                        } else if (name != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(MapFragmentArgs(locationName = name).toBundle())
+                                .createPendingIntent()
+                        }
                     }
                 }
+            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+                deepLink = navController.createDeepLink()
+                    .setDestination(R.id.map)
+                    .setArguments(
+                        MapFragmentArgs(
+                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                            latLng = LatLng(
+                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                                intent.getDoubleExtra(EXTRA_LON, 0.0)
+                            )
+                        ).toBundle()
+                    )
+                    .createPendingIntent()
+            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
+                deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
+                    .setDestination(R.id.favs)
+                    .createPendingIntent()
+            } else if (intent.hasExtra(EXTRA_DONATE)) {
+                deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
+                    .setDestination(R.id.donate)
+                    .createPendingIntent()
             }
-        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
-            deepLink = navController.createDeepLink()
-                .setDestination(R.id.map)
-                .setArguments(
-                    MapFragmentArgs(
-                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                        latLng = LatLng(
-                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                            intent.getDoubleExtra(EXTRA_LON, 0.0)
-                        )
-                    ).toBundle()
-                )
-                .createPendingIntent()
-        } else if (intent.hasExtra(EXTRA_FAVORITES)) {
-            deepLink = navController.createDeepLink()
-                .setGraph(navGraph)
-                .setDestination(R.id.favs)
-                .createPendingIntent()
-        } else if (intent.hasExtra(EXTRA_DONATE)) {
-            deepLink = navController.createDeepLink()
-                .setGraph(navGraph)
-                .setDestination(R.id.donate)
-                .createPendingIntent()
-        }
 
-        deepLink?.send()
+            deepLink?.send()
+        }
     }
 
-    fun navigateTo(charger: ChargeLocation, rootView: View) {
+    fun navigateTo(charger: ChargeLocation) {
         // google maps navigation
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
@@ -249,51 +240,32 @@ class MapsActivity : AppCompatActivity(),
             startActivity(intent)
         } else {
             // fallback: generic geo intent
-            showLocation(charger, rootView)
+            showLocation(charger)
         }
     }
 
-    fun showLocation(charger: ChargeLocation, rootView: View) {
+    fun showLocation(charger: ChargeLocation) {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
-            Uri.encode(charger.name)
-        })".toUri()
-
-        val resolveInfo =
-            packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
-        val pkg =
-            resolveInfo?.activityInfo?.packageName.takeIf { it != "android" && it != packageName }
-        if (pkg == null) {
-            // There is no default maps app or EVMap itself is the current default, fall back to app chooser
-            val chooserIntent = Intent.createChooser(intent, null).apply {
-                putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, arrayOf(componentName))
-            }
-            startActivity(chooserIntent)
-            return
-        }
-        intent.setPackage(pkg)
-
-        try {
+        intent.data = Uri.parse(
+            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
+                Uri.encode(charger.name)
+            })"
+        )
+        if (intent.resolveActivity(packageManager) != null) {
             startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            try {
-                // if the intent is not working with an explicit package for some reason,
-                // as a last resort, try again without package
-                intent.setPackage(null)
-                startActivity(intent)
-            } catch (e: ActivityNotFoundException) {
-                Snackbar.make(
-                    rootView,
-                    R.string.no_maps_app_found,
-                    Snackbar.LENGTH_SHORT
-                ).show()
-                Log.e("MapsActivity", "no navigation app found")
-            }
+        } else {
+            val cb = fragmentCallback ?: return
+            Snackbar.make(
+                cb.getRootView(),
+                R.string.no_maps_app_found,
+                Snackbar.LENGTH_SHORT
+            ).show()
         }
     }
 
-    fun openUrl(url: String, rootView: View, preferBrowser: Boolean = false) {
+    fun openUrl(url: String) {
+        val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
                 CustomTabColorSchemeParams.Builder()
@@ -301,78 +273,29 @@ class MapsActivity : AppCompatActivity(),
                     .build()
             )
             .build()
-
-        val uri = url.toUri()
-        val viewIntent = Intent(Intent.ACTION_VIEW, uri)
-        if (preferBrowser) {
-            // EVMap may be set as default app for this link, but we want to open it in a browser
-            // try to find default web browser
-            val browserIntent = Intent(Intent.ACTION_VIEW, "http://".toUri())
-            val resolveInfo =
-                packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
-            val pkg = resolveInfo?.activityInfo?.packageName.takeIf { it != "android" }
-            if (pkg == null) {
-                // There is no default browser, fall back to app chooser
-                val chooserIntent = Intent.createChooser(viewIntent, null).apply {
-                    putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, arrayOf(componentName))
-                }
-                val targets: List<ResolveInfo> = packageManager.queryIntentActivities(
-                    viewIntent,
-                    PackageManager.MATCH_DEFAULT_ONLY
-                )
-
-                // add missing browsers (if EVMap is already set as default, Android might not find other browsers with the specific intent)
-                val browsers = packageManager.queryIntentActivities(
-                    browserIntent,
-                    PackageManager.MATCH_DEFAULT_ONLY
-                )
-                val extraIntents = browsers.filter { browser ->
-                    targets.find { it.activityInfo.packageName == browser.activityInfo.packageName } == null
-                }.map { browser ->
-                    Intent(Intent.ACTION_VIEW, uri).apply {
-                        setPackage(browser.activityInfo.packageName)
-                    }
-                }
-                chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, extraIntents.toTypedArray())
-                startActivity(chooserIntent)
-                return
-            }
+        pkg?.let {
+            // prefer to open URL in custom tab, even if native app
+            // available (such as EVMap itself)
             intent.intent.setPackage(pkg)
         }
         try {
-            intent.launchUrl(this, uri)
+            intent.launchUrl(this, Uri.parse(url))
         } catch (e: ActivityNotFoundException) {
-            try {
-                // if the intent is not working with an explicit package for some reason,
-                // as a last resort, try again without package
-                intent.intent.setPackage(null)
-                intent.launchUrl(this, uri)
-            } catch (e: ActivityNotFoundException) {
-                Snackbar.make(
-                    rootView,
-                    R.string.no_browser_app_found,
-                    Snackbar.LENGTH_SHORT
-                ).show()
-                Log.e("MapsActivity", "no web browser found")
-            }
+            val cb = fragmentCallback ?: return
+            Snackbar.make(
+                cb.getRootView(),
+                R.string.no_browser_app_found,
+                Snackbar.LENGTH_SHORT
+            ).show()
         }
     }
 
-    fun shareUrl(url: String, rootView: View) {
+    fun shareUrl(url: String) {
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, url)
         }
-        try {
-            startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Snackbar.make(
-                rootView,
-                R.string.no_share_app_found,
-                Snackbar.LENGTH_SHORT
-            ).show()
-            Log.e("MapsActivity", "no sharing app found")
-        }
+        startActivity(intent)
     }
 
     override fun onPreferenceStartFragment(

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

@@ -1,7 +1,6 @@
 package net.vonforst.evmap
 
 import android.content.Context
-import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -10,17 +9,10 @@ import android.icu.util.LocaleData
 import android.icu.util.ULocale
 import android.os.Build
 import android.os.Bundle
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.SpannableStringBuilder
-import android.text.SpannedString
-import android.text.TextUtils
+import android.text.*
 import android.text.style.StyleSpan
-import android.view.View
-import android.view.ViewTreeObserver
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.Currency
-import java.util.Locale
+import java.util.*
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -125,31 +117,4 @@ fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): Pa
         getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
-    }
-
-
-fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
-    } else {
-        @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
-    }
-
-
-fun PackageManager.isAppInstalled(packageName: String): Boolean {
-    return try {
-        getApplicationInfoCompat(packageName, 0).enabled
-    } catch (e: PackageManager.NameNotFoundException) {
-        false
-    }
-}
-
-fun currencyDisplayName(code: String) = "${Currency.getInstance(code).displayName} ($code)"
-
-inline fun View.waitForLayout(crossinline f: () -> Unit) =
-    viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            viewTreeObserver.removeOnGlobalLayoutListener(this)
-            f()
-        }
-    })
+    }

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

@@ -1,73 +1,64 @@
 package net.vonforst.evmap.adapter
 
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
+import com.google.android.material.chip.Chip
+import net.vonforst.evmap.BR
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
-import net.vonforst.evmap.api.iconForPlugType
-import net.vonforst.evmap.databinding.DialogConnectorDetailsItemBinding
-import net.vonforst.evmap.databinding.ItemConnectorBinding
+import net.vonforst.evmap.api.chargeprice.ChargePrice
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
+import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceTag
+import net.vonforst.evmap.databinding.ItemChargepriceBinding
+import net.vonforst.evmap.databinding.ItemChargepriceVehicleChipBinding
+import net.vonforst.evmap.databinding.ItemConnectorButtonBinding
 import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.ui.availabilityColor
-import net.vonforst.evmap.ui.availabilityText
-import net.vonforst.evmap.ui.goneUnless
-import java.time.Instant
-import java.util.Locale
+import net.vonforst.evmap.ui.CheckableConstraintLayout
 
 interface Equatable {
     override fun equals(other: Any?): Boolean
 }
 
 abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
-    ListAdapter<T, DataBindingAdapter.ViewHolder>(DiffCallback(getKey)) {
+    ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback(getKey)) {
 
     var onClickListener: ((T) -> Unit)? = null
-    var onLongClickListener: ((T) -> Boolean)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<T> {
         val layoutInflater = LayoutInflater.from(parent.context)
-        return ViewHolder(createBinding(layoutInflater, parent, viewType))
+        val binding =
+            DataBindingUtil.inflate<ViewDataBinding>(layoutInflater, viewType, parent, false)
+        return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) =
+    override fun onBindViewHolder(holder: ViewHolder<T>, position: Int) =
         bind(holder, getItem(position))
 
-    protected abstract fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding
+    class ViewHolder<T>(val binding: ViewDataBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+    }
 
-    class ViewHolder(val binding: ViewBinding) : RecyclerView.ViewHolder(binding.root)
-
-    open fun bind(holder: ViewHolder, item: T) {
+    open fun bind(holder: ViewHolder<T>, item: T) {
+        holder.binding.setVariable(BR.item, item)
+        holder.binding.executePendingBindings()
         if (onClickListener != null) {
             holder.binding.root.setOnClickListener {
                 val listener = onClickListener ?: return@setOnClickListener
                 listener(item)
             }
-        } else {
-            holder.binding.root.setOnClickListener(null)
-        }
-        if (onLongClickListener != null) {
-            holder.binding.root.setOnLongClickListener {
-                val listener = onLongClickListener ?: return@setOnLongClickListener false
-                return@setOnLongClickListener listener(item)
-            }
-        } else {
-            holder.binding.root.setOnLongClickListener(null)
         }
     }
 
-    class DiffCallback<T : Equatable>(private val getKey: ((T) -> Any)?) :
-        DiffUtil.ItemCallback<T>() {
+    class DiffCallback<T : Equatable>(val getKey: ((T) -> Any)?) : DiffUtil.ItemCallback<T>() {
         override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = if (getKey != null) {
-            getKey(oldItem) == getKey(newItem)
+            (getKey)(oldItem) == (getKey)(newItem)
         } else {
             oldItem === newItem
         }
@@ -90,80 +81,145 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     data class ChargepointWithAvailability(
         val chargepoint: Chargepoint,
         val status: List<ChargepointStatus>?
-    ) : Equatable
+    ) :
+        Equatable
 
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
+}
 
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = ItemConnectorBinding.inflate(inflater, parent, false)
+class ChargepriceAdapter() :
+    DataBindingAdapter<ChargePrice>() {
 
-    override fun bind(holder: ViewHolder, item: ChargepointWithAvailability) {
-        super.bind(holder, item)
-        val binding = holder.binding as ItemConnectorBinding
-        val context = binding.root.context
-        val locale = Locale.getDefault()
-
-        binding.imageView.setImageResource(iconForPlugType(item.chargepoint.type))
-        binding.imageView.contentDescription = item.chargepoint.type
-        binding.imageView.imageTintList =
-            ColorStateList.valueOf(availabilityColor(item.status, context))
-
-        binding.txtNumber.text = String.format(locale, "x %d", item.chargepoint.count)
-        binding.txtNumber.visibility = goneUnless(item.status == null)
-
-        if (item.status != null) {
-            binding.txtStatus.text = String.format(
-                locale,
-                "%s/%d",
-                availabilityText(item.status),
-                item.chargepoint.count
-            )
-            binding.txtStatus.backgroundTintList =
-                ColorStateList.valueOf(availabilityColor(item.status, context))
+    val viewPool = RecyclerView.RecycledViewPool()
+    var meta: ChargepriceChargepointMeta? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var myTariffs: Set<String>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var myTariffsAll: Boolean? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
         }
-        binding.txtStatus.visibility = goneUnless(item.status != null)
 
-        binding.txtPower.text = item.chargepoint.formatPower(locale)
-        binding.txtPower.visibility = goneUnless(item.chargepoint.hasKnownPower())
-        binding.txtPower.setTextColor(availabilityColor(item.status, context))
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<ChargePrice> {
+        val holder = super.onCreateViewHolder(parent, viewType)
+        val binding = holder.binding as ItemChargepriceBinding
+        binding.rvTags.apply {
+            adapter = ChargepriceTagsAdapter()
+            layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false).apply {
+                    recycleChildrenOnDetach = true
+                }
+            itemAnimator = null
+            setRecycledViewPool(viewPool)
+        }
+        return holder
+    }
+
+    override fun bind(holder: ViewHolder<ChargePrice>, item: ChargePrice) {
+        super.bind(holder, item)
+        (holder.binding as ItemChargepriceBinding).apply {
+            this.meta = this@ChargepriceAdapter.meta
+            this.myTariffs = this@ChargepriceAdapter.myTariffs
+            this.myTariffsAll = this@ChargepriceAdapter.myTariffsAll
+        }
     }
 }
 
-class ConnectorDetailsAdapter : DataBindingAdapter<ConnectorDetailsAdapter.ConnectorDetails>() {
-    data class ConnectorDetails(
-        val status: ChargepointStatus?,
-        val evseId: String?,
-        val label: String?,
-        val lastChange: Instant?
-    ) : Equatable
+class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
+    private var checkedItem: Int? = 0
 
-    override fun getItemViewType(position: Int): Int = R.layout.dialog_connector_details_item
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = DialogConnectorDetailsItemBinding.inflate(inflater, parent, false)
-
-    override fun bind(holder: ViewHolder, item: ConnectorDetails) {
-        super.bind(holder, item)
-        val binding = holder.binding as DialogConnectorDetailsItemBinding
-        val context = binding.root.context
-
-        binding.imageView.imageTintList =
-            ColorStateList.valueOf(availabilityColor(item.status, context))
-        binding.imageView.contentDescription = availabilityText(item.status, null, context)
-
-        binding.txtEvseid.text = when {
-            item.label != null && item.evseId != null -> "${item.label} · ${item.evseId}"
-            item.label != null -> item.label
-            else -> item.evseId ?: ""
+    var enabledConnectors: List<String>? = null
+        get() = field
+        set(value) {
+            field = value
+            checkedItem?.let {
+                if (value != null && getItem(it).type !in value) {
+                    checkedItem = currentList.indexOfFirst {
+                        it.type in value
+                    }.takeIf { it != -1 }
+                    onCheckedItemChangedListener?.invoke(getCheckedItem())
+                }
+            }
+            notifyDataSetChanged()
         }
 
-        binding.txtStatus.text = availabilityText(item.status, item.lastChange, context)
-        binding.txtStatus.visibility = goneUnless(item.status != null)
+    override fun getItemViewType(position: Int): Int = R.layout.item_connector_button
+
+    override fun onBindViewHolder(holder: ViewHolder<Chargepoint>, position: Int) {
+        val item = getItem(position)
+        super.bind(holder, item)
+        val binding = holder.binding as ItemConnectorButtonBinding
+        binding.enabled = enabledConnectors?.let { item.type in it } ?: true
+        val root = binding.root as CheckableConstraintLayout
+        root.setOnCheckedChangeListener { _, _ -> }
+        root.isChecked = checkedItem == position
+        root.setOnClickListener {
+            root.isChecked = true
+        }
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
+            if (checked) {
+                checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
+                root.post {
+                    notifyDataSetChanged()
+                }
+                getCheckedItem()?.let { onCheckedItemChangedListener?.invoke(it) }
+            }
+        }
     }
+
+    fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
+
+    fun setCheckedItem(item: Chargepoint?) {
+        checkedItem = item?.let { currentList.indexOf(item) }.takeIf { it != -1 }
+    }
+
+    var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null
+}
+
+class ChargepriceTagsAdapter() :
+    DataBindingAdapter<ChargepriceTag>() {
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_tag
+}
+
+class CheckableChargepriceCarAdapter : DataBindingAdapter<ChargepriceCar>() {
+    private var checkedItem: ChargepriceCar? = null
+
+    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_vehicle_chip
+
+    override fun onBindViewHolder(holder: ViewHolder<ChargepriceCar>, position: Int) {
+        val item = getItem(position)
+        super.bind(holder, item)
+        val binding = holder.binding as ItemChargepriceVehicleChipBinding
+        val root = binding.root as Chip
+        root.isChecked = checkedItem == item
+        root.setOnClickListener {
+            root.isChecked = true
+        }
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
+            if (checked && item != checkedItem) {
+                checkedItem = item
+                root.post {
+                    notifyDataSetChanged()
+                }
+                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
+            }
+        }
+    }
+
+    fun getCheckedItem(): ChargepriceCar? = checkedItem
+
+    fun setCheckedItem(item: ChargepriceCar?) {
+        checkedItem = item
+    }
+
+    var onCheckedItemChangedListener: ((ChargepriceCar?) -> Unit)? = null
 }

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

@@ -4,36 +4,23 @@ import android.content.Context
 import android.graphics.Typeface
 import android.text.Spannable
 import android.text.style.StyleSpan
-import android.text.util.Linkify
-import android.transition.TransitionManager
-import android.view.LayoutInflater
-import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.core.text.buildSpannedString
-import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.availability.tesla.Pricing
-import net.vonforst.evmap.api.availability.tesla.Rates
-import net.vonforst.evmap.databinding.ItemDetailBinding
-import net.vonforst.evmap.databinding.ItemDetailOpeninghoursBinding
+import net.vonforst.evmap.api.availability.TeslaGraphQlApi
+import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard
 import net.vonforst.evmap.model.ChargeCardId
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.OpeningHoursDays
 import net.vonforst.evmap.plus
-import net.vonforst.evmap.ui.applySelectableItemBackground
 import net.vonforst.evmap.ui.currency
-import net.vonforst.evmap.ui.goneUnless
-import net.vonforst.evmap.ui.setLinkify
 import net.vonforst.evmap.utils.formatDMS
 import net.vonforst.evmap.utils.formatDecimal
-import java.time.DayOfWeek
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import java.time.format.TextStyle
-import java.util.Locale
 
 class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
     data class Detail(
@@ -48,139 +35,19 @@ class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
 
     override fun getItemViewType(position: Int): Int {
         val item = getItem(position)
-        return if (item.hoursDays != null) {
-            R.layout.item_detail_openinghours
+        if (item.hoursDays != null) {
+            return R.layout.item_detail_openinghours
         } else {
-            R.layout.item_detail
+            return R.layout.item_detail
         }
     }
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = when (viewType) {
-        R.layout.item_detail_openinghours -> ItemDetailOpeninghoursBinding.inflate(
-            inflater,
-            parent,
-            false
-        )
-
-        else -> ItemDetailBinding.inflate(inflater, parent, false)
-    }
-
-    override fun bind(holder: ViewHolder, item: Detail) {
-        super.bind(holder, item)
-        if (holder.binding is ItemDetailBinding) {
-            bindNormal(holder.binding, item)
-        } else {
-            bindOpeningHours(holder.binding as ItemDetailOpeninghoursBinding, item)
-        }
-    }
-
-    private fun bindNormal(binding: ItemDetailBinding, item: Detail) {
-        binding.root.isClickable = item.clickable
-        applySelectableItemBackground(binding.root, item.clickable)
-
-        binding.imgIcon.setImageResource(item.icon)
-        binding.imgIcon.contentDescription =
-            binding.root.context.getString(item.contentDescription)
-        binding.txtTariff.text = item.text
-
-        binding.txtProvider.text = item.detailText
-        binding.txtProvider.visibility = goneUnless(item.detailText != null)
-        setLinkify(
-            binding.txtProvider,
-            if (item.links) Linkify.WEB_URLS or Linkify.PHONE_NUMBERS else 0,
-            item.detailText
-        )
-    }
-
-    private fun bindOpeningHours(binding: ItemDetailOpeninghoursBinding, item: Detail) {
-        binding.root.isClickable = item.clickable
-        applySelectableItemBackground(binding.root, item.clickable)
-
-        binding.imageView3.setImageResource(item.icon)
-        binding.imageView3.contentDescription =
-            binding.root.context.getString(item.contentDescription)
-        binding.txtTariff.text = item.text
-
-        binding.txtProvider.text = item.detailText
-        binding.txtProvider.visibility = goneUnless(item.detailText != null)
-        setLinkify(
-            binding.txtProvider,
-            if (item.links) Linkify.WEB_URLS or Linkify.PHONE_NUMBERS else 0,
-            item.detailText
-        )
-
-        val toggleMarginTop = binding.root.resources.getDimensionPixelSize(
-            if (item.detailText != null) {
-                R.dimen.expand_toggle_padding_large
-            } else {
-                R.dimen.expand_toggle_padding_small
-            }
-        )
-        val toggleLayoutParams = binding.expandToggle.layoutParams
-        if (toggleLayoutParams is ViewGroup.MarginLayoutParams) {
-            toggleLayoutParams.topMargin = toggleMarginTop
-            binding.expandToggle.layoutParams = toggleLayoutParams
-        }
-
-        val days = item.hoursDays
-        val expanded = days != null
-        binding.expandToggle.visibility =
-            if (expanded) android.view.View.VISIBLE else android.view.View.GONE
-        if (!expanded) return
-
-        bindDay(binding.hoursMon, DayOfWeek.MONDAY, days)
-        bindDay(binding.hoursTue, DayOfWeek.TUESDAY, days)
-        bindDay(binding.hoursWed, DayOfWeek.WEDNESDAY, days)
-        bindDay(binding.hoursThu, DayOfWeek.THURSDAY, days)
-        bindDay(binding.hoursFri, DayOfWeek.FRIDAY, days)
-        bindDay(binding.hoursSat, DayOfWeek.SATURDAY, days)
-        bindDay(binding.hoursSun, DayOfWeek.SUNDAY, days)
-        bindDay(binding.hoursHoliday, null, days)
-
-        val toggleListener = android.view.View.OnClickListener {
-            TransitionManager.beginDelayedTransition(binding.container)
-            val show = binding.expandToggle.isChecked
-            val visibility = if (show) android.view.View.VISIBLE else android.view.View.GONE
-            listOf(
-                binding.hoursMon.root,
-                binding.hoursTue.root,
-                binding.hoursWed.root,
-                binding.hoursThu.root,
-                binding.hoursFri.root,
-                binding.hoursSat.root,
-                binding.hoursSun.root,
-                binding.hoursHoliday.root
-            ).forEach { it.visibility = visibility }
-        }
-        binding.expandToggle.setOnClickListener(toggleListener)
-        binding.expandToggle.isChecked = false
-        toggleListener.onClick(binding.expandToggle)
-    }
-
-    private fun bindDay(
-        include: net.vonforst.evmap.databinding.ItemDetailOpeninghoursItemBinding,
-        dayOfWeek: DayOfWeek?,
-        hours: OpeningHoursDays
-    ) {
-        include.txtDay.text = if (dayOfWeek != null) {
-            dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault())
-        } else {
-            include.root.context.getString(R.string.holiday)
-        }
-        include.txtHours.text = hours.getHoursForDayOfWeek(dayOfWeek)?.toString()
-            ?: include.root.context.getString(R.string.closed_unfmt)
-    }
 }
 
 fun buildDetails(
     loc: ChargeLocation?,
     chargeCards: Map<Long, ChargeCard>?,
     filteredChargeCards: Set<Long>?,
-    teslaPricing: Pricing?,
+    teslaPricing: TeslaGraphQlApi.Pricing?,
     ctx: Context
 ): List<DetailsAdapter.Detail> {
     if (loc == null) return emptyList()
@@ -272,7 +139,7 @@ fun buildDetails(
     )
 }
 
-fun formatTeslaParkingFee(teslaPricing: Pricing, ctx: Context) =
+private fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
     teslaPricing.memberRates?.activePricebook?.parking?.let { parkingFee ->
         ctx.getString(
             R.string.tesla_pricing_blocking_fee,
@@ -280,7 +147,7 @@ fun formatTeslaParkingFee(teslaPricing: Pricing, ctx: Context) =
         )
     }
 
-fun formatTeslaPricing(teslaPricing: Pricing, ctx: Context) =
+private fun formatTeslaPricing(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
     buildSpannedString {
         teslaPricing.memberRates?.let { memberRates ->
             append(
@@ -301,7 +168,7 @@ fun formatTeslaPricing(teslaPricing: Pricing, ctx: Context) =
         }
     }
 
-private fun formatTeslaPricingRates(rates: Rates, ctx: Context) =
+private fun formatTeslaPricingRates(rates: TeslaGraphQlApi.Rates, ctx: Context) =
     buildSpannedString {
         val timeFmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
         if (rates.activePricebook.charging.touRates.enabled) {
@@ -409,9 +276,7 @@ fun formatChargeCards(
         .mapNotNull {
             val name = chargecardData[it.id]?.name ?: return@mapNotNull null
             if (filteredChargeCards?.contains(it.id) == true) {
-                buildSpannedString {
-                    append(name, StyleSpan(Typeface.BOLD), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                }
+                name.bold()
             } else {
                 name
             }
@@ -421,4 +286,4 @@ fun formatChargeCards(
     }
 
     return result
-}
+}

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

@@ -1,22 +1,10 @@
 package net.vonforst.evmap.adapter
 
 import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.view.LayoutInflater
-import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
-import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.databinding.ItemFavoriteBinding
-import net.vonforst.evmap.ui.availabilityColor
-import net.vonforst.evmap.ui.availabilityText
-import net.vonforst.evmap.ui.distance
-import net.vonforst.evmap.ui.goneUnless
-import net.vonforst.evmap.ui.invisibleUnless
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
-import net.vonforst.evmap.viewmodel.Status
-import java.util.Locale
 
 class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> Unit) :
     DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
@@ -26,49 +14,16 @@ class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> U
 
     override fun getItemViewType(position: Int): Int = R.layout.item_favorite
 
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = ItemFavoriteBinding.inflate(inflater, parent, false)
-
     override fun getItemId(position: Int): Long = getItem(position).fav.favorite.favoriteId
 
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(
-        holder: ViewHolder,
+        holder: ViewHolder<FavoritesViewModel.FavoritesListItem>,
         item: FavoritesViewModel.FavoritesListItem
     ) {
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFavoriteBinding
-        val context = binding.root.context
-        val locale = Locale.getDefault()
-
-        binding.txtName.text = item.charger.name
-        binding.txtAddress.text = item.charger.address?.toString()
-        binding.txtAddress.visibility = invisibleUnless(item.charger.address != null)
-
-        binding.txtConnectors.text =
-            item.charger.formatChargepoints(context.stringProvider(), locale)
-
-        binding.txtDistance.text = distance(item.distance, context)
-        binding.txtDistance.visibility = goneUnless(item.distance != null)
-
-        val availableData = item.available.data
-        if (availableData != null) {
-            binding.txtStatus.text = String.format(
-                locale,
-                "%s/%d",
-                availabilityText(availableData),
-                item.total
-            )
-            binding.txtStatus.backgroundTintList =
-                ColorStateList.valueOf(availabilityColor(availableData, context))
-        }
-        binding.txtStatus.visibility = invisibleUnless(item.available.status == Status.SUCCESS)
-        binding.progressBar.visibility = goneUnless(item.available.status == Status.LOADING)
-
         binding.foreground.translationX = 0f
         binding.btnDelete.setOnClickListener {
             binding.foreground.animate()

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

@@ -1,12 +1,9 @@
 package net.vonforst.evmap.adapter
 
 import android.annotation.SuppressLint
-import android.view.LayoutInflater
 import android.view.MotionEvent
-import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.ItemFilterProfileBinding
 import net.vonforst.evmap.storage.FilterProfile
@@ -20,21 +17,14 @@ class FilterProfilesAdapter(
         setHasStableIds(true)
     }
 
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = ItemFilterProfileBinding.inflate(inflater, parent, false)
-
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(
-        holder: ViewHolder,
+        holder: ViewHolder<FilterProfile>,
         item: FilterProfile
     ) {
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFilterProfileBinding
-        binding.txtName.text = item.name
         binding.handle.setOnTouchListener { _, event ->
             if (event?.action == MotionEvent.ACTION_DOWN) {
                 dragHelper.startDrag(holder)

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

@@ -2,27 +2,17 @@ package net.vonforst.evmap.adapter
 
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.widget.CompoundButton
-import android.widget.SeekBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
-import androidx.viewbinding.ViewBinding
+import androidx.databinding.Observable
 import com.google.android.material.chip.Chip
+import net.vonforst.evmap.BR
 import net.vonforst.evmap.R
-import net.vonforst.evmap.databinding.ItemFilterBooleanBinding
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceBinding
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceLargeBinding
 import net.vonforst.evmap.databinding.ItemFilterSliderBinding
 import net.vonforst.evmap.fragment.MultiSelectDialog
-import net.vonforst.evmap.model.BooleanFilter
-import net.vonforst.evmap.model.BooleanFilterValue
-import net.vonforst.evmap.model.FilterValue
-import net.vonforst.evmap.model.FilterWithValue
-import net.vonforst.evmap.model.MultipleChoiceFilter
-import net.vonforst.evmap.model.MultipleChoiceFilterValue
-import net.vonforst.evmap.model.SliderFilter
-import net.vonforst.evmap.model.SliderFilterValue
+import net.vonforst.evmap.model.*
 import kotlin.math.max
 
 class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
@@ -46,30 +36,8 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             is SliderFilter -> R.layout.item_filter_slider
         }
 
-    override fun createBinding(
-        inflater: LayoutInflater,
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewBinding = when (viewType) {
-        R.layout.item_filter_boolean -> ItemFilterBooleanBinding.inflate(inflater, parent, false)
-        R.layout.item_filter_multiple_choice -> ItemFilterMultipleChoiceBinding.inflate(
-            inflater,
-            parent,
-            false
-        )
-
-        R.layout.item_filter_multiple_choice_large -> ItemFilterMultipleChoiceLargeBinding.inflate(
-            inflater,
-            parent,
-            false
-        )
-
-        R.layout.item_filter_slider -> ItemFilterSliderBinding.inflate(inflater, parent, false)
-        else -> error("Unknown viewType: $viewType")
-    }
-
     override fun bind(
-        holder: ViewHolder,
+        holder: ViewHolder<FilterWithValue<FilterValue>>,
         item: FilterWithValue<FilterValue>
     ) {
         super.bind(holder, item)
@@ -77,8 +45,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             is SliderFilterValue -> {
                 setupSlider(
                     holder.binding as ItemFilterSliderBinding,
-                    item.filter as SliderFilter,
-                    item.value
+                    item.filter as SliderFilter, item.value
                 )
             }
             is MultipleChoiceFilterValue -> {
@@ -86,75 +53,54 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                 if (filter.manyChoices) {
                     setupMultipleChoiceMany(
                         holder.binding as ItemFilterMultipleChoiceLargeBinding,
-                        filter,
-                        item.value
+                        filter, item.value
                     )
                 } else {
                     setupMultipleChoice(
                         holder.binding as ItemFilterMultipleChoiceBinding,
-                        filter,
-                        item.value
+                        filter, item.value
                     )
                 }
             }
             is BooleanFilterValue -> {
-                setupBoolean(holder.binding as ItemFilterBooleanBinding, item)
             }
         }
     }
 
-    private fun setupBoolean(
-        binding: ItemFilterBooleanBinding,
-        item: FilterWithValue<FilterValue>
-    ) {
-        val filter = item.filter as BooleanFilter
-        val value = item.value as BooleanFilterValue
-        binding.txtName.text = filter.name
-        binding.toggle.setOnCheckedChangeListener(null)
-        binding.toggle.isChecked = value.value
-        binding.toggle.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
-            value.value = isChecked
-        }
-    }
-
     private fun setupMultipleChoice(
         binding: ItemFilterMultipleChoiceBinding,
         filter: MultipleChoiceFilter,
         value: MultipleChoiceFilterValue
     ) {
+        // TODO: this implementation seems to be buggy
         val inflater = LayoutInflater.from(binding.root.context)
-        binding.txtName.text = filter.name
-
         value.values.toList().forEach {
+            // delete values that cannot be selected anymore
             if (it !in filter.choices.keys) value.values.remove(it)
         }
 
-        var showingAll = false
         fun updateButtons() {
             value.all = value.values == filter.choices.keys
             binding.btnAll.isEnabled = !value.all
             binding.btnNone.isEnabled = value.values.isNotEmpty()
-            binding.chipMore.text = binding.root.context.getString(
-                if (showingAll) R.string.show_less else R.string.show_more
-            )
         }
 
         val chips = mutableMapOf<String, Chip>()
 
+        // reuse existing chips in layout
         val reuseChips = binding.chipGroup.children.filter {
             it.id != R.id.chipMore
         }.toMutableList()
-        binding.chipGroup.children.toList().forEach {
+        binding.chipGroup.children.forEach {
             if (it.id != R.id.chipMore) binding.chipGroup.removeView(it)
         }
-
         filter.choices.entries.sortedByDescending {
             it.key in value.values
         }.sortedByDescending {
             if (filter.commonChoices != null) it.key in filter.commonChoices else false
         }.forEach { choice ->
             var reused = false
-            val chip = if (reuseChips.isNotEmpty()) {
+            val chip = if (reuseChips.size > 0) {
                 reused = true
                 reuseChips.removeAt(0) as Chip
             } else {
@@ -165,7 +111,6 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                 ) as Chip
             }
             chip.text = choice.value
-            chip.setOnCheckedChangeListener(null)
             chip.isChecked = choice.key in value.values || value.all
             if (value.all && choice.key !in value.values) value.values.add(choice.key)
 
@@ -179,7 +124,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             }
 
             if (filter.commonChoices != null && choice.key !in filter.commonChoices
-                && !(chip.isChecked && !value.all) && !showingAll
+                && !(chip.isChecked && !value.all) && !binding.showingAll
             ) {
                 chip.visibility = View.GONE
             } else {
@@ -189,7 +134,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             if (!reused) binding.chipGroup.addView(chip, binding.chipGroup.childCount - 1)
             chips[choice.key] = chip
         }
-
+        // delete surplus reusable chips
         reuseChips.forEach {
             binding.chipGroup.removeView(it)
         }
@@ -207,17 +152,16 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             updateButtons()
         }
         binding.chipMore.setOnClickListener {
-            showingAll = !showingAll
+            binding.showingAll = !binding.showingAll
             chips.forEach { (key, chip) ->
                 if (filter.commonChoices != null && key !in filter.commonChoices
-                    && !(chip.isChecked && !value.all) && !showingAll
+                    && !(chip.isChecked && !value.all) && !binding.showingAll
                 ) {
                     chip.visibility = View.GONE
                 } else {
                     chip.visibility = View.VISIBLE
                 }
             }
-            updateButtons()
         }
         updateButtons()
     }
@@ -229,36 +173,21 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
     ) {
         if (value.all) {
             value.values = filter.choices.keys.toMutableSet()
+            binding.notifyPropertyChanged(BR.item)
         }
 
-        binding.txtName.text = filter.name
-        binding.txtDetail.text = binding.root.context.getString(
-            if (value.all) {
-                R.string.all_selected
-            } else {
-                R.string.number_selected
-            },
-            value.values.size
-        )
-
         binding.btnEdit.setOnClickListener {
-            val dialog = MultiSelectDialog.getInstance(
-                filter.name,
-                filter.choices,
-                value.values,
-                commonChoices = filter.commonChoices
-            )
+            val dialog =
+                MultiSelectDialog.getInstance(
+                    filter.name,
+                    filter.choices,
+                    value.values,
+                    commonChoices = filter.commonChoices
+                )
             dialog.okListener = { selected ->
                 value.values = selected.toMutableSet()
                 value.all = value.values == filter.choices.keys
-                binding.txtDetail.text = binding.root.context.getString(
-                    if (value.all) {
-                        R.string.all_selected
-                    } else {
-                        R.string.number_selected
-                    },
-                    value.values.size
-                )
+                binding.item = binding.item
             }
             dialog.show((binding.root.context as AppCompatActivity).supportFragmentManager, null)
         }
@@ -269,37 +198,24 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
         filter: SliderFilter,
         value: SliderFilterValue
     ) {
-        binding.txtName.text = filter.name
-        val progress = max(filter.inverseMapping(value.value) - filter.min, 0)
-        binding.seekBar.max = filter.max - filter.min
-        binding.seekBar.setOnSeekBarChangeListener(null)
-        binding.seekBar.progress = progress
-        updateSliderValueText(binding, filter, progress)
+        binding.progress =
+            max(filter.inverseMapping(value.value) - filter.min, 0)
+        binding.mappedValue = filter.mapping(binding.progress + filter.min)
 
-        binding.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                value.value = filter.mapping(progress + filter.min)
-                updateSliderValueText(binding, filter, progress)
+        binding.addOnPropertyChangedCallback(object :
+            Observable.OnPropertyChangedCallback() {
+            override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+                when (propertyId) {
+                    BR.progress -> {
+                        val mapped = filter.mapping(binding.progress + filter.min)
+                        value.value = mapped
+                        binding.mappedValue = mapped
+                    }
+                }
             }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
-            override fun onStopTrackingTouch(seekBar: SeekBar?) = Unit
         })
     }
 
-    private fun updateSliderValueText(
-        binding: ItemFilterSliderBinding,
-        filter: SliderFilter,
-        progress: Int
-    ) {
-        val mappedValue = filter.mapping(progress + filter.min)
-        binding.txtValue.text = if (filter.unit.isNullOrBlank()) {
-            mappedValue.toString()
-        } else {
-            "$mappedValue ${filter.unit}"
-        }
-    }
-
     override fun getItemId(position: Int): Long {
         val key = getItem(position).filter.key
         var value = itemids[key]

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

@@ -5,15 +5,16 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.memory.MemoryCache
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.ChargerPhoto
-import net.vonforst.evmap.waitForLayout
 
 
 class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener? = null) :
@@ -39,9 +40,12 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
         val item = getItem(position)
 
         if (holder.view.height == 0) {
-            holder.view.waitForLayout {
-                loadImage(item, holder)
-            }
+            holder.view.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    holder.view.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    loadImage(item, holder)
+                }
+            })
         } else {
             loadImage(item, holder)
         }
@@ -67,7 +71,7 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
                     memoryKeys[item.id] = metadata.memoryCacheKey
                 }
             )
-            allowHardware(false)
+            allowHardware(!BuildConfig.DEBUG)
         }
     }
 }

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

@@ -1,34 +1,23 @@
 package net.vonforst.evmap.adapter
 
 import android.content.Context
-import android.content.res.ColorStateList
 import android.os.Handler
 import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.Filter
-import android.widget.Filterable
-import android.widget.ImageView
+import android.widget.*
+import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.LiveData
 import com.car2go.maps.model.LatLng
 import net.vonforst.evmap.R
-import net.vonforst.evmap.autocomplete.ApiUnavailableException
-import net.vonforst.evmap.autocomplete.AutocompletePlace
-import net.vonforst.evmap.autocomplete.AutocompletePlaceType
-import net.vonforst.evmap.autocomplete.AutocompleteProvider
-import net.vonforst.evmap.autocomplete.MapboxAutocompleteProvider
-import net.vonforst.evmap.autocomplete.PlaceWithBounds
-import net.vonforst.evmap.autocomplete.getAutocompleteProviders
+import net.vonforst.evmap.autocomplete.*
 import net.vonforst.evmap.containsAny
 import net.vonforst.evmap.databinding.ItemAutocompleteResultBinding
 import net.vonforst.evmap.isDarkMode
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.storage.RecentAutocompletePlace
-import net.vonforst.evmap.ui.distance
-import net.vonforst.evmap.ui.goneUnless
 import java.time.Instant
 
 class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatLng>) :
@@ -67,8 +56,9 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
         if (getItemViewType(position) == typeItem) {
             val viewHolder: ViewHolder
             if (view == null) {
-                val binding = ItemAutocompleteResultBinding.inflate(
+                val binding: ItemAutocompleteResultBinding = DataBindingUtil.inflate(
                     LayoutInflater.from(context),
+                    R.layout.item_autocomplete_result,
                     parent,
                     false
                 )
@@ -98,27 +88,7 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
         viewHolder: ViewHolder,
         place: AutocompletePlace
     ) {
-        val binding = viewHolder.binding
-        val isSpecial = isSpecialPlace(place.types)
-
-        binding.title.text = place.primaryText
-        binding.subtitle.text = place.secondaryText
-
-        binding.icon.contentDescription = place.secondaryText
-        binding.icon.setImageResource(iconForPlaceType(place.types))
-        val tintColor = if (isSpecial) {
-            androidx.appcompat.R.attr.colorPrimary
-        } else {
-            androidx.appcompat.R.attr.colorControlNormal
-        }
-        val ta = binding.root.context.theme.obtainStyledAttributes(intArrayOf(tintColor))
-        val tint = ta.getColor(0, 0)
-        ta.recycle()
-        binding.icon.imageTintList = ColorStateList.valueOf(tint)
-        binding.icon.backgroundTintList = ColorStateList.valueOf(tint)
-
-        binding.textView16.text = distance(place.distanceMeters, binding.root.context)
-        binding.textView16.visibility = goneUnless(place.distanceMeters != null)
+        viewHolder.binding.item = place
     }
 
     override fun getFilter(): Filter {

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

@@ -5,9 +5,7 @@ import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
-import net.vonforst.evmap.api.nobil.NobilApiWrapper
 import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
-import net.vonforst.evmap.api.openstreetmap.OpenStreetMapApiWrapper
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.viewmodel.Resource
 import java.time.Duration
@@ -60,27 +58,6 @@ interface ChargepointApi<out T : ReferenceData> {
      * Duration we are limited to if there is a required API local cache time limit.
      */
     val cacheLimit: Duration
-
-    /**
-     * Whether this API supports querying for chargers at the backend
-     *
-     * This determines whether the getChargepoints, getChargepointsRadius and getChargepointDetail functions are supported.
-     */
-    val supportsOnlineQueries: Boolean
-
-    /**
-     * Whether this API supports downloading the whole dataset into local storage
-     *
-     * This determines whether the getAllChargepoints function is supported.
-     */
-    val supportsFullDownload: Boolean
-
-    /**
-     * Fetches all available chargers from this API.
-     *
-     * This may take a long time and should only be used when the user explicitly wants to download all chargers.
-     */
-    suspend fun fullDownload(): FullDownloadResult<T>
 }
 
 interface StringProvider {
@@ -95,13 +72,6 @@ fun Context.stringProvider() = object : StringProvider {
 
 fun createApi(type: String, ctx: Context): ChargepointApi<ReferenceData> {
     return when (type) {
-        "nobil" -> {
-            NobilApiWrapper(
-                ctx.getString(
-                    R.string.nobil_key
-                )
-            )
-        }
         "openchargemap" -> {
             OpenChargeMapApiWrapper(
                 ctx.getString(
@@ -109,7 +79,6 @@ fun createApi(type: String, ctx: Context): ChargepointApi<ReferenceData> {
                 )
             )
         }
-
         "goingelectric" -> {
             GoingElectricApiWrapper(
                 ctx.getString(
@@ -117,11 +86,6 @@ fun createApi(type: String, ctx: Context): ChargepointApi<ReferenceData> {
                 )
             )
         }
-
-        "openstreetmap" -> {
-            OpenStreetMapApiWrapper()
-        }
-
         else -> throw IllegalArgumentException()
     }
 }
@@ -136,20 +100,4 @@ data class ChargepointList(val items: List<ChargepointListItem>, val isComplete:
     companion object {
         fun empty() = ChargepointList(emptyList(), true)
     }
-}
-
-/**
- * Result returned from fullDownload() function.
- *
- * Note that [chargers] is implemented as a [Sequence] so that downloaded chargers can be saved
- * while they are being parsed instead of having to keep all of them in RAM at once.
- *
- * [progress] is updated regularly to indicate the current download progress.
- * [referenceData] will typically only be available once the download is completed, i.e. you have
- * iterated over the whole sequence of [chargers].
- */
-interface FullDownloadResult<out T : ReferenceData> {
-    val chargers: Sequence<ChargeLocation>
-    val progress: Float
-    val referenceData: T
 }

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

@@ -1,39 +1,20 @@
 package net.vonforst.evmap.api
 
+import com.google.common.util.concurrent.RateLimiter
 import okhttp3.Interceptor
 import okhttp3.Response
-import okio.IOException
-import retrofit2.HttpException
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.TimeSource
 
-fun Interceptor.Chain.proceedSafely(request: okhttp3.Request): Response {
-    return try {
-        proceed(request)
-    } catch (e: Throwable) {
-        if (e is IOException) {
-            throw e
-        } else if (e is HttpException) {
-            // wrap HttpExceptions as IOExceptions, so that they are properly handled by Retrofit's error handling
-            throw IOException("${e.response()}", e)
-        } else {
-            // wrap other exceptions as IOExceptions, so that they are properly handled by Retrofit's error handling
-            throw IOException(e)
-        }
-    }
-}
 
 class RateLimitInterceptor : Interceptor {
-    private val rateLimiter = SimpleRateLimiter(3.0)
+    private val rateLimiter = RateLimiter.create(3.0)
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
         if (request.url.host == "ui-map.shellrecharge.com") {
             // limit requests sent to NewMotion to 3 per second
-            rateLimiter.acquire()
+            rateLimiter.acquire(1)
 
-            var response: Response = chain.proceedSafely(request)
+            var response: Response = chain.proceed(request)
             // 403 is how the NewMotion API indicates a rate limit error
             if (!response.isSuccessful && response.code == 403) {
                 response.close()
@@ -42,34 +23,11 @@ class RateLimitInterceptor : Interceptor {
                     Thread.sleep(1000)
                 } catch (e: InterruptedException) {
                 }
-                response = chain.proceedSafely(request)
+                response = chain.proceed(request)
             }
             return response
         } else {
-            return chain.proceedSafely(request)
+            return chain.proceed(request)
         }
     }
-}
-
-internal class SimpleRateLimiter(private val permitsPerSecond: Double) {
-    private val interval: Duration = (1.0 / permitsPerSecond).seconds
-    private var nextAvailable = TimeSource.Monotonic.markNow()
-
-    @Synchronized
-    fun acquire() {
-        val now = TimeSource.Monotonic.markNow()
-        if (now < nextAvailable) {
-            val waitTime = nextAvailable - now
-            waitTime.sleep()
-            nextAvailable += interval
-        } else {
-            nextAvailable = now + interval
-        }
-    }
-}
-
-fun Duration.sleep() {
-    if (this.isPositive()) {
-        Thread.sleep(this.inWholeMilliseconds, (this.inWholeNanoseconds % 1_000_000).toInt())
-    }
 }

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

@@ -1,17 +1,54 @@
 package net.vonforst.evmap.api
 
 import androidx.annotation.DrawableRes
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.suspendCancellableCoroutine
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.Chargepoint
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Response
+import org.json.JSONArray
+import java.io.IOException
+import kotlin.coroutines.resumeWithException
 import kotlin.math.abs
 
+operator fun <T> JSONArray.iterator(): Iterator<T> =
+    (0 until length()).asSequence().map {
+        @Suppress("UNCHECKED_CAST")
+        get(it) as T
+    }.iterator()
+
+@ExperimentalCoroutinesApi
+suspend fun Call.await(): Response {
+    return suspendCancellableCoroutine { continuation ->
+        enqueue(object : Callback {
+            override fun onResponse(call: Call, response: Response) {
+                continuation.resume(response) {}
+            }
+
+            override fun onFailure(call: Call, e: IOException) {
+                if (continuation.isCancelled) return
+                continuation.resumeWithException(e)
+            }
+        })
+
+        continuation.invokeOnCancellation {
+            try {
+                cancel()
+            } catch (ex: Throwable) {
+                //Ignore cancel exception
+            }
+        }
+    }
+}
+
 private val plugNames = mapOf(
     Chargepoint.TYPE_1 to R.string.plug_type_1,
     Chargepoint.TYPE_2_UNKNOWN to R.string.plug_type_2,
-    Chargepoint.TYPE_2_PLUG to R.string.plug_type_2_tethered,
+    Chargepoint.TYPE_2_PLUG to R.string.plug_type_2,
     Chargepoint.TYPE_2_SOCKET to R.string.plug_type_2,
-    Chargepoint.TYPE_3A to R.string.plug_type_3a,
-    Chargepoint.TYPE_3C to R.string.plug_type_3c,
+    Chargepoint.TYPE_3 to R.string.plug_type_3,
     Chargepoint.CCS_UNKNOWN to R.string.plug_ccs,
     Chargepoint.CCS_TYPE_1 to R.string.plug_ccs,
     Chargepoint.CCS_TYPE_2 to R.string.plug_ccs,
@@ -20,8 +57,7 @@ private val plugNames = mapOf(
     Chargepoint.SUPERCHARGER to R.string.plug_supercharger,
     Chargepoint.CEE_BLAU to R.string.plug_cee_blau,
     Chargepoint.CEE_ROT to R.string.plug_cee_rot,
-    Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc,
-    Chargepoint.MCS to R.string.plug_mcs
+    Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc
 )
 
 fun nameForPlugType(ctx: StringProvider, type: String): String =
@@ -64,9 +100,8 @@ fun iconForPlugType(type: String): Int =
         Chargepoint.CEE_BLAU -> R.drawable.ic_connector_cee_blau
         Chargepoint.CEE_ROT -> R.drawable.ic_connector_cee_rot
         Chargepoint.TYPE_1 -> R.drawable.ic_connector_typ1
-        Chargepoint.MCS -> R.drawable.ic_connector_mcs
         // TODO: add other connectors
-        else -> R.drawable.ic_connector_unknown
+        else -> 0
     }
 
 val powerSteps = listOf(0, 2, 3, 7, 11, 22, 43, 50, 75, 100, 150, 200, 250, 300, 350)

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

@@ -1,26 +1,24 @@
 package net.vonforst.evmap.api.availability
 
 import android.content.Context
-import android.os.Parcelable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
+import net.vonforst.evmap.api.await
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.cartesianProduct
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.viewmodel.Resource
-import okhttp3.Cache
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
+import okhttp3.Request
 import retrofit2.HttpException
 import java.io.IOException
 import java.net.CookieManager
 import java.net.CookiePolicy
-import java.time.Instant
 import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
@@ -38,6 +36,16 @@ interface AvailabilityDetector {
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
     protected val radius = 150  // max radius in meters
 
+    protected suspend fun httpGet(url: String): String {
+        val request = Request.Builder().url(url).build()
+        val response = client.newCall(request).await()
+
+        if (!response.isSuccessful) throw IOException(response.message)
+
+        val str = response.body!!.string()
+        return str
+    }
+
     protected fun getCorrespondingChargepoint(
         cps: Iterable<Chargepoint>, type: String, power: Double
     ): Chargepoint? {
@@ -128,9 +136,7 @@ data class ChargeLocationStatus(
     val status: Map<Chargepoint, List<ChargepointStatus>>,
     val source: String,
     val evseIds: Map<Chargepoint, List<String>>? = null,
-    val labels: Map<Chargepoint, List<String?>>? = null,
     val congestionHistogram: List<Double>? = null,
-    val lastChange: Map<Chargepoint, List<Instant?>>? = null,
     val extraData: Any? = null  // API-specific data
 ) {
     fun applyFilters(connectors: Set<String>?, minPower: Int?): ChargeLocationStatus {
@@ -146,73 +152,51 @@ data class ChargeLocationStatus(
     val totalChargepoints = status.map { it.key.count }.sum()
 }
 
-@Parcelize
-enum class ChargepointStatus : Parcelable {
+enum class ChargepointStatus {
     AVAILABLE, UNKNOWN, CHARGING, OCCUPIED, FAULTED
 }
 
 class AvailabilityDetectorException(message: String) : Exception(message)
 
-class NotSignedInException : IOException("not signed in")
-
 private val cookieManager = CookieManager().apply {
     setCookiePolicy(CookiePolicy.ACCEPT_ALL)
 }
 
 class AvailabilityRepository(context: Context) {
-    private val cacheSize = 5L * 1024 * 1024 // 5MB
     private val okhttp = OkHttpClient.Builder()
         .addInterceptor(RateLimitInterceptor())
         .addDebugInterceptors()
         .readTimeout(10, TimeUnit.SECONDS)
         .connectTimeout(10, TimeUnit.SECONDS)
         .cookieJar(JavaNetCookieJar(cookieManager))
-        .cache(Cache(context.cacheDir, cacheSize))
         .build()
-    private val teslaOwnerAvailabilityDetector =
-        TeslaOwnerAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
     private val availabilityDetectors = listOf(
         RheinenergieAvailabilityDetector(okhttp),
-        teslaOwnerAvailabilityDetector,
-        TeslaGuestAvailabilityDetector(okhttp),
-        NobilAvailabilityDetector(okhttp, context),
-        EnBwAvailabilityDetector(okhttp)
+        TeslaAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context)),
+        EnBwAvailabilityDetector(okhttp),
+        NewMotionAvailabilityDetector(okhttp)
     )
 
     suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
-        var result: ChargeLocationStatus? = null
-        var exception: Throwable? = null
-
+        var value: Resource<ChargeLocationStatus>? = null
         withContext(Dispatchers.IO) {
             for (ad in availabilityDetectors) {
                 if (!ad.isChargerSupported(charger)) continue
                 try {
-                    result = ad.getAvailability(charger)
+                    value = Resource.success(ad.getAvailability(charger))
                     break
                 } catch (e: IOException) {
-                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    value = Resource.error(e.message, null)
                     e.printStackTrace()
                 } catch (e: HttpException) {
-                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    value = Resource.error(e.message, null)
                     e.printStackTrace()
                 } catch (e: AvailabilityDetectorException) {
-                    exception = exception.takeIf { it is NotSignedInException } ?: e
-                    e.printStackTrace()
-                } catch (e: NotSignedInException) {
-                    exception = e
+                    value = Resource.error(e.message, null)
                     e.printStackTrace()
                 }
             }
         }
-        result?.let {
-            return Resource.success(it)
-        }
-        return Resource.error(exception?.message, null)
+        return value ?: Resource.error(null, null)
     }
-
-    fun isSupercharger(charger: ChargeLocation) =
-        teslaOwnerAvailabilityDetector.isChargerSupported(charger)
-
-    fun isTeslaSupported(charger: ChargeLocation) =
-        teslaOwnerAvailabilityDetector.isChargerSupported(charger) && teslaOwnerAvailabilityDetector.isSignedIn()
 }