[indexer] Use ICU regex to handle unicode characters in mastodon/bluesky domains

Improve regex, (ICU required for unicode character support) Also add tests for umlauts, add generated "Testing" folder to gitignore, and clean up url::UrlEncode a bit TODO: android doesn't build Signed-off-by: Harry Bond <me@hbond.xyz>
2025-12-19 13:03:36 +00:00 · 2025-07-29 13:36:17 +01:00
7240 changed files with 1103052 additions and 284733 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,61 +1,48 @@
 # Configuration file for clang-format, based on docs/CPP_STYLE.md.
+
+---
 BasedOnStyle: Google

 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: AcrossEmptyLinesAndComments
-AlignEscapedNewlines: LeftWithLastLine
 AlignOperands: AlignAfterOperator
 AllowShortBlocksOnASingleLine: Empty
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
 BraceWrapping:
  AfterCaseLabel: true
  AfterClass: true
  AfterControlStatement: Always
  AfterEnum: true
-  AfterExternBlock: true
  AfterFunction: true
  AfterNamespace: true
  AfterObjCDeclaration: true
  AfterStruct: true
  AfterUnion: true
+  AfterExternBlock: true
  BeforeCatch: true
  BeforeElse: true
  BeforeLambdaBody: true
  BeforeWhile: true
+  IndentBraces: false
  SplitEmptyFunction: false
-  SplitEmptyNamespace: false
  SplitEmptyRecord: false
-BinPackArguments: true
-BinPackParameters: true
-BreakAfterJavaFieldAnnotations: true
+  SplitEmptyNamespace: false
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
-ContinuationIndentWidth: 4
+ContinuationIndentWidth: 2
 DerivePointerAlignment: false
-EmptyLineBeforeAccessModifier: Always
 IncludeBlocks: Preserve
-IndentAccessModifiers: false
 IndentCaseLabels: false
 IndentExternBlock: NoIndent
-InsertBraces: false
 InsertNewlineAtEOF: true
-LambdaBodyIndentation: OuterScope
-PackConstructorInitializers: CurrentLine
+PackConstructorInitializers: Never
 PointerAlignment: Middle
-RemoveBracesLLVM: true
-RemoveSemicolon: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest
 TabWidth: 2
-
---
-Language: Java
-AllowShortFunctionsOnASingleLine: Empty
+UseTab: Never
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -1,8 +0,0 @@
-# Files that should not be formatted.
-./3party
-# A patched copy of the https://registry.khronos.org/OpenGL/api/GLES3/gl3.h
-./android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h
-# Formatting it leads to crashes in runtime. Newer protobuf may fix it.
-./libs/indexer/drules_struct.pb.cc
-# No need to format this 3party tool.
-tools/osmctools/*.c
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -1,55 +1,69 @@
+# All non-assigned.
+* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @comaps/design
-/android/app/src/main/res/font/ @comaps/design
-/android/app/src/main/res/mipmap*/ @comaps/design
-/data/*.ttf @comaps/design
-/data/resources-svg/ @comaps/design
-/data/search-icons/ @comaps/design
-/iphone/Maps/Images.xcassets/ @comaps/design
+/android/app/src/main/res/drawable*/ @organicmaps/design
+/android/app/src/main/res/font/ @organicmaps/design
+/android/app/src/main/res/mipmap*/ @organicmaps/design
+/data/*.ttf @organicmaps/design
+/data/resources-svg/ @organicmaps/design
+/data/search-icons/ @organicmaps/design
+/iphone/Maps/Images.xcassets/ @organicmaps/design
 # Android.
-/android/ @comaps/android
-/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @comaps/android
-/docs/JAVA_STYLE.md @comaps/android
+/android/ @organicmaps/android
+/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
+/docs/JAVA_STYLE.md @organicmaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @comaps/ios
-/xcode/ @comaps/ios
-/docs/OBJC_STYLE.md @comaps/ios
+/iphone/ @organicmaps/ios
+/xcode/ @organicmaps/ios
+/docs/OBJC_STYLE.md @organicmaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
+# Qt
+/qt/ @organicmaps/qt
+# Rendering
+/drape/ @organicmaps/rendering
+/drape_frontend/ @organicmaps/rendering
+# Map Data.
+/tools/python/maps_generator/ @organicmaps/data
+/generator/ @organicmaps/data
+/topography_generator/ @organicmaps/data
+/data/borders/ @organicmaps/data
+/data/conf/isolines/ @organicmaps/data
+/docs/SUBWAY_GENERATION.md @organicmaps/data
+/docs/MAPS.md @organicmaps/data
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @comaps/styles
-/data/types.txt @comaps/styles
-/data/visibility.txt @comaps/styles
-/data/mapcss-mapping.csv @comaps/styles
-/data/replaced_tags.txt @comaps/styles
-/data/classificator.txt @comaps/styles
-/data/drules_* @comaps/styles
+/data/styles/ @organicmaps/styles
+/data/types.txt @organicmaps/styles
+/data/visibility.txt @organicmaps/styles
+/data/mapcss-mapping.csv @organicmaps/styles
+/data/replaced_tags.txt @organicmaps/styles
+/data/classificator.txt @organicmaps/styles
+/data/drules_* @organicmaps/styles
 /docs/STYLES.md
-/tools/kothic/ @comaps/styles
+/tools/kothic/ @organicmaps/styles
 # DevOps.
-/.forgejo/workflows @comaps/devops
-/android/*gradle* @comaps/devops
-/docs/RELEASE_MANAGEMENT.md @comaps/devops
-/xcode/fastlane/ @comaps/devops
-/tools/python/maps_generator/ @comaps/devops
-/generator/ @comaps/devops
-/topography_generator/ @comaps/devops
-/data/borders/ @comaps/devops
-/data/conf/isolines/ @comaps/devops
-/docs/SUBWAY_GENERATION.md @comaps/devops
-/docs/MAPS.md @comaps/devops
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
+/.forgejo/workflows @organicmaps/devops
+/android/*gradle* @organicmaps/devops
+/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
+/xcode/fastlane/ @organicmaps/devops
+# Growth.
+README.md @organicmaps/growth
+/.forgejo/FUNDING.yml @organicmaps/growth
+/android/app/src/fdroid/play/ @organicmaps/growth
+/android/app/src/google/play/ @organicmaps/growth
+/iphone/metadata/ @organicmaps/growth
 # Legal.
-LEGAL @comaps/admins
-LICENSE @comaps/admins
-NOTICE @comaps/admins
-CONTRIBUTORS @comaps/admins
-/docs/CODE_OF_CONDUCT.md @comaps/admins
-/docs/DCO.md @comaps/admins
-/docs/GOVERNANCE.md @comaps/admins
+LEGAL @organicmaps/legal
+LICENSE @organicmaps/legal
+NOTICE @organicmaps/legal
+CONTRIBUTORS @organicmaps/legal
+/docs/CODE_OF_CONDUCT.md @organicmaps/legal
+/docs/DCO.md @organicmaps/legal
+/docs/GOVERNANCE.md @organicmaps/legal
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1,3 +1 @@
 open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.forgejo/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.forgejo/ISSUE_TEMPLATE/bug-report.yaml
@@ -1,5 +1,6 @@
 name: 🐞 Bug Report
 description: Report a problem you've encountered
+title: "bug: "
 labels:
  - bug
 body:
--- a/.forgejo/ISSUE_TEMPLATE/feature-request.yaml
+++ b/.forgejo/ISSUE_TEMPLATE/feature-request.yaml
@@ -1,5 +1,6 @@
 name: "💡 Feature Request"
 description: "Suggest an idea or improvement for CoMaps"
+title: "feat: "
 labels:
  - "enhancement"
 body:
--- a/.forgejo/workflows/android-beta.yaml
+++ b/.forgejo/workflows/android-beta.yaml
@@ -32,6 +32,9 @@ on:
      - track_generator/**
      - xcode/**

+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
  android-google-beta:
    name: Android Google Beta
@@ -68,6 +71,10 @@ jobs:
          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Compile
        shell: bash
        working-directory: android
--- a/.forgejo/workflows/android-check-metadata.yaml
+++ b/.forgejo/workflows/android-check-metadata.yaml
@@ -1,4 +1,4 @@
-name: Android Check Store Metadata
+name: Android Check Metadata
 on:
  workflow_dispatch: # Manual trigger
  pull_request:
@@ -21,8 +21,5 @@ jobs:
            android
            tools/python/check_store_metadata.py

-      - name: Check Google Play metadata
-        run: ./tools/python/check_store_metadata.py gplay
-
-      - name: Check F-Droid metadata
-        run: ./tools/python/check_store_metadata.py fdroid
+      - name: Check metadata
+        run: ./tools/python/check_store_metadata.py android
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -34,6 +34,9 @@ on:
      - track_generator/**
      - xcode/**

+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
  lint:
    name: Android Lint
@@ -48,6 +51,10 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Lint
        shell: bash
        working-directory: android
@@ -86,6 +93,10 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
--- a/.forgejo/workflows/android-monkey.yaml
+++ b/.forgejo/workflows/android-monkey.yaml
@@ -4,6 +4,9 @@ on:
  schedule:
    - cron:  '0 5 * * 0' # Once per week at 05:00 UTC

+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
  precondition:
    runs-on: ubuntu-latest
@@ -70,6 +73,10 @@ jobs:
          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Compile
        shell: bash
        working-directory: android
--- a/.forgejo/workflows/android-release-metadata.yaml
+++ b/.forgejo/workflows/android-release-metadata.yaml
@@ -2,25 +2,30 @@ name: Android Release Metadata
 on:
  workflow_dispatch: # Manual trigger

+env:
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+
 jobs:
  android-release-metadata:
    name: Upload Google Play metadata
    runs-on: ubuntu-latest
    environment: production
    steps:
-      - name: Checkout
+      - name: Checkout sources
+        # TODO: use shallow (and sparse?) checkout
        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          sparse-checkout: |
-            android
-            tools/python/check_store_metadata.py
+
+#      - name: Parallel submodules checkout
+#        shell: bash
+#        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

      - name: Restore release keys
        shell: bash
        run: |
+          echo "$PRIVATE_H" | base64 -d > private.h
          echo "$GOOGLE_PLAY_JSON" | base64 -d > android/app/google-play.json
        env:
+          PRIVATE_H: ${{ secrets.PRIVATE_H }}
          GOOGLE_PLAY_JSON: ${{ secrets.GOOGLE_PLAY_JSON }}

      - name: Upload
--- a/.forgejo/workflows/android-release.yaml
+++ b/.forgejo/workflows/android-release.yaml
@@ -5,6 +5,7 @@ on:
 env:
  RELEASE_NOTES: android/app/src/google/play/release-notes/en-US/default.txt
  FDROID_VERSION: android/app/src/fdroid/play/version.yaml
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin

 jobs:
  tag:
@@ -116,6 +117,10 @@ jobs:
          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Set up SDK
        shell: bash
        run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties
--- a/.forgejo/workflows/appstream-check.yaml
+++ b/.forgejo/workflows/appstream-check.yaml
@@ -3,20 +3,20 @@ on:
  workflow_dispatch: # Manual trigger
  pull_request:
    paths:
-      - packaging/app.comaps.comaps.metainfo.xml
+      - packaging/app.organicmaps.desktop.metainfo.xml
      - .forgejo/workflows/appstream-check.yaml  # Run check on self change

 jobs:
  validate-appstream:
    name: Validate appstream metadata xml
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1
          sparse-checkout: |
-            packaging/app.comaps.comaps.metainfo.xml
+            packaging/app.organicmaps.desktop.metainfo.xml

      - name: Install appstream validator and flatpak Builder
        shell: bash
@@ -29,8 +29,8 @@ jobs:

      - name: Lint appstream data with flatpak Builder
        shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml

      - name: Run appstreamcli in pedantic mode
        shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml
--- a/.forgejo/workflows/coverage-check.yaml
+++ b/.forgejo/workflows/coverage-check.yaml
@@ -33,7 +33,7 @@ concurrency:
 jobs:
  should-run-check:
    name: Should run coverage
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    outputs:
      run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
      manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
@@ -59,9 +59,14 @@ jobs:
  coverage:
    needs: should-run-check
    name: Generate coverage report
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}}
    steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
@@ -89,6 +94,10 @@ jobs:
              llvm \
              gcovr

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -1,9 +1,8 @@
-name: DCO
+name: dco
 on: [pull_request]

 jobs:
  check:
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
-      - name: Check for Developer Certificate of Origin (DCO) compliance
-        uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6
+      - uses: https://github.com/KineticCafe/actions-dco@v1
--- a/.forgejo/workflows/desktop-file-check.yaml
+++ b/.forgejo/workflows/desktop-file-check.yaml
@@ -3,20 +3,20 @@ on:
  workflow_dispatch: # Manual trigger
  pull_request:
    paths:
-      - qt/res/linux/app.comaps.comaps.desktop
+      - qt/res/app.organicmaps.desktop.desktop
      - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change

 jobs:
  validate-desktop-file:
    name: Validate .desktop file
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1
          sparse-checkout: |
-            qt/res/linux/app.comaps.comaps.desktop
+            qt/res/app.organicmaps.desktop.desktop

      - name: Install desktop-file-validate tool
        shell: bash
@@ -27,4 +27,4 @@ jobs:

      - name: Validate desktop file
        shell: bash
-        run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file"
--- a/.forgejo/workflows/ios-beta.yaml
+++ b/.forgejo/workflows/ios-beta.yaml
@@ -35,7 +35,7 @@ jobs:
    name: Apple TestFlight
    runs-on: macos-15
    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
--- a/.forgejo/workflows/ios-check.yaml
+++ b/.forgejo/workflows/ios-check.yaml
@@ -37,7 +37,7 @@ jobs:
    name: Build iOS
    runs-on: macos-15
    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
--- a/.forgejo/workflows/ios-release.yaml
+++ b/.forgejo/workflows/ios-release.yaml
@@ -7,7 +7,7 @@ jobs:
    name: iOS Release
    runs-on: macos-15
    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -31,13 +31,18 @@ on:
 jobs:
  linux-no-unity:
    name: Linux no unity build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    # Cancels previous jobs if the same branch or PR was updated again.
    concurrency:
      group: ${{ github.workflow }}-no-unity-${{ github.event.pull_request.number || github.ref }}
      cancel-in-progress: true

    steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
@@ -66,6 +71,10 @@ jobs:
              libqt6positioning6-plugins \
              libqt6positioning6

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
@@ -90,7 +99,7 @@ jobs:

  linux-matrix:
    name: Linux builds and tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    strategy:
      fail-fast: false
      matrix:
@@ -102,6 +111,11 @@ jobs:
      cancel-in-progress: true

    steps:
+      - name: Free disk space by removing .NET, Android and Haskell
+        shell: bash
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+
      - name: Checkout sources
        uses: actions/checkout@v4

@@ -128,19 +142,15 @@ jobs:
              libqt6positioning6-plugins \
              libqt6positioning6

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}

-      - name: Configure repository
-        shell: bash
-        env:
-          SKIP_MAP_DOWNLOAD: 1
-          SKIP_GENERATE_SYMBOLS: 1
-          SKIP_GENERATE_DRULES: 1
-        run: ./configure.sh
-
      - name: CMake
        shell: bash
        env:
--- a/.forgejo/workflows/macos-check.yaml
+++ b/.forgejo/workflows/macos-check.yaml
@@ -32,7 +32,7 @@ jobs:
    name: macOS builds and tests
    runs-on: macos-15
    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
      HOMEBREW_NO_ANALYTICS: 1
      HOMEBREW_NO_INSTALL_CLEANUP: 1
    strategy:
@@ -57,6 +57,10 @@ jobs:
        run: |
          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja qt@6

+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
--- a/.forgejo/workflows/map-generator.yml
+++ b/.forgejo/workflows/map-generator.yml
@@ -1,577 +0,0 @@
-name: map-generator
-on:
-  workflow_dispatch: # Manual trigger
-    inputs:
-      map-generator-test:
-        description: 'Test (non-prod) generation?'
-        required: false
-        default: false
-        type: boolean
-#      run-copy-coasts:
-#        description: 'Copy last used coastlines?'
-#        required: false
-#        default: true
-#        type: boolean
-      run-isolines:
-        description: 'Update altitude isolines?'
-        required: false
-        default: false
-        type: boolean
-      run-tiger:
-        description: 'Update TIGER address data?'
-        required: false
-        default: true
-        type: boolean
-      run-planet-pbf:
-        description: 'Update PBF planet (for Wiki & subways)?'
-        required: false
-        default: true
-        type: boolean
-      run-subways:
-        description: 'Update subways?'
-        required: false
-        default: true
-        type: boolean
-      run-wiki:
-        description: 'Update Wikipedia descriptions?'
-        required: false
-        default: true
-        type: boolean
-      run-planet-o5m:
-        description: 'Update O5M planet (for mapgen)?'
-        required: false
-        default: true
-        type: boolean
-      run-mapgen:
-        description: 'Run maps generation?'
-        required: false
-        default: true
-        type: boolean
-      map-generator-continue:
-        description: 'Continue previous map generation?'
-        required: false
-        default: false
-        type: boolean
-#      map-generator-countries:
-#        description: 'Generate specific MWMs? (i.e. "US_New York_*, foo")'
-#        required: false
-#        type: string
-      run-upload:
-        description: 'Upload latest maps to CDN?'
-        required: false
-        default: false
-        type: boolean
-#      reset:
-#        description: 'Reset part of the system?'
-#        required: false
-#        default: 'no'
-#        type: choice
-#        options:
-#          - 'no'
-#          - wiki-ratelimit
-
-## RCLONE_CONF is multi-line text containing keys and credentials for us2,ru1,fi1,de1 servers
-
-env:
-  RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
-  WIKIMEDIA_USERNAME: ${{ secrets.WIKIMEDIA_USERNAME }}
-  WIKIMEDIA_PASSWORD: ${{ secrets.WIKIMEDIA_PASSWORD }}
-  ZULIP_BOT_EMAIL: ${{ secrets.ZULIP_BOT_EMAIL }}
-  ZULIP_API_KEY: ${{ secrets.ZULIP_API_KEY }}
-  MWMTEST: ${{ inputs.map-generator-test }}
-  MWMCONTINUE: ${{ inputs.map-generator-continue }}
-  # MWMCOUNTRIES: ${{ inputs.map-generator-countries }}
-  DEBIAN_FRONTEND: noninteractive
-  TZ: Etc/UTC
-
-jobs:
-  clone-repos:
-    name: Clone Git Repos
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal:/mnt/4tbexternal
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Checkout main repo
-        shell: bash
-        run: |
-          echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
-          cd ~
-          git clone --depth 1 --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
-      - name: Checkout wikiparser repo
-        shell: bash
-        run: |
-          cd ~
-          git clone --depth 1 --single-branch https://codeberg.org/comaps/wikiparser.git
-      - name: Checkout subways repo
-        shell: bash
-        run: |
-          cd ~
-          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
-
-  copy-coasts:
-    # if: inputs.run-copy-coasts
-    name: Copy Previously Generated Coasts
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Copy Coasts
-        shell: bash
-        run: |
-          echo "WorldCoasts available:"
-          ls -al /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.*
-
-          if [ -f /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then
-
-          echo "Before:"
-          ls -al /home/planet/latest_coasts*
-          # TODO: don't copy coasts from test generations
-          cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom /home/planet/latest_coasts.geom
-          cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /home/planet/latest_coasts.rawgeom
-
-          echo "After:"
-          ls -al /home/planet/latest_coasts*
-
-          else
-
-          echo "No WorldCoasts found."
-
-          fi
-
-  update-isolines:
-    if: inputs.run-isolines
-    name: Update Isolines
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      # TODO: we only need to update these if our SRTM or countries change
-      # TODO: after update, verify that sizable files exist: /home/planet/isolines/*.isolines
-      - name: Update Isolines
-        shell: bash
-        # TODO: preserve previous isolines version?
-        # TODO: cleanup the tmp-tiles dir after completion
-        run: |
-          cd ~/comaps/
-          ./tools/unix/build_omim.sh -p ~ -R topography_generator_tool
-          rm -rf /home/planet/isolines/
-          mkdir /home/planet/isolines/
-          ~/omim-build-relwithdebinfo/topography_generator_tool \
-          --profiles_path=./data/conf/isolines/isolines-profiles.json \
-          --countries_to_generate_path=./data/conf/isolines/countries-to-generate.json \
-          --tiles_isolines_out_dir=/home/planet/isolines/tmp-tiles/ \
-          --countries_isolines_out_dir=/home/planet/isolines/ \
-          --data_dir=./data/ \
-          --srtm_path=/home/planet/SRTM-patched-europe/ \
-          --threads=96
-      - name: Check isolines
-        shell: bash
-        run: |
-          NUMISO=$(ls -al /home/planet/isolines/*.isolines | wc -l)
-          echo "Found $NUMISO isolines"
-          if [ $NUMISO -lt 10 ]; then
-          echo "ERROR: Did generation fail?"
-          exit 1
-          fi
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Isolines are done!'
-
-  update-tiger:
-    if: inputs.run-tiger
-    name: Update TIGER
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Build address_parser
-        shell: bash
-        run: |
-          cd ~/comaps
-          #rm -rf ~/omim-build-relwithdebinfo/CMakeCache.txt
-          #rm -rf ~/omim-build-relwithdebinfo/CMakeFiles
-          ./tools/unix/build_omim.sh -p ~ -R address_parser_tool
-      - name: Update TIGER from Nominatim
-        shell: bash
-        # TODO: use curl instead of wget2
-        run: |
-          # TODO: maybe remove old osm-planet/tiger first?
-          cd /home/planet/
-          mkdir -p tiger
-          wget2 https://nominatim.org/data/tiger-nominatim-preprocessed-latest.csv.tar.gz
-          cd ~/comaps
-          tar -xOzf /home/planet/tiger-nominatim-preprocessed-latest.csv.tar.gz | ~/omim-build-relwithdebinfo/address_parser_tool --output_path=/home/planet/tiger
-
-  update-planet-pbf:
-    if: inputs.run-planet-pbf
-    name: Update PBF Planet
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Download Planet File if Absent
-        shell: bash
-        # TODO: replace wget2 with curl -Z
-        run: |
-          if [ ! -d /home/planet/planet/ ]; then
-          mkdir -p /home/planet/planet/
-          fi
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          cd /home/planet/planet/
-          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
-          else
-          echo "planet-latest.osm.pbf was found, raw download not required."
-          fi
-      - name: Update PBF Planet
-        shell: bash
-        run: |
-          cd /home/planet/planet/
-          rm -f planet-latest-new.osm.pbf
-          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
-          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=PBF planet update is done!'
-
-  update-subways:
-    if: inputs.run-subways
-    name: Update Subways
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Update Subways
-        shell: bash
-        run: |
-          cd ~/comaps/
-          cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
-          ./tools/unix/maps/generate_subways.sh
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Subways are done!'
-
-  wiki-update:
-    if: inputs.run-wiki
-    name: Update Wikipedia
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Check for planet file
-        shell: bash
-        # TODO: remove debug output
-        run: |
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
-          ls -al /home/planet/
-          ls -al /home/planet/planet/
-          exit 1
-          fi
-      - name: Only get new dumps once per 30 days
-        shell: bash
-        run: |
-          if [[ '${{ inputs.reset }}' == 'wiki-ratelimit' ]]; then
-          echo "Bypassing wiki rate limit upon request."
-          exit 0
-          fi
-
-          datediff() {
-            d1=$(date -d "$1" +%s)
-            d2=$(date -d "$2" +%s)
-            echo $(( (d1 - d2) / 86400 ))
-          }
-          RECENTDUMPDATE=$(find /home/planet/wikipedia/dumps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 |  cut -d/ -f6)
-          TODAY=$(date +%Y%m%d)
-          DATEDIFF=$(datediff $TODAY $RECENTDUMPDATE)
-          if [ $DATEDIFF -lt 30 ]; then
-          echo "ERROR: The most recent wiki dump is from $RECENTDUMPDATE, $DATEDIFF days ago. Wikimedia limits users to 15 snapshot requests per month."
-          echo "Set the 'reset' option to 'wiki-ratelimit' to bypass this."
-          ls -al /home/planet/wikipedia/dumps/
-          exit 1
-          fi
-      - name: Update Wikipedia from Enterprise API
-        shell: bash
-        run: |
-          #todo: curl in download.sh can fail when rate limited and even save error messages to the output. need to validate.
-          #downloading all languages can also trigger rate limits or fail as well. needs work.
-          #also: a failure to download means a failure to build, and could result in no wiki descriptions etc.
-          #also-also: do we want to remove old wiki data in planet between builds? pastk: no need, its being updated / augmented
-          mkdir -p /home/planet/wikipedia/dumps
-          mkdir -p /home/planet/wikipedia/build
-          cd ~/wikiparser
-          ls -al
-          echo "Downloading ..."
-          ./download.sh /home/planet/wikipedia/dumps
-          ls -al /home/planet/wikipedia/dumps/*
-          echo "Running ..."
-          ./run.sh /home/planet/wikipedia/build \
-          /home/planet/planet/planet-latest.osm.pbf \
-          /home/planet/wikipedia/dumps/latest/*.tar.gz
-          echo "DONE"
-      - name: Check that the latest dumps are present, recent, and not super tiny
-        shell: bash
-        run: |
-          FAILCHECK=0
-
-          # Check all .tar.gz files in /home/planet/wikipedia/dumps/latest/
-          for file in /home/planet/wikipedia/dumps/latest/*.tar.gz; do
-              # Check if file exists (handles case where glob doesn't match)
-              [ -e "$file" ] || continue
-
-              # Get file size in MB and modification time in days
-              size_mb=$(stat -f%z "$file" 2>/dev/null | awk '{print int($1/1024/1024)}' || stat -c%s "$file" | awk
-           '{print int($1/1024/1024)}')
-              days_old=$(find "$file" -mtime -7 | wc -l)
-
-              # Verify conditions
-              if [ "$size_mb" -lt 100 ]; then
-                  echo "FAIL: $file is only ${size_mb}MB (< 100MB)"
-                  FAILCHECK=1
-              elif [ "$days_old" -eq 0 ]; then
-                  echo "FAIL: $file is older than 7 days"
-                  ls -al $file
-                  FAILCHECK=1
-              else
-                  echo "PASS: $file (${size_mb}MB, modified within 7 days)"
-              fi
-          done
-
-          exit $FAILCHECK
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Wiki update is done!'
-
-  update-planet-o5m:
-    if: inputs.run-planet-o5m
-    name: Update O5M Planet
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Check for O5M Planet File
-        shell: bash
-        run: |
-          if [ ! -f /home/planet/planet/planet.o5m ]; then
-          echo "WARN: No file at /home/planet/planet/planet.o5m"
-
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
-          ls -al /home/planet/
-          ls -al /home/planet/planet/
-          exit 1
-          fi
-
-          echo "Converting planet-latest.osm.pbf to planet.o5m"
-          cd /home/planet/planet/
-          osmconvert -v --drop-author --drop-version --hash-memory=4000 planet-latest.osm.pbf -o=planet.o5m
-          echo "Conversion is done."
-          fi
-      - name: Update O5M planet
-        run: |
-          echo "Starting..."
-          cd /home/planet/planet/
-          rm -f planet-new.o5m
-          osmupdate -v --drop-author --drop-version --hash-memory=4000  --max-merge=32 --out-o5m planet.o5m planet-new.o5m
-          mv planet-new.o5m planet.o5m
-          echo "Done."
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=O5M planet update is done!'
-
-  generate-maps:
-    if: inputs.run-mapgen
-    name: Generate Maps
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    timeout-minutes: 40320
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-      options: --ulimit nofile=262144:262144
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Make output folders if necessary
-        shell: bash
-        run: |
-          if [ ! -d /mnt/4tbexternal/osm-maps ]; then
-          mkdir -p /mnt/4tbexternal/osm-maps
-          fi
-      - name: Get SRTM if necessary
-        # TODO: it should be a separate step like Wiki or isolines
-        shell: bash
-        run: |
-          if [ ! -d /home/planet/SRTM-patched-europe/ ]; then
-          echo "ERROR: NO SRTM"
-          exit 1
-          fi
-      - name: Run docker_maps_generator.sh
-        shell: bash
-        run: |
-          cd ~/comaps
-          bash ./tools/unix/maps/docker_maps_generator.sh
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Generator is done!'
-
-  upload-maps:
-    if: inputs.run-upload
-    name: Upload Maps
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Write config file
-        run: |
-          mkdir -p ~/.config/rclone/
-          echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf
-      - name: Upload map files to CDNs
-        shell: bash
-        run: |
-          shopt -s nullglob
-          buildfolder=$(find /mnt/4tbexternal/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5)
-          builddate=$(find /mnt/4tbexternal/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6)
-          mwmfiles=( /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm )
-
-          if (( ${#mwmfiles[@]} )); then
-            echo "<$(date +%T)> Uploading maps from $buildfolder/$builddate..."
-            cd ~/comaps/tools/unix/maps
-            ./upload_to_cdn.sh /mnt/4tbexternal/osm-maps/$buildfolder/$builddate
-            echo "<$(date +%T)> Finished uploading maps from $buildfolder/$builddate."
-          else
-            echo "<$(date +%T)> No MWM files in /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps."
-            echo "<$(date +%T)> Found top level: $(ls -alt /mnt/4tbexternal/osm-maps/*)"
-            echo "<$(date +%T)> Found second level: $(ls -alt /mnt/4tbexternal/osm-maps/$buildfolder/*)"
-          fi
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Upload is done!'
-
--- a/.forgejo/workflows/stale.yml
+++ b/.forgejo/workflows/stale.yml
@@ -0,0 +1,22 @@
+name: Close stale PRs
+on:
+  schedule:
+    - cron: "0 0 * * *" # Runs every day at midnight
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-pr-stale: 180 # 6 months before warning
+          days-before-pr-close: 365 # Closed after 12 months
+          stale-pr-label: "stale"
+          stale-pr-message: "Hi! This PR has been inactive for 6 months. If it's still relevant, please update it to let us know you’d like to keep it open 😊"
+          close-pr-message: "This PR has been automatically closed after 12 months of inactivity."
+          days-before-issue-stale: -1 # Issues are never stale
+          days-before-issue-close: -1 # Issues are never closed
+          remove-stale-when-updated: true
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +0,0 @@
-open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -6,8 +6,7 @@ on:
      - main

 env:
-  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
-  SKIP_MAP_DOWNLOAD: true
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin

 jobs:
  lint:
@@ -23,16 +22,9 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

-      - name: Install protobuf
+      - name:  Init boost, generate textures
        shell: bash
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y python3-pip
-          pip install "protobuf<3.21" --break-system-packages
-
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
+        run: ./configure.sh --skip-map-download

      - name: Lint
        shell: bash
@@ -73,9 +65,7 @@ jobs:
          libxinerama-dev \
          libxcursor-dev \
          libxi-dev \
-          python3-pip \
          zlib1g-dev
-          pip install "protobuf<3.21" --break-system-packages

      - name: Checkout sources
        uses: actions/checkout@v4
@@ -86,6 +76,10 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

+      - name:  Init boost, generate textures
+        shell: bash
+        run: ./configure.sh --skip-map-download
+
      - name: Configure ccache
        uses: hendrikmuhs/ccache-action@v1.2
        with:
--- a/.github/workflows/code-style-check.yaml
+++ b/.github/workflows/code-style-check.yaml
@@ -1,51 +0,0 @@
-name: Code style check
-
-on:
-  pull_request:
-    branches: [ master ]
-    paths:  # Should stay in sync with tools/unix/clang-format.sh
-      - '.github/workflows/code-style-check.yaml'
-      - 'android/app/src/**.java'
-      - 'android/sdk/src/**.java'
-      - 'android/sdk/src/main/cpp/**.[ch]pp'
-      - 'dev_sandbox/**.[ch]pp'
-      - 'generator/**.[ch]pp'
-      - 'iphone/**.[ch]pp'
-      - 'iphone/**.[hm]'
-      - 'iphone/**.mm'
-      - 'libs/**.[ch]pp'
-      - 'libs/**.[hm]'
-      - '!libs/indexer/drules_struct.pb.h'
-      - 'libs/**.mm'
-      - 'qt/**.[ch]pp'
-      - 'qt/**.h'
-      - 'tools/**.[ch]pp'
-      - '.clang-format'
-      - '.clang-format-ignore'
-
-jobs:
-  code-style-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install clang-format
-        run: |
-          sudo apt purge -y clang-format-18  # Remove default old version of clang-format
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' | sudo tee /etc/apt/sources.list.d/llvm-toolchain-noble-20.list
-          sudo apt-get update
-          sudo apt-get install -y clang-format-20
-          sudo update-alternatives --force --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 10
-          sudo update-alternatives --force --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-20 10
-          clang-format --version
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Check code style
-        run: tools/unix/clang-format.sh
-
-      - name: Post clang-format comments
-        if: failure()
-        uses: reviewdog/action-suggester@v1.21.0
-        with:
-          tool_name: clang-format
-          fail_level: error
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -8,14 +8,14 @@ on:
 jobs:
  ios-check:
    name: Build iOS
-    runs-on: macos-26
+    runs-on: macos-15
    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
      TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
-      SIMULATOR_DEVICE: 'iPhone 17 Pro Max'
+      SIMULATOR_DEVICE: 'iPhone 16 Pro Max'
    strategy:
      fail-fast: false
      matrix:
@@ -30,10 +30,6 @@ jobs:
        run: |
          brew install qt \
          optipng
-          pip3 install "protobuf<3.21" --break-system-packages
-          xcodebuild -downloadComponent metalToolchain
-          xcodebuild -downloadPlatform iOS
-
      - name: Checkout sources
        uses: actions/checkout@v4

@@ -41,11 +37,11 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))

-      - name: Configure repository
+      - name:  Init boost, download World map, generate textures
        shell: bash
        run: ./configure.sh

-      - name: Configure Xcode cache
+      - name: Configure XCode cache
        uses: irgaly/xcode-cache@v1
        with:
          key: xcode-cache-deriveddata-${{ github.workflow }}-${{ matrix.buildType }}-${{ github.sha }}
--- a/.gitignore
+++ b/.gitignore
@@ -9,35 +9,27 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
-*.local.*

 stxxl.errlog
 stxxl.log
 screenlog.0

+data/styles/*/*/out/*
+data/resources-*_design/*
 # symbols png/sdf are now generated at build
-data/symbols/**/symbols.png
-data/symbols/**/symbols.sdf
-
+data/resources-*_*/symbols.png
+data/resources-*_*/symbols.sdf
+data/drules_proto_default_design.bin
+data/colors_design.txt
+data/patterns_design.txt
 data/bookmarks
 data/edits.xml
 data/World.mwm
 data/WorldCoasts.mwm
-data/world_mwm/*
-data/*_hash
-data/drules_proto*
-data/classificator.txt*
-data/types.txt*
-data/visibility.txt*
-data/colors.txt*
-data/patterns.txt*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt

-# Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
-data/categories.txt
+# generated when running tests. NOT the lowercase 'testing' which should be kept.
+Testing
+!testing

 # Compiled Python
 *.pyc
@@ -56,9 +48,10 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows/windows.rc
+!qt/res/windows.rc
 *.pdb
-out/
+out/*
+qt/mapswithme.log

 # XCode
 xcode/keys/*
@@ -155,8 +148,6 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
-# Generated file
-libs/indexer/localized_types_map.cpp

 *.li

@@ -190,6 +181,10 @@ tools/python/maps_generator/var/etc/map_generator.ini
 tools/python/routing/etc/*.ini
 tools/unix/maps/settings.sh

+# Helpers
+/node_modules/
+/package-lock.json
+
 # Visual Studio
 .vs

--- a/.gitmodules
+++ b/.gitmodules
@@ -65,7 +65,3 @@
 [submodule "3party/imgui/imgui"]
  path = 3party/imgui/imgui
  url = https://github.com/ocornut/imgui
-[submodule "3party/glaze"]
-  path = 3party/glaze
-  url = https://github.com/stephenberry/glaze
-  branch = main
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -57,7 +57,6 @@ endif()

 add_subdirectory(agg)
 add_subdirectory(bsdiff-courgette)
-add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)
--- a/3party/Vulkan-Headers
+++ b/3party/Vulkan-Headers
--- a/3party/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -4,9 +4,7 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)

 # Fix warning with ONE_PIXEL macro clash.
-if(NOT MSVC)
- target_compile_options(freetype PRIVATE -Wno-macro-redefined)
-endif()
+target_compile_options(freetype PRIVATE -Wno-macro-redefined)

 # Use ft2build.h from the current directory instead of the default.
 target_include_directories(freetype
--- a/3party/glaze
+++ b/3party/glaze
--- a/3party/harfbuzz/CMakeLists.txt
+++ b/3party/harfbuzz/CMakeLists.txt
@@ -11,23 +11,14 @@ target_include_directories(${PROJECT_NAME}
    harfbuzz/src
 )

-if (MSVC)
-  target_compile_options(${PROJECT_NAME}
-    PRIVATE
-      /GR-
-      /EHsc-
-      /Zc:threadSafeInit-
-  )
-else()
-  # Keep these settings in sync with xcode/harfbuzz project.
-  target_compile_options(${PROJECT_NAME}
+# Keep these settigns in sync with xcode/harfbuzz project.
+target_compile_options(${PROJECT_NAME}
  PRIVATE
    -fno-rtti
    -fno-exceptions
    -fno-threadsafe-statics
    $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
-  )
-endif()
+)

 target_compile_definitions(${PROJECT_NAME}
  PRIVATE
@@ -37,19 +28,13 @@ target_compile_definitions(${PROJECT_NAME}
    #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
    HAVE_ATEXIT
    HAVE_GETPAGESIZE
-    HAVE_MPROTECT
-    HAVE_SYSCONF
-)
-
-if (NOT MSVC)
-  target_compile_definitions(${PROJECT_NAME}
-    PRIVATE
    HAVE_MMAP
+    HAVE_MPROTECT
    HAVE_PTHREAD
+    HAVE_SYSCONF
    HAVE_SYS_MMAN_H
    HAVE_UNISTD_H
-  )
-endif()
+)

 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)

--- a/3party/icu/CMakeLists.txt
+++ b/3party/icu/CMakeLists.txt
@@ -172,7 +172,6 @@ add_library(icuuc
  icu/icu4c/source/common/uvector.cpp
  icu/icu4c/source/common/uvectr32.cpp
  icu/icu4c/source/common/uvectr64.h
-  icu/icu4c/source/common/wintz.cpp
  icu/icu4c/source/common/wintz.h
 )

--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -11,7 +11,6 @@ set(SRC
  protobuf/src/google/protobuf/message_lite.cc
  protobuf/src/google/protobuf/repeated_field.cc
  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
-  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
  protobuf/src/google/protobuf/stubs/bytestream.cc
  protobuf/src/google/protobuf/stubs/common.cc
  protobuf/src/google/protobuf/stubs/int128.cc
--- a/3party/protobuf/protobuf
+++ b/3party/protobuf/protobuf
--- a/3party/succinct/mapper.hpp
+++ b/3party/succinct/mapper.hpp
@@ -7,6 +7,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_pod.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>

 #include "mappable_vector.hpp"

@@ -282,6 +283,12 @@ namespace succinct { namespace mapper {
        return mapper.bytes_read();
    }

+    template <typename T>
+    size_t map(T& val, boost::iostreams::mapped_file_source const& m, uint64_t flags = 0, const char* friendly_name = "<TOP>")
+    {
+        return map(val, m.data(), flags, friendly_name);
+    }
+
    template <typename T>
    uint64_t size_of(T& val)
    {
--- a/3party/succinct/util.hpp
+++ b/3party/succinct/util.hpp
@@ -8,6 +8,7 @@
 #include <stdint.h>

 #include <boost/iterator/iterator_facade.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>

 namespace succinct { namespace util {

@@ -204,6 +205,29 @@ namespace succinct { namespace util {
        std::string m_cur_value;
    };

+    struct mmap_lines
+    {
+        typedef buffer_line_iterator iterator;
+        typedef buffer_line_iterator const_iterator;
+
+        mmap_lines(std::string filename)
+            : m_map(filename)
+        {}
+
+        const_iterator begin() const
+        {
+            return const_iterator(m_map.data(), m_map.size());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator();
+        }
+
+    private:
+        boost::iostreams::mapped_file_source m_map;
+    };
+
    struct input_error : std::invalid_argument
    {
        input_error(std::string const& what)
--- a/3party/vulkan_wrapper/vulkan_wrapper.cpp
+++ b/3party/vulkan_wrapper/vulkan_wrapper.cpp
@@ -19,18 +19,7 @@ extern "C" {
 #endif

 #include "vulkan_wrapper.h"
-
-#if defined(_WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#else
 #include <dlfcn.h>
-#endif

 int InitVulkan(void) {
 #if defined(__APPLE__)
@@ -41,9 +30,6 @@ int InitVulkan(void) {
    if (!libvulkan) {
        libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
    }
-#elif defined( _WIN32 )
-    HMODULE libvulkan = LoadLibraryA("vulkan-1.dll");
-    auto dlsym = [](HMODULE h, char const * name) { return GetProcAddress(h, name); };
 #else
    void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
    if (!libvulkan) {
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1)
-
 project(omim C CXX)

-set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_C_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_C_STANDARD 17)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,12 +38,12 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
  # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
  enable_language(OBJC)
  set(CMAKE_OBJC_EXTENSIONS OFF)
-  set(CMAKE_OBJC_STANDARD 23)
+  set(CMAKE_OBJC_STANDARD 11)
  set(CMAKE_OBJC_FLAGS -fobjc-arc)
  set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
  enable_language(OBJCXX)
  set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 23)
+  set(CMAKE_OBJCXX_STANDARD 20)
  set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
  set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
@@ -85,7 +84,7 @@ if (MSVC)
  add_compile_options(/utf-8)
  add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
+  add_compile_options(-ffast-math)
 endif()

 if (PLATFORM_WIN)
@@ -104,7 +103,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
  add_definitions(-DRELEASE)
  if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-Ofast $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)  # Also enables -ffast-math
  endif()
 else()
  message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
@@ -114,6 +113,19 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
  add_compile_options(-fno-omit-frame-pointer)
 endif()

+# Linux GCC LTO plugin fix.
+if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))
+  # To force errors if LTO was not enabled.
+  add_compile_options(-fno-fat-lto-objects)
+  # To fix ar and ranlib "plugin needed to handle lto object".
+  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
+  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
+endif()
+
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})

 if (PLATFORM_LINUX OR PLATFORM_ANDROID)
@@ -162,15 +174,15 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
  find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)

  set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
-  if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
-    message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
+  if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
+    message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
  else()
-    message(STATUS "Found Qt version: ${Qt6_VERSION}")
+    message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
  endif()
 endif()

 # To allow #include "base/file_name.hpp" in all sources.
-include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
+include_directories(${CMAKE_HOME_DIRECTORY})

 if (USE_PCH)
  message(STATUS "Precompiled headers are ON")
@@ -182,7 +194,7 @@ if (USE_PCH)
 endif()

 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX)
+if (PLATFORM_LINUX OR PLATFORM_WIN)
  find_package(ICU COMPONENTS uc i18n data REQUIRED)
  find_package(Freetype REQUIRED)
  find_package(harfbuzz REQUIRED)
@@ -209,49 +221,53 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY)
  include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
 endif()

-# Fix for #include <boost/regex.hpp>
-include_directories("${OMIM_ROOT}/3party/boost")
-
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)

-execute_process(
-    COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf; 
-print(google.protobuf.__version__)"
-    RESULT_VARIABLE PROTOBUF_CHECK
-    OUTPUT_VARIABLE PROTOBUF_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-)
-
-if(PROTOBUF_CHECK EQUAL 0)
-    if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
-        message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
-    else()
-        message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
-    endif()
-else()
-    message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
-endif()
-
-
-add_subdirectory(libs)
+add_subdirectory(base)
+add_subdirectory(coding)
+add_subdirectory(descriptions)
+add_subdirectory(drape)
+add_subdirectory(drape_frontend)
+add_subdirectory(editor)
+add_subdirectory(ge0)
+add_subdirectory(generator/mwm_diff)
+add_subdirectory(geometry)
+add_subdirectory(indexer)
+add_subdirectory(kml)
+add_subdirectory(map)
+add_subdirectory(cppjansson)
+add_subdirectory(platform)
+add_subdirectory(routing)
+add_subdirectory(routing_common)
+add_subdirectory(search)
+add_subdirectory(shaders)
+add_subdirectory(storage)
+add_subdirectory(tracking)
+add_subdirectory(traffic)
+add_subdirectory(transit)

 if (PLATFORM_DESKTOP)
-  add_subdirectory(dev_sandbox)
+  omim_add_tool_subdirectory(feature_list)
  add_subdirectory(generator)
-  add_subdirectory(tools)
+  add_subdirectory(openlr)
+  add_subdirectory(poly_borders)
+  omim_add_tool_subdirectory(topography_generator)
+  add_subdirectory(track_analyzing)
+  omim_add_tool_subdirectory(track_generator)
  if (NOT SKIP_QT_GUI)
    add_subdirectory(qt)
+    omim_add_tool_subdirectory(skin_generator)
  endif()
  if (GENERATOR_TOOL)
    add_compile_options(-march=native -mtune=native)
    message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
  endif()
+  add_subdirectory(dev_sandbox)
 endif()

-omim_add_test_subdirectory(libs/qt_tstfrm)
+omim_add_test_subdirectory(qt_tstfrm)

 if (PLATFORM_ANDROID)
-  add_subdirectory(android/sdk/src/main/cpp)
+  add_subdirectory(android/app/src/main/cpp)
 endif()
--- a/6
+++ b/6
@@ -1,17 +1,15 @@
 This file contains a list of people who have contributed to this project.
-It is not necessarily comprehensive as contributors must manually add themselves.
+Its not neccesarily comprehensive.
 Feel free to add yourself here along with your first contribution!

 --------------------------------------------------------------------------------
 CoMaps contributors:
-(in alphabetical order)
+(in alphabetic order)
 --------------------------------------------------------------------------------

 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
-NoelClick
-thesupertechie
 vikiawv
 Yannik Bloscheck

--- a/README.md
+++ b/README.md
@@ -19,20 +19,20 @@
 </div>
 <div align="center">
  <p align="center">
-    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
-      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
+    <a href="https://codeberg.org/comaps/comaps/releases">
+      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
    </a>
    <a href="https://opencollective.com/comaps">
-      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors"/>
+      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors" style="width: 90%; max-width: 191px;"/>
    </a>
    <a href="https://liberapay.com/CoMaps">
-      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons"/>
+      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
    </a>
  </p>
 </div>
@@ -41,6 +41,8 @@

 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.

+**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
+
 <p align="center">
  <a href="https://apps.apple.com/app/comaps/id6747180809">
    <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
@@ -51,12 +53,6 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
  <a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
    <img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
  </a>
-  <a href="https://apt.izzysoft.de/fdroid/index/apk/app.comaps">
-    <img src="docs/badges/izzyondroid.png" alt="Obtainium" width="160"/>
-  </a>
-  <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
-    <img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
-  </a>
  <a href="https://codeberg.org/comaps/comaps/releases">
    <img src="docs/badges/codeberg.png" alt="Codeberg" width="160"/>
  </a>
@@ -78,10 +74,9 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 ## ⚡️ Highlights

 - **Offline-first**: Navigate without a connection
- **Privacy-respecting**: No tracking, ads or data collection
+- **Privacy-respecting**: No tracking, Ads or data collection
 - **Lightweight**: Battery- and space-efficient
 - **Simple**: Polished, user-focused interface
- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
 - **Community-built**: Free, open source, and collaborative
 - **Transparent**: Open finances and governance

@@ -127,8 +122,10 @@ You can help by donating, contributing code, translating, or by telling others a

 - Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
 - Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
+> [!NOTE]  
+> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!

-There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
+There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)

 ---

@@ -142,7 +139,7 @@ There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/m

 ## 💸 Funding

-CoMaps is free. To fund development, we rely on your voluntary support ♥️
+CoMaps is free. To stay that way, it relies on your support.  
 Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).  
 The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).

@@ -158,12 +155,6 @@ SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
 SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
 MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
 ```
-
-To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
-```
-app.comaps
-48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
-```
 ---

 ## ⚖️ License
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -18,4 +18,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  libxi-dev \
  optipng
 WORKDIR /root/comaps
+RUN ./configure.sh
 CMD ./gradlew -Parm64 assembleFdroidDebug
--- a/android/app/.gitignore
+++ b/android/app/.gitignore
@@ -24,6 +24,3 @@
 /src/main/res/drawable-mdpi/uk_northern_ireland.png
 /src/main/res/drawable-mdpi/uk_scotland.png
 /src/main/res/drawable-mdpi/uk_wales.png
-
-# Symlinked to F-Droid relnotes by tools/unix/link_gplay_relnotes.sh
-/src/google/play/release-notes
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -15,32 +15,55 @@ buildscript {
  }
 }

+repositories {
+  google()
+  mavenCentral()
+  maven { url 'https://www.jitpack.io' } // MPAndroidChart
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'

+def run(cmd) {
+  def stdout = new ByteArrayOutputStream()
+  exec {
+    commandLine = cmd
+    standardOutput = stdout
+  }
+  return stdout.toString()
+}
+

 import com.github.triplet.gradle.androidpublisher.ReleaseStatus
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
+def getVersion() {
+  def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows()
+  def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash'
+  def versionCode = Integer.parseInt(run([bash, '../../tools/unix/version.sh', 'android_code']).trim())
+  def versionName = run([bash, '../../tools/unix/version.sh', 'android_name']).trim()
+  return new Tuple2(versionCode, versionName)
+}

 def getCommitMessage() {
  return run(['git', '--no-pager', 'show', '-s', '--format=%s%n%n%b', 'HEAD']).trim()
 }

+def osName = System.properties['os.name'].toLowerCase()
+
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'

-
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(21))
-  }
-}
+// I have Java 21 installed, but this doesn't work on MacOS.
+//java {
+//  toolchain {
+//    languageVersion.set(JavaLanguageVersion.of(17))
+//  }
+//}

 android {
-  namespace = 'app.organicmaps'
-
-  // TODO: it should not be here, but in sdk/build.gradle. But for some reason it should be specified here as well.
-  ndkVersion = '28.2.13676358'
+  namespace 'app.organicmaps'

  dependenciesInfo {
    // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
@@ -62,23 +85,79 @@ android {
  }

  // All properties are read from gradle.properties file
-  compileSdk = propCompileSdkVersion.toInteger()
+  compileSdk propCompileSdkVersion.toInteger()
+
+  ndkVersion '28.2.13676358'

  defaultConfig {
-    versionCode = rootProject.ext.versionCode
-    versionName = rootProject.ext.versionName
+    // Default package name is taken from the manifest and should be app.comaps
+    def ver = getVersion()
+    versionCode = ver.V1
+    versionName = ver.V2
    println('Version: ' + versionName)
    println('VersionCode: ' + versionCode)
-    minSdk = propMinSdkVersion.toInteger()
-    targetSdk = propTargetSdkVersion.toInteger()
+    minSdk propMinSdkVersion.toInteger()
+    targetSdk propTargetSdkVersion.toInteger()
    applicationId project.ext.appId
    buildConfigField 'String', 'SUPPORT_MAIL', '"android@comaps.app"'
    // Should be customized in flavors.
    buildConfigField 'String', 'REVIEW_URL', '""'

-    base.archivesName = appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode
+    externalNativeBuild {
+      def pchFlag = 'OFF'
+      if (project.hasProperty('pch')) pchFlag = 'ON'

-    ndk.debugSymbolLevel = 'full'
+      def njobs = ''
+      if (project.hasProperty('njobs')) njobs = project.getProperty('njobs')
+
+      def enableVulkanDiagnostics = 'OFF'
+      if (project.hasProperty('enableVulkanDiagnostics')) {
+        enableVulkanDiagnostics = project.getProperty('enableVulkanDiagnostics')
+      }
+
+      def enableTrace = 'OFF'
+      if (project.hasProperty('enableTrace')) {
+        enableTrace = project.getProperty('enableTrace')
+      }
+
+      cmake {
+        cppFlags '-fexceptions', '-frtti'
+        // There is no sense to enable sections without gcc's --gc-sections flag.
+        cFlags '-fno-function-sections', '-fno-data-sections',
+               '-Wno-extern-c-compat'
+        arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static',
+                  "-DOS=$osName", '-DSKIP_TESTS=ON', '-DSKIP_TOOLS=ON', "-DUSE_PCH=$pchFlag",
+                  "-DNJOBS=$njobs", "-DENABLE_VULKAN_DIAGNOSTICS=$enableVulkanDiagnostics",
+                  "-DENABLE_TRACE=$enableTrace"
+        targets 'organicmaps'
+      }
+    }
+
+    // Use, for example, -Parm32 gradle parameter to build only for armeabi-v7a.
+    ndk {
+      abiFilters = new HashSet<>()
+      if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) {
+        abiFilters.add('armeabi-v7a')
+      }
+      if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) {
+        abiFilters.add('arm64-v8a')
+      }
+      if (project.hasProperty('x86')) {
+        abiFilters.add('x86')
+      }
+      if (project.hasProperty('x86_64') || project.hasProperty('x64')) {
+        abiFilters.add('x86_64')
+      }
+      if (abiFilters.isEmpty()) {
+        abiFilters.add('armeabi-v7a')
+        abiFilters.add('arm64-v8a')
+        // For the emulator, chromebooks and some Intel Atom devices.
+        abiFilters.add('x86_64')
+      }
+      println('Building for ' + abiFilters + ' archs.')
+    }
+
+    setProperty('archivesBaseName', appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode)
  }

  flavorDimensions += 'default'
@@ -128,21 +207,23 @@ android {
  splits.abi {
    boolean enabled = project.hasProperty('splitApk')
    println ('Create separate apks: ' + enabled)
-    enable = enabled
+    enable enabled
    reset()
    include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64'
-    universalApk = true
+    universalApk true
  }

  lint {
    disable 'MissingTranslation'
    // https://github.com/organicmaps/organicmaps/issues/3551
    disable 'MissingQuantity', 'UnusedQuantity'
+    // https://github.com/organicmaps/organicmaps/issues/3550
+    disable 'ByteOrderMark'
    // https://github.com/organicmaps/organicmaps/issues/1077
    disable 'CustomSplashScreen'
    // https://github.com/organicmaps/organicmaps/issues/3610
    disable 'InsecureBaseConfiguration'
-    abortOnError = true
+    abortOnError true
  }

  gradle.projectsEvaluated {
@@ -201,29 +282,33 @@ android {
    debug {
      applicationIdSuffix '.debug'   // Allows to install debug and release builds together
      versionNameSuffix '-debug'
+      jniDebuggable true           // Enable jni debug build
      zipAlignEnabled true
-      signingConfig = signingConfigs.debug
+      signingConfig signingConfigs.debug
      resValue 'string', 'app_name', 'CoMaps Debug'
+      // Do not generate separate debug symbols for debug apps, because we don't distribute them.
+      ndk.debugSymbolLevel = 'none'
    }

    release {
      if (taskName.contains('release')) {
        if (secureReleasePropertiesFileExists) {
          println('Using RELEASE signing keys from secure.properties.release')
-          signingConfig = signingConfigs.release
+          signingConfig signingConfigs.release
        } else {
          println('NO RELEASE signing keys found')
          println('Using DEBUG signing keys')
-          signingConfig = signingConfigs.debug
+          signingConfig signingConfigs.debug
        }
      }
-
      minifyEnabled true
-      shrinkResources = true
+      shrinkResources true
      // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
      // To learn more, go to the documentation section about R8 configuration files.
      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
      resValue 'string', 'app_name', project.ext.appName
+      // Full size symbols are too big for Google, 217mb aab vs 95mb.
+      ndk.debugSymbolLevel = 'symbol_table'
    }

    beta {
@@ -232,27 +317,37 @@ android {
      if (taskName.contains('beta')) {
        if (secureTestPropertiesFileExists) {
          println('Using TEST signing keys from secure.properties.test')
-          signingConfig = signingConfigs.test
+          signingConfig signingConfigs.test
        } else {
          println('NO TEST signing keys found')
          println('Using DEBUG signing keys')
-          signingConfig = signingConfigs.debug
+          signingConfig signingConfigs.debug
        }
      }
      minifyEnabled true
-      shrinkResources = true
+      shrinkResources true
      // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin.
      // To learn more, go to the documentation section about R8 configuration files.
      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
      matchingFallbacks = ['release'] // use dependencies of "release" build type
      resValue 'string', 'app_name', 'CoMaps Test'
+      // Full size symbols are too big for Google, 217mb aab vs 95mb.
+      ndk.debugSymbolLevel = 'symbol_table'
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      version '3.22.1+'
+      buildStagingDirectory './nativeOutputs'
+      path '../../CMakeLists.txt'
    }
  }

  // We don't compress these extensions in assets/ because our random FileReader can't read zip-compressed files from apk.
  // TODO: Load all minor files via separate call to ReadAsString which can correctly handle compressed files in zip containers.
  androidResources {
-    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
+    ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
    noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
    localeFilters += [
            "af",
@@ -309,16 +404,14 @@ android {
  }

  compileOptions {
-    coreLibraryDesugaringEnabled = true
+    coreLibraryDesugaringEnabled true

-    sourceCompatibility JavaVersion.VERSION_21
-    targetCompatibility JavaVersion.VERSION_21
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
  }
 }

 dependencies {
-  implementation project(':sdk')
-
  coreLibraryDesugaring libs.android.tools.desugar

  // Google Play Location Services
@@ -355,7 +448,8 @@ dependencies {
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
  implementation libs.google.guava
-  implementation libs.appdevnext.androidchart
+  implementation libs.devnullorthrow.mpandroidchart
+  implementation libs.jcip.annotations

  // Test Dependencies
  androidTestImplementation libs.androidx.test.junit
@@ -363,6 +457,10 @@ dependencies {
  testImplementation libs.mockito.core
 }

+tasks.withType(JavaCompile) {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}
+
 android.applicationVariants.all { variant ->
  def authorityValue = variant.applicationId + ".provider"
  def authority = "\"" + authorityValue + "\""
@@ -377,7 +475,6 @@ play {
  track.set('production')
  defaultToAppBundles.set(true)
  releaseStatus.set(ReleaseStatus.IN_PROGRESS)
-  userFraction.set(0.2d) // Rollout to 20% of users
  serviceAccountCredentials.set(file('google-play.json'))
 }

@@ -411,7 +508,3 @@ huaweiPublish {
    }
  }
 }
-
-tasks.withType(JavaCompile).configureEach {
-  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
-}
--- a/android/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/bg_app_icon_test"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground_test"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
-</adaptive-icon>
--- a/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/bg_app_icon_debug"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground_debug"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
-</adaptive-icon>
--- a/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/android/app/src/fdroid/java/app/organicmaps/location
+++ b/android/app/src/fdroid/java/app/organicmaps/location
@@ -1 +0,0 @@
-../../../../google/java/app/organicmaps/location
--- a/android/app/src/fdroid/java/app/organicmaps/sdk/location
+++ b/android/app/src/fdroid/java/app/organicmaps/sdk/location
@@ -0,0 +1 @@
+../../../../../google/java/app/organicmaps/sdk/location
--- a/android/app/src/fdroid/play/listings/ast/title.txt
+++ b/android/app/src/fdroid/play/listings/ast/title.txt
@@ -1 +0,0 @@
-CoMaps - Mapas ensin conexón con privacidá
--- a/android/app/src/fdroid/play/listings/bg/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bg/short-description.txt
@@ -1 +0,0 @@
-Лесна навигация - Открийте повече от вашето пътуване - Подкрепен от общността
--- a/android/app/src/fdroid/play/listings/bg/title.txt
+++ b/android/app/src/fdroid/play/listings/bg/title.txt
@@ -1 +0,0 @@
-CoMaps - Хайкинг, Велосипед, Пътуване без Интернет
--- a/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
@@ -1 +0,0 @@
-মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
--- a/android/app/src/fdroid/play/listings/bn-BD/title.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/title.txt
@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং
--- a/android/app/src/fdroid/play/listings/ca/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ca/full-description.txt
@@ -1,32 +0,0 @@
-Una aplicació de mapes gratuïta i de codi obert dirigida per la comunitat basada en dades d'OpenStreetMap i reforçada amb el compromís amb la transparència, la privadesa i la no ànim de lucre. CoMaps és una derivació/fork d'Organic Maps, que al seu torn és una derivació de Maps.ME.
-
-Llegiu sobre els motius del projecte i la seva direcció a <b><i>codeberg.org/comaps</i></b>.
-Uneix-te a la comunitat i ajuda a crear la millor aplicació de mapes
-• Utilitza l'aplicació i difon-la
-• Dona comentaris i informa de problemes
-• Actualitza les dades del mapa a l'aplicació o al lloc web d'OpenStreetMap
-
-‣ <b>Enfocat fora de línia</b>: Planifica i navega pel teu viatge a l'estranger sense necessitat de servei mòbil, cerca punts de referència mentre fas una excursió llunyana, etc. Totes les funcions de l'aplicació estan dissenyades per funcionar fora de línia.
-‣ <b>Respecte a la privadesa</b>: L'aplicació està dissenyada tenint en compte la privadesa: no identifica persones, no fa seguiment i no recopila informació personal. Sense anuncis.
-‣ <b>Senzill i polit</b>: funcions essencials fàcils d'utilitzar que simplement funcionen.
-‣ <b>Estalvia bateria i espai</b>: No consumeix bateria com altres aplicacions de navegació. Els mapes compactes estalvien espai preciós al telèfon.
-‣ <b>Gratuït i creat per la comunitat</b>: Gent com tu ha ajudat a crear l'aplicació afegint llocs a OpenStreetMap, provant i donant comentaris sobre les funcions i aportant les seves habilitats de desenvolupament i diners.
-‣ <b>Presa de decisions i finances obertes i transparents, sense ànim de lucre i de codi obert.</b>
-
-<b>Característiques principals</b>:
-• Mapes detallats descarregables amb llocs que no estan disponibles amb Google Maps
-• Mode exterior amb rutes de senderisme destacades, càmpings, fonts d'aigua, pics, corbes de nivell, etc.
-• Senders per caminar i carrils bici
-• Punts d'interès com restaurants, gasolineres, hotels, botigues, llocs d'interès i molts més
-• Cerca per nom, adreça o categoria de punt d'interès
-• Navegació amb anuncis de veu per caminar, anar amb bicicleta o conduir
-• Marca els teus llocs preferits amb un sol toc
-• Articles de la Viquipèdia fora de línia
-• Capa i indicacions de trànsit de metro
-• Enregistrament de rutes
-• Exporta i importa marcadors i rutes en formats KML, KMZ i GPX
-• Un mode fosc per utilitzar durant la nit
-• Millora les dades del mapa per a tothom mitjançant un editor bàsic integrat
-
-<b>La llibertat és aquí</b>
-Descobreix el teu viatge, navega pel món amb la privadesa i la comunitat al capdavant!
--- a/android/app/src/fdroid/play/listings/ca/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ca/short-description.txt
@@ -1 +0,0 @@
-Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat
--- a/android/app/src/fdroid/play/listings/ca/title.txt
+++ b/android/app/src/fdroid/play/listings/ca/title.txt
@@ -1 +0,0 @@
-CoMaps - Camina, pedala o condueix privadament
--- a/android/app/src/fdroid/play/listings/da-DK/full-description.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/full-description.txt
@@ -1,33 +0,0 @@
-En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
-
-Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
-Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
-• Brug appen og fortæl andre om den
-• Giv feedback anmeld fejl
-• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
-
-‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
-‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
-‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
-‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
-‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
-‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
-
-<b>Hovedfunktioner</b>
-• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
-• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
-• Gangstier og cykelstier
-• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
-• Søg efter stednavn, adresse, eller type af sted.
-• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
-• iCloud synkronisering af bogmærker og optagede spor.
-• Offline artikler fra Wikipedia.
-• Metro-lag med navigation.
-• Optagelse af spor.
-• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
-• Mørk tilstand til brug om natten.
-• Mulighed for at forbedre kortet vha. en indbygget editor.
-• CarPlay understøttes.
-
-<b>Friheden er ankommet</b>
-Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,10 +1,9 @@
-• OpenStreetMap-Daten vom 9. Dezember
-• Material 3 Design
-• Im OSM-Editor können nun Ladestationen hinzugefügt werden
-• Schuko und Typ E Ladestationen hinzugefügt
-• Verbesserte Suchvorschläge
-• Litauische und lettische Sprachankündigungen
-• Die Fahranweisungen wurden vergrößert
-• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
-• Neue Anordnung der Einstellungen
-Weitere Einzelheiten auf codeberg.org/comaps/comaps/releases
+Wir stellen vor: Das neue CoMaps-Logo!
+• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
+• Links zu Panoramax-Bildern für ausgewählte POIs
+• OpenStreetMap-Daten vom 13. Juli
+• Neue Farben für viele Objekte und Farben werden früher angezeigt
+• Öffnungszeiten werden beim Antippen eines POI angezeigt
+• Verschiedene Arten von Feuchtgebieten
+• Neue Farben für Vegetation und andere Features; einige neue Icons
+• Wandern: bessere Darstellung der Höhenlinien
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,10 +1,10 @@
-• OpenStreetMap data as of December 9
-• Use Material 3 themes
-• Support charging sockets in OSM Editor
-• Added schuko/type-E charge sockets
-• Improved search results ranking
-• Enabled Lithuanian and Latvian in voice announcements
-• Improved size of driving indications
-• Base zoom level on distance to next turn
-• Reordered settings
-More details on codeberg.org/comaps/comaps/releases
+Introducing CoMaps logo!
+
+• upgrade altitude contour lines for many regions to 20 or 50 meters step
+• add Panoramax Picture links to selected POIs
+• OpenStreetMap data as of July 13
+• add color fills to many features and display fills earlier for existing features
+• display opening hours state when selecting a POI
+• split all wetlands into several distinct types
+• update vegetation and other map colors, update some map icons
+• outdoors: bolder altitude contour lines
--- a/android/app/src/fdroid/play/listings/eo/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eo/full-description.txt
@@ -1,32 +0,0 @@
-Komunum-gvidata senpaga kaj malfermkoda mapapliko bazita sur OpenStreetMap-datumoj kaj fortigita per komitado al transparencio, privateco kaj ne-lucro. CoMaps estas forko/spin-off de Organic Maps, kiu turne estas forko de Maps.ME.
-
-Legu plu pri la kialoj por la projekto kaj ĝia direkto ĉe <b><i>codeberg.org/comaps</i></b>.
-Aliĝu al la komunumo tie kaj helpu fari la plej bonan mapaplikon
-• Uzu la aplikon kaj disvastigu la vorton pri ĝi
-• Donu rimarkojn kaj raportu problemojn
-• Ĝisdatigu mapajn datumojn en la apliko aŭ sur la OpenStreetMap-retejo
-
-‣ <b>Senkonekta-fokusa</b>: Planu kaj navigu vian vojaĝon eksterlande sen bezono de ĉelulara servico, serĉu vojpunktojn dum malproksima promenado, ktp. Ĉiuj funkcioj de la apliko estas dezajnitaj por funkcii senkonekte.
-‣ <b>Rispektante Privatecon</b>: La apliko estas dezajnita kun privateco en menso — ne identigas homojn, ne sekvas, kaj ne kolektas personajn informojn. Sen reklamoj.
-‣ <b>Simpla kaj Perfekta</b>: esencaj, facile uzeblaj funkcioj kiuj simple funkcias.
-‣ <b>Konservas Vian Baterion kaj Spacon</b>: Ne elĉerpas vian baterion kiel aliaj navigaj aplikaĵoj. Kompaktaj mapoj konservas precian spacon sur via telefono.
-‣ <b>Sena kaj Konstruita de la Komunumo</b>: Homoj kiel vi helpis konstrui la aplikon per aldonado de lokoj al OpenStreetMap, testado kaj donado de rimarkoj pri funkcioj kaj kontribuado de siaj programadaj kapabloj kaj mono.
-‣ <b>Malferma kaj Transparenta Decidado kaj Financoj, Ne-lucra kaj Tute Malfermkoda.</b>
-
-<b>Ĉefaj Funkcioj</b>:
-• Elŝuteblaj detalegaj mapoj kun lokoj kiuj ne estas disponeblaj per Google Maps
-• Eksteraj modo kun elstarigitaj promenaj vojoj, kampoj, akvofontoj, pintoj, konturlinioj, ktp
-• Promenaj vojoj kaj biciklaj vojoj
-• Interesaj punktoj kiel restoracioj, benzinstacioj, hoteloj, vendejoj, vidindaĵoj kaj multaj aliaj
-• Serĉo laŭ nomo aŭ adreso aŭ laŭ kategorio de interesaj punktoj
-• Navigado kun voĉaj anoncoj por promenado, biciklado aŭ veturado
-• Marku viajn favorajn lokojn per unu tuŝo
-• Senkonektaj Vikipedio-artikoloj
-• Metroa transporta tavolo kaj indikoj
-• Enregistraĵo de vojoj
-• Eksporto kaj importo de markiloj kaj vojoj en KML, KMZ, GPX formatoj
-• Malhela modo por uzi nokte
-• Plibonigu mapajn datumojn por ĉiuj uzante bazan enkonstruitan redaktilon
-
-<b>Libereco Estas Ĉi Tie</b>
-Malkovru vian vojaĝon, navigu la mondon kun privateco kaj komunumo en la antaŭa plano!
--- a/android/app/src/fdroid/play/listings/eo/short-description.txt
+++ b/android/app/src/fdroid/play/listings/eo/short-description.txt
@@ -1 +0,0 @@
-Facila mapnaviĝado - Malkovru pli de via vojaĝo - Subtenata de la komunumo
--- a/android/app/src/fdroid/play/listings/eo/title.txt
+++ b/android/app/src/fdroid/play/listings/eo/title.txt
@@ -1 +0,0 @@
-CoMaps - Migru, Biciklu, Veturigu Eksterrete
--- a/android/app/src/fdroid/play/listings/es-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/full-description.txt
@@ -1,65 +0,0 @@
-Una aplicación de mapas gratuita y de código abierto liderada por la comunidad, basada en los datos de OpenStreetMap y reforzada con un compromiso con la transparencia, la privacidad y la ausencia de fines de lucro. CoMaps es un fork o derivado de Organic Maps, que a su vez es un fork de Maps.ME.
-
-<br><br>
-
-Lee más sobre los motivos del proyecto y su dirección en <b><i>codeberg.org/comaps</i></b>.
-
-<br><br>
-
-Únete allí a la comunidad y ayuda a crear la mejor app de mapas
-
-• Usa la aplicación y corre la voz sobre ella
-
-• Envía comentarios y reporta problemas
-
-• Actualiza los datos del mapa en la app o en el sitio web de OpenStreetMap
-
-<br><br>
-
-‣ <b>Enfocada en el uso sin conexión</b>: Planifica y navega tus viajes sin necesidad de conexión móvil, busca puntos de paso en rutas remotas, etc. Todas las funciones están diseñadas para funcionar sin conexión.
-
-‣ <b>Respeta tu Privacidad</b>: La app está diseñada pensando en tu privacidad: no identifica personas, no rastrea y no recoge datos personales. Sin publicidad.
-
-‣ <b>Sencilla y Pulida</b>: funciones esenciales fáciles de usar que simplemente funcionan.
-
-‣ <b>Ahorra Batería y Espacio</b>: No consume la batería como otras apps de navegación. Los mapas compactos ahorran espacio valioso en tu teléfono.
-
-‣ <b>Gratuita y Creada por la Comunidad</b>: Personas como tú ayudaron a construir la app añadiendo lugares a OpenStreetMap, probando funciones, dando opiniones y contribuyendo con desarrollo o financiación.
-
-‣ <b>Toma de decisiones y finanzas abiertas y transparentes, sin ánimo de lucro y completamente de código abierto.</b>
-
-<br><br>
-
-<b>Funciones Principales</b>:
-
-• Mapas detallados descargables con lugares que no aparecen en Google Maps
-
-• Modo exterior con rutas de senderismo destacadas, campings, fuentes de agua, picos, curvas de nivel, etc.
-
-• Caminos peatonales y carriles bici
-
-• Puntos de interés como restaurantes, gasolineras, hoteles, tiendas, lugares turísticos y muchos más
-
-• Búsqueda por nombre, dirección o categoría de punto de interés
-
-• Navegación con indicaciones por voz para caminar, ir en bici o conducir
-
-• Guarda tus lugares favoritos con un solo toque
-
-• Artículos de Wikipedia sin conexión
-
-• Capa de transporte subterráneo y rutas
-
-• Grabación de rutas
-
-• Exporta e importa favoritos y rutas en formatos KML, KMZ y GPX
-
-• Modo oscuro para usar de noche
-
-• Mejora los datos del mapa para todos usando un editor básico integrado
-
-<br><br>
-
-<b>La Libertad Está Aquí</b>
-
-Descubre tu camino, navega el mundo con privacidad y con la comunidad como prioridad.
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,11 +1,9 @@
-• Datos de OpenStreetMap a fecha 9/12.
-• Uso de temas Material 3.
-• Compatibilidad con enchufes de recarga en Editor.
-• Se añaden enchufes de recarga schuko/tipo E.
-• Se mejora la búsqueda.
-• Se habilitan el lituano y el letón en las indicaciones de voz.
-• Se aumenta el tamaño de las indicaciones de conducción.
-• Nivel de zoom base según la distancia al siguiente giro.
-• Se han reordenado los ajustes.
-
-Más detalles en codeberg.org/comaps/comaps/releases
+¡Presentamos el logo de CoMaps!
+• mejora de isolíneas con más detalle para muchas regiones
+• añade enlaces de imágenes de Panoramax a POIs seleccionados
+• datos de OpenStreetMap a 13 de julio
+• añadidos rellenos de color a muchas características
+• se muestra el estado de horarios de apertura al seleccionar un POI
+• se dividen los humedales en tipos distintos
+• se actualiza la vegetación y otros colores del mapa, así como otros iconos
+• exteriores: líneas de contorno de altitud más gruesas
--- a/android/app/src/fdroid/play/listings/es-ES/short-description.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/short-description.txt
@@ -1 +0,0 @@
-Navegación sencilla - Descubre más en tu camino - Creado por la comunidad
--- a/android/app/src/fdroid/play/listings/es-ES/title.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/title.txt
@@ -1 +0,0 @@
-CoMaps - Senderismo, ciclismo y conducción offline
--- a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
 • Lineaz kanpoko Wikipedia artikuluak
 • Metroaren garraio geruza eta jarraibideak
 • Arrastoen grabazioa
-• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz

--- a/android/app/src/fdroid/play/listings/fa-IR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/short-description.txt
@@ -1 +0,0 @@
-ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه
--- a/android/app/src/fdroid/play/listings/fa-IR/title.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/title.txt
@@ -1 +0,0 @@
-CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین
--- a/android/app/src/fdroid/play/listings/fi-FI/full-description.txt
+++ b/android/app/src/fdroid/play/listings/fi-FI/full-description.txt
@@ -1,34 +1,32 @@
-Yhteisön johtama vapaa ja avoimeen lähdekoodiin perustuva karttasovellus, jonka karttadata perustuu OpenStreetMap:n avoimeen dataan. Sovelluksessa painottuu vahva sitoutuminen läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomaan toimintaan. CoMaps on haarautunut Organic Maps:sta, joka taas omalta osaltaan on haarautunut Maps.ME:stä.
+Yhteisövetoinen, ilmainen ja avoimeen lähdekoodiin perustuva karttasovellus, jonka pohjalla käytetään OpenStreetMapin avointa karttadataa. Sovelluksen kehityksessä on sitouduttu läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomuuteen. CoMapsin projekti on haarautunut Organic Mapsista, joka taas on haarautunut aiemmin Maps.ME:stä

-Lue tarkemmin projektin syistä ja sen suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
-Liity yhteisöön ja auta kehittämään parasta karttasovellusta
-• Käytä sovellusta ja levitä siitä sanaa
-• Anna palautetta ja raportoi ongelmista
-• Päivitä karttadataa sovelluksessa tai OpenStreetMap:n verkkosivuilla
+Lue lisää projektin tavotteista ja suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
+Liity yhteisöön ja auta kehittämään paras saatavilla oleva karttasovellus
+• Käytä sovellusta ja kerro siitä myös muille
+• Anna palautetta ja raportoi ongelmia
+• Päivitä karttoja, joko sovelluksessa tai OpenStreetMapin verkkosivuilla

-‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi matkasi ilman verkkoyhteyttä. Etsi reittipisteitä retkilläsi. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
-‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksityisyyttä silmälläpitäen. Sovellu ei tunnista ihmisä, seuraa toimintaasi, eikä kerää henkilökohtaisia tietojasi. Mainosvapaa.
+‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi ulkomailla ilman mobiiliverkkoja. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
+‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksilön yksityisyys silmälläpitäen. Sovellus ei tunnista tai kerää tietoja sinusta. Mainosvapaa.
 ‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää. 
-‣ <b>Säästää akkua ja tilaa</b>: Ei kuluta akkua, kuten toiset karttasovellukset. Kompaktit kartat säästävät tilaa puhelimessasi.
-‣ <b>Ilmainen ja yhteisön rakentama</b>: Ihmiset, kuten sinä ovat auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit auttaa myös kehittämällä sovellusta ja lahjoittamalla sovelluskehitykseen.
-‣ <b>Avoin ja läpinäkyvä päätöksenteko ja rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
+‣ <b>Säästä akkua ja tallennustilaa</b>: Ei kuluta akkua, kuten muut navigointisovellukset. Kompaktit kartat säästävät arvokasta tallennustilaa puhelimessasi. 
+‣ <b>Ilmainen ja yhteisön luoma</b>: Vapaaehtoiset, kuten sinä olette auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit myös auttaa kehittämällä ominaisuuksia ja lahjoittamalla sovelluskehitykseen
+‣ <b>Avoin ja läpinäkyvä päätöksenteko sekä rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>

 <b>Tärkeimmät ominaisuudet</b>:
-<ul>
-<li>Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta</li>
-<li>Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.</li>
-<li>Kävely- ja pyörätiet</li>
-<li>Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta</li>
-<li>Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla</li>
-<li>Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa</li>
-<li>Tallenna suosikkipaikkasi yhdellä napautuksella</li>
-<li>Offline Wikipedia-artikkelit</li>
-<li>Maanalaisen liikenteen tasot ja ohjeet</li>
-<li>Reittien tallennus</li>
-<li>Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa</li>
-<li>Tumma tila iltaa ja yötä varten</li>
-<li>Paranna karttadataa kaikille sisäänrakennetulla editorilla</li>
-</ul>
+• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
+• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
+• Kävely- ja pyörätiet
+• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
+• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
+• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
+• Tallenna suosikkipaikkasi yhdellä napautuksella
+• Offline Wikipedia-artikkelit
+• Maanalaisen liikenteen tasot ja ohjeet
+• Reittien tallennus
+• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
+• Tumma tila iltaa ja yötä varten
+• Paranna karttadataa kaikille sisäänrakennetulla editorilla

 <b>Vapaus on täällä</b>
-Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!
+Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!
--- a/android/app/src/fdroid/play/listings/fi-FI/title.txt
+++ b/android/app/src/fdroid/play/listings/fi-FI/title.txt
@@ -1 +1 @@
-CoMaps - Navigoi yksityisesti ilman verkkoyhteyttä
+CoMaps - Navigoi ilman verkkoyhteyttä yksityisesti
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../../../../google/java/app/organicmaps/location`
				`@@ -0,0 +1 @@`
				`../../../../../google/java/app/organicmaps/sdk/location`
				`@@ -1 +0,0 @@`
				`CoMaps - Mapas ensin conexón con privacidá`
				`@@ -1 +0,0 @@`
				`Лесна навигация - Открийте повече от вашето пътуване - Подкрепен от общността`
				`@@ -1 +0,0 @@`
				`CoMaps - Хайкинг, Велосипед, Пътуване без Интернет`
				`@@ -1 +0,0 @@`
				`মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত`
				`@@ -1 +0,0 @@`
				`কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং`
				`@@ -1 +0,0 @@`
				`Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat`
				`@@ -1 +0,0 @@`
				`CoMaps - Camina, pedala o condueix privadament`
				`@@ -1 +0,0 @@`
				`Facila mapnaviĝado - Malkovru pli de via vojaĝo - Subtenata de la komunumo`