[fdroid] Release version 2025.10.09-3

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>

.clang-format

@@ -1,48 +1,61 @@
 # 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
-  SplitEmptyRecord: false
   SplitEmptyNamespace: false
+  SplitEmptyRecord: false
+BinPackArguments: true
+BinPackParameters: true
+BreakAfterJavaFieldAnnotations: true
 BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
-ContinuationIndentWidth: 2
+ContinuationIndentWidth: 4
 DerivePointerAlignment: false
+EmptyLineBeforeAccessModifier: Always
 IncludeBlocks: Preserve
+IndentAccessModifiers: false
 IndentCaseLabels: false
 IndentExternBlock: NoIndent
+InsertBraces: false
 InsertNewlineAtEOF: true
-PackConstructorInitializers: Never
+LambdaBodyIndentation: OuterScope
+PackConstructorInitializers: CurrentLine
 PointerAlignment: Middle
+RemoveBracesLLVM: true
+RemoveSemicolon: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest
 TabWidth: 2
-UseTab: Never
+
+---
+Language: Java
+AllowShortFunctionsOnASingleLine: Empty

.clang-format-ignore

@@ -0,0 +1,8 @@
+# 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

.forgejo/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,6 +1,5 @@
 name: 🐞 Bug Report
 description: Report a problem you've encountered
-title: "bug: "
 labels:
   - bug
 body:
@@ -67,4 +66,4 @@ body:
       label: Additional context
       description: Add any other context or comments that may be useful.
     validations:
-      required: false
+      required: false

.forgejo/ISSUE_TEMPLATE/feature-request.yaml

@@ -1,6 +1,5 @@
 name: "💡 Feature Request"
 description: "Suggest an idea or improvement for CoMaps"
-title: "feat: "
 labels:
   - "enhancement"
 body:
@@ -44,4 +43,4 @@ body:
       label: "Additional context"
       description: "Any other context, comments, or screenshots to support your request."
     validations:
-      required: false
+      required: false

.forgejo/workflows/android-beta.yaml

@@ -32,9 +32,6 @@ 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
@@ -71,10 +68,6 @@ 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

.forgejo/workflows/android-check-metadata.yaml

@@ -1,4 +1,4 @@
-name: Android Check Metadata
+name: Android Check Store Metadata
 on:
   workflow_dispatch: # Manual trigger
   pull_request:
@@ -21,5 +21,8 @@ jobs:
             android
             tools/python/check_store_metadata.py
 
-      - name: Check metadata
-        run: ./tools/python/check_store_metadata.py android
+      - 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

.forgejo/workflows/android-check.yaml

@@ -34,9 +34,6 @@ 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
@@ -51,10 +48,6 @@ 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
@@ -93,10 +86,6 @@ 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:

.forgejo/workflows/android-monkey.yaml

@@ -4,9 +4,6 @@ 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
@@ -73,10 +70,6 @@ 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

.forgejo/workflows/android-release-metadata.yaml

@@ -2,30 +2,25 @@ 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 sources
-        # TODO: use shallow (and sparse?) checkout
+      - name: Checkout
         uses: actions/checkout@v4
-
-#      - name: Parallel submodules checkout
-#        shell: bash
-#        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            android
+            tools/python/check_store_metadata.py
 
       - 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

.forgejo/workflows/android-release.yaml

@@ -5,7 +5,6 @@ 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:
@@ -117,10 +116,6 @@ 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

.forgejo/workflows/appstream-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.organicmaps.desktop.metainfo.xml
-      - .forgejo/workflows/appstream-check.yaml  # Run check on self change
+      - packaging/app.comaps.comaps.metainfo.xml
+      - .forgejo/workflows/appstream-check.yaml # Run check on self change
 
 jobs:
   validate-appstream:
     name: Validate appstream metadata xml
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.organicmaps.desktop.metainfo.xml
+            packaging/app.comaps.comaps.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.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml

.forgejo/workflows/coverage-check.yaml

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   should-run-check:
     name: Should run coverage
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     outputs:
       run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
       manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
@@ -59,14 +59,9 @@ jobs:
   coverage:
     needs: should-run-check
     name: Generate coverage report
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     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:
@@ -94,10 +89,6 @@ jobs:
               llvm \
               gcovr
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/dco.yml

@@ -1,8 +1,9 @@
-name: dco
+name: DCO
 on: [pull_request]
 
 jobs:
   check:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - name: Check for Developer Certificate of Origin (DCO) compliance
+        uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6

.forgejo/workflows/desktop-file-check.yaml

@@ -3,20 +3,20 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.organicmaps.desktop.desktop
-      - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change
+      - qt/res/linux/app.comaps.comaps.desktop
+      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
   validate-desktop-file:
     name: Validate .desktop file
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.organicmaps.desktop.desktop
+            qt/res/linux/app.comaps.comaps.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/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"

.forgejo/workflows/ios-beta.yaml

@@ -35,7 +35,7 @@ jobs:
     name: Apple TestFlight
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.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

.forgejo/workflows/ios-check.yaml

@@ -37,7 +37,7 @@ jobs:
     name: Build iOS
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.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
@@ -103,4 +103,4 @@ jobs:
             -destination 'generic/platform=iOS' \
             -quiet \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO
+            CODE_SIGNING_ALLOWED=NO

.forgejo/workflows/ios-release.yaml

@@ -7,7 +7,7 @@ jobs:
     name: iOS Release
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.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

.forgejo/workflows/linux-check.yaml

@@ -31,18 +31,13 @@ on:
 jobs:
   linux-no-unity:
     name: Linux no unity build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     # 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:
@@ -71,10 +66,6 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
-
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
@@ -99,7 +90,7 @@ jobs:
 
   linux-matrix:
     name: Linux builds and tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -111,11 +102,6 @@ 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
 
@@ -142,15 +128,19 @@ 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:

.forgejo/workflows/macos-check.yaml

@@ -32,7 +32,7 @@ jobs:
     name: macOS builds and tests
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.app/Contents/Developer
       HOMEBREW_NO_ANALYTICS: 1
       HOMEBREW_NO_INSTALL_CLEANUP: 1
     strategy:
@@ -57,10 +57,6 @@ 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:

.forgejo/workflows/stale.yml

@@ -1,22 +0,0 @@
-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

.github/workflows/android-check.yaml

@@ -6,7 +6,8 @@ on:
       - main
 
 env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
+  SKIP_MAP_DOWNLOAD: true
 
 jobs:
   lint:
@@ -22,9 +23,16 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name:  Init boost, generate textures
+      - name: Install protobuf
         shell: bash
-        run: ./configure.sh --skip-map-download
+        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
 
       - name: Lint
         shell: bash
@@ -65,7 +73,9 @@ 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
@@ -76,10 +86,6 @@ 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:

.github/workflows/code-style-check.yaml

@@ -0,0 +1,51 @@
+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

.github/workflows/ios-check.yaml

@@ -10,7 +10,7 @@ jobs:
     name: Build iOS
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.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
@@ -30,6 +30,7 @@ jobs:
         run: |
           brew install qt \
           optipng
+          pip3 install "protobuf<3.21" --break-system-packages
       - name: Checkout sources
         uses: actions/checkout@v4
 
@@ -37,7 +38,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
-      - name:  Init boost, download World map, generate textures
+      - name:  Configure repository
         shell: bash
         run: ./configure.sh
 

.gitignore

@@ -14,18 +14,29 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/styles/*/*/out/*
-data/resources-*_design/*
 # symbols png/sdf are now generated at build
-data/resources-*_*/symbols.png
-data/resources-*_*/symbols.sdf
-data/drules_proto_default_design.bin
-data/colors_design.txt
-data/patterns_design.txt
+data/symbols/**/symbols.png
+data/symbols/**/symbols.sdf
+
 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
 
 # Compiled Python
 *.pyc
@@ -44,10 +55,9 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows.rc
+!qt/res/windows/windows.rc
 *.pdb
-out/*
-qt/mapswithme.log
+out/
 
 # XCode
 xcode/keys/*

.gitmodules

@@ -65,3 +65,7 @@
 [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

3party/CMakeLists.txt

@@ -57,6 +57,7 @@ endif()
 
 add_subdirectory(agg)
 add_subdirectory(bsdiff-courgette)
+add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)

3party/freetype/CMakeLists.txt

@@ -4,7 +4,9 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)
 
 # Fix warning with ONE_PIXEL macro clash.
-target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+if(NOT MSVC)
+ target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+endif()
 
 # Use ft2build.h from the current directory instead of the default.
 target_include_directories(freetype

3party/harfbuzz/CMakeLists.txt

@@ -11,14 +11,23 @@ target_include_directories(${PROJECT_NAME}
     harfbuzz/src
 )
 
-# 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>
-)
+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}
+    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
@@ -28,14 +37,20 @@ target_compile_definitions(${PROJECT_NAME}
     #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
     HAVE_ATEXIT
     HAVE_GETPAGESIZE
-    HAVE_MMAP
     HAVE_MPROTECT
-    HAVE_PTHREAD
     HAVE_SYSCONF
-    HAVE_SYS_MMAN_H
-    HAVE_UNISTD_H
 )
 
+if (NOT MSVC)
+  target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+      HAVE_MMAP
+      HAVE_PTHREAD
+      HAVE_SYS_MMAN_H
+      HAVE_UNISTD_H
+  )
+endif()
+
 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
 
 add_library(harfbuzz::harfbuzz ALIAS harfbuzz)

3party/icu/CMakeLists.txt

@@ -172,6 +172,7 @@ 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
 )
 

3party/protobuf/CMakeLists.txt

@@ -11,6 +11,7 @@ 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

3party/succinct/mapper.hpp

@@ -7,7 +7,6 @@
 #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"
 
@@ -283,12 +282,6 @@ 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)
     {

3party/succinct/util.hpp

@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>
 
 namespace succinct { namespace util {
 
@@ -205,29 +204,6 @@ 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)

3party/vulkan_wrapper/vulkan_wrapper.cpp

@@ -19,7 +19,18 @@ 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__)
@@ -30,6 +41,9 @@ 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) {

CMakeLists.txt

@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.22.1)
+
 project(omim C CXX)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_C_STANDARD 23)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -38,12 +39,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 11)
+  set(CMAKE_OBJC_STANDARD 23)
   set(CMAKE_OBJC_FLAGS -fobjc-arc)
   set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
   enable_language(OBJCXX)
   set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 20)
+  set(CMAKE_OBJCXX_STANDARD 23)
   set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
@@ -84,7 +85,7 @@ if (MSVC)
   add_compile_options(/utf-8)
   add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math)
+  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()
 
 if (PLATFORM_WIN)
@@ -103,12 +104,29 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
   add_definitions(-DRELEASE)
   if (NOT MSVC)
-    add_compile_options(-Ofast)  # Also enables -ffast-math
+    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
   endif()
 else()
   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
 endif()
 
+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)
@@ -165,7 +183,7 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
 endif()
 
 # To allow #include "base/file_name.hpp" in all sources.
-include_directories(${CMAKE_HOME_DIRECTORY})
+include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
 
 if (USE_PCH)
   message(STATUS "Precompiled headers are ON")
@@ -177,7 +195,7 @@ if (USE_PCH)
 endif()
 
 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX OR PLATFORM_WIN)
+if (PLATFORM_LINUX)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
   find_package(harfbuzz REQUIRED)
@@ -207,46 +225,43 @@ endif()
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
-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)
+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)
 
 if (PLATFORM_DESKTOP)
-  omim_add_tool_subdirectory(feature_list)
+  add_subdirectory(dev_sandbox)
   add_subdirectory(generator)
-  add_subdirectory(openlr)
-  add_subdirectory(poly_borders)
-  omim_add_tool_subdirectory(topography_generator)
-  add_subdirectory(track_analyzing)
-  omim_add_tool_subdirectory(track_generator)
+  add_subdirectory(tools)
   if (NOT SKIP_QT_GUI)
     add_subdirectory(qt)
-    omim_add_tool_subdirectory(skin_generator)
   endif()
-  add_subdirectory(dev_sandbox)
+  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()
 endif()
 
-omim_add_test_subdirectory(qt_tstfrm)
+omim_add_test_subdirectory(libs/qt_tstfrm)
 
 if (PLATFORM_ANDROID)
-  add_subdirectory(android/app/src/main/cpp)
+  add_subdirectory(android/sdk/src/main/cpp)
 endif()

INSTALL.md

@@ -1 +1 @@
-See [docs/INSTALL.md](docs/INSTALL.md)
+See [docs/INSTALL.md](docs/INSTALL.md) 

README.md

@@ -19,20 +19,20 @@
 </div>
 <div align="center">
   <p align="center">
-    <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 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>
     <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&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
+      <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"/>
     </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&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
+      <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"/>
     </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" style="width: 90%; max-width: 191px;"/>
+      <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"/>
     </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" style="width: 90%; max-width: 160px;"/>
+      <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"/>
     </a>
   </p>
 </div>
@@ -41,8 +41,6 @@
 
 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"/>
@@ -53,6 +51,12 @@ 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>
@@ -74,9 +78,10 @@ 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
 
@@ -122,10 +127,8 @@ 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 chat for active contributors: [Zulip](https://comaps.zulipchat.com)
+There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
 
 ---
 
@@ -139,7 +142,7 @@ There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.
 
 ## 💸 Funding
 
-CoMaps is free. To stay that way, it relies on your support.  
+CoMaps is free. To fund development, we rely on your voluntary 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).
 
@@ -155,9 +158,15 @@ 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
 
 Licensed under the Apache License 2.0.  
-See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 
+See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 

android/Dockerfile

@@ -18,5 +18,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libxi-dev \
   optipng
 WORKDIR /root/comaps
-RUN ./configure.sh
 CMD ./gradlew -Parm64 assembleFdroidDebug

android/app/.gitignore

@@ -24,3 +24,6 @@
 /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

android/app/build.gradle

@@ -15,55 +15,32 @@ 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'
 
-// I have Java 21 installed, but this doesn't work on MacOS.
-//java {
-//  toolchain {
-//    languageVersion.set(JavaLanguageVersion.of(17))
-//  }
-//}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
 
 android {
-  namespace 'app.organicmaps'
+  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'
 
   dependenciesInfo {
     // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
@@ -76,80 +53,32 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  // All properties are read from gradle.properties file
-  compileSdk propCompileSdkVersion.toInteger()
 
-  ndkVersion '27.2.12479018'
+  // Users are complaining that the app should be re-downloaded from the Play Store after changing the language.
+  bundle {
+    language {
+      enableSplit = false
+    }
+  }
+
+  // All properties are read from gradle.properties file
+  compileSdk = propCompileSdkVersion.toInteger()
 
   defaultConfig {
-    // Default package name is taken from the manifest and should be app.comaps
-    def ver = getVersion()
-    versionCode = ver.V1
-    versionName = ver.V2
+    versionCode = rootProject.ext.versionCode
+    versionName = rootProject.ext.versionName
     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', '""'
 
-    externalNativeBuild {
-      def pchFlag = 'OFF'
-      if (project.hasProperty('pch')) pchFlag = 'ON'
+    base.archivesName = appName.replaceAll('\\s','') + '-' + defaultConfig.versionCode
 
-      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)
+    ndk.debugSymbolLevel = 'full'
   }
 
   flavorDimensions += 'default'
@@ -199,23 +128,21 @@ 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 {
@@ -274,33 +201,29 @@ 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 {
@@ -309,37 +232,27 @@ 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",
@@ -396,14 +309,16 @@ android {
   }
 
   compileOptions {
-    coreLibraryDesugaringEnabled true
+    coreLibraryDesugaringEnabled = true
 
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_21
+    targetCompatibility JavaVersion.VERSION_21
   }
 }
 
 dependencies {
+  implementation project(':sdk')
+
   coreLibraryDesugaring libs.android.tools.desugar
 
   // Google Play Location Services
@@ -440,8 +355,7 @@ 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.devnullorthrow.mpandroidchart
-  implementation libs.jcip.annotations
+  implementation libs.appdevnext.androidchart
 
   // Test Dependencies
   androidTestImplementation libs.androidx.test.junit
@@ -449,10 +363,6 @@ 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 + "\""
@@ -500,3 +410,7 @@ huaweiPublish {
     }
   }
 }
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}

android/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?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>

android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?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>

android/app/src/fdroid/play/listings/bn-BD/short-description.txt

@@ -0,0 +1 @@
+মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত

android/app/src/fdroid/play/listings/bn-BD/title.txt

@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং

android/app/src/fdroid/play/listings/ca/short-description.txt

@@ -0,0 +1 @@
+Navegació intuïtiva - Descobreix el teu camí - El poder de la comunitat

android/app/src/fdroid/play/listings/ca/title.txt

@@ -0,0 +1 @@
+CoMaps - Camina, pedala o condueix privadament

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,9 +1,10 @@
-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
+• Karten-Daten vom 6. September
+• Zeitstrafen für Radrouting
+• Farbige POI-Beschriftungen in Autonavigation
+• POI-Suche nach Filialnamen
+• Abspannportale, Sicherheitskabinen & Büros hinzugefügt
+• Aktualisierte Symbole für Türme, Nachtclubs, Apotheken und Fahnenmasten
+• Lesezeichen-Farbe in GPX-Exporten
+• Farbfüllung von Fußgängerbereiche auf Plätzen
+• Android Auto: Anzeige Ausfahrtsnummern in Kreisverkehren
+Weitere Änderungen in Codeberg-Versionshinweisen!

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,10 +1,10 @@
-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
+• OpenStreetMap data as of September 6
+• Turn penalties for bicycle routing
+• Colored POI labels for car navigation map style
+• Search POIs by branch name
+• Added power portals, security booths and offices
+• Update icons for towers, nightclubs, chemists, flagpoles
+• Save bookmark color to GPX exports
+• Color fill pedestrian parts of squares
+• Android Auto: display roundabout exit numbers
+Check our Codeberg release notes for more changes!

android/app/src/fdroid/play/listings/es-ES/full-description.txt

@@ -0,0 +1,65 @@
+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.

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,9 +1,10 @@
-¡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
+• Datos a 6 de septiembre
+• Penalizaciones de giros en rutas de bici
+• Etiquetas de puntos de interés en color en navegación
+• Buscar por nombre de sucursal
+• Añadir portales de energía, cabinas de seguridad y oficinas
+• Nuevos iconos: torres, discotecas, parafarmacias y mástiles
+• Guardar color en exportaciones GPX
+• Colorear áreas peatonales de plazas
+• Android Auto: mostrar números de salida de rotondas
+Más detalles en Codeberg

android/app/src/fdroid/play/listings/es-ES/short-description.txt

@@ -0,0 +1 @@
+Navegación sencilla - Descubre más en tu camino - Creado por la comunidad

android/app/src/fdroid/play/listings/es-ES/title.txt

@@ -0,0 +1 @@
+CoMaps - Senderismo, ciclismo y conducción offline

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
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
 

android/app/src/fdroid/play/listings/fa-IR/short-description.txt

@@ -0,0 +1 @@
+ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه

android/app/src/fdroid/play/listings/fa-IR/title.txt

@@ -0,0 +1 @@
+CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین

android/app/src/fdroid/play/listings/fi-FI/full-description.txt

@@ -1,32 +1,34 @@
-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ä
+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ä.
 
-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
+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
 
-‣ <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 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>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>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>Tärkeimmät ominaisuudet</b>:
-• 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
+<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>
 
 <b>Vapaus on täällä</b>
-Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!
+Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!

android/app/src/fdroid/play/listings/fi-FI/title.txt

@@ -1 +1 @@
-CoMaps - Navigoi ilman verkkoyhteyttä yksityisesti
+CoMaps - Navigoi yksityisesti ilman verkkoyhteyttä

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,7 +1,9 @@
-Présentation du logo CoMaps !
-• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
-• Ajout d'un lien vers les images Panoramax des POI
-• Données OpenStreetMap du 13 juillet
-• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
-• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
-• Outdoors: Améliorations de la visibilité des courbes d'altitude
+• Données OSM du 06 septembre
+• Pénalités dans les calculs d'itinéraires vélos
+• Ajout de labels colorés en mode navigation
+• Support du tag branch dans la recherche
+• Ajout des portiques électriques, postes de sécurité
+• Mise à jour des icônes de tours, boîtes de nuits, chimiste et mat
+• Enregistrement de la couleur des signets dans les exports GPX
+• Android Auto: Affichage du numéro de sortie des ronds-points
+Plus d'informations sur notre Codeberg

android/app/src/fdroid/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
+Navigation facile - Vivez de grands voyages - Propulsé par la communauté

android/app/src/fdroid/play/listings/hr/title.txt

@@ -1 +1 @@
-CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
+CoMaps - Pješačite, biciklirajte, vozite Offline

android/app/src/fdroid/play/listings/hu-HU/full-description.txt

@@ -0,0 +1,32 @@
+Egy közösség által vezetett, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap adatain alapul, és amelynek alapelvei a átláthatóság, az adatvédelem és a nonprofit működés. A CoMaps az Organic Maps alkalmazás egyik változata, amely viszont a Maps.ME alkalmazás egyik változata.
+
+A projekt előzményeiről és fejlesztési irányáról bővebben a <b><i>codeberg.org/comaps</i></b> oldalon olvashat.
+Csatlakozzon a közösséghez, és segítsen a legjobb térképalkalmazás létrehozásában
+• Használja az alkalmazást, és terjessze a hírt róla
+• Adjon visszajelzést, és jelentsen problémákat
+• Frissítse a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalon
+
+‣ <b>Offline</b>: Tervezze meg és navigálja külföldi utazását mobilszolgáltatás nélkül, keressen útpontokat távoli túrákon stb. Az alkalmazás összes funkciója úgy van kialakítva, hogy offline is működjön.
+‣ <b>A magánélet tiszteletben tartása</b>: Az alkalmazás a magánélet tiszteletben tartásával lett kialakítva – nem azonosítja az embereket, nem követi nyomon őket és nem gyűjt személyes adatokat. Reklámmentes.
+‣ <b>Egyszerű és kifinomult</b>: alapvető, könnyen használható funkciók, amelyek egyszerűen működnek.
+‣ <b>Takarékos az akkumulátorral és a tárhellyel</b>: Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A kompakt térképek értékes helyet takarítanak meg a telefonon.
+‣ <b>Ingyenes és a közösség által fejlesztett</b>: Az Önhöz hasonló emberek segítettek az alkalmazás fejlesztésében azzal, hogy helyeket adtak hozzá az OpenStreetMaphez, tesztelték és visszajelzéseket adtak a funkciókról, valamint fejlesztői ismereteikkel és pénzzel is hozzájárultak a fejlesztéshez.
+‣ <b>Nyílt, átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.
+
+<b>Főbb jellemzők</b>:
+• Letölthető részletes térképek olyan helyekkel, amelyek nem érhetők el a Google Maps-en
+• Kültéri mód kiemelt túraútvonalakkal, kempingekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
+• Gyalogos és kerékpáros útvonalak
+• Érdekes helyek, például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok más
+• Keresés név, cím vagy érdekes hely kategória alapján
+• Hangos navigáció gyalogos, kerékpáros vagy autós utazáshoz
+• Kedvenc helyek könyvjelzővel egyetlen érintéssel
+• Offline Wikipedia cikkek
+• Metróhálózat és útvonaltervezés
+• Útvonalrögzítés
+• Könyvjelzők, útvonalak exportálása és importálása KML, KMZ, GPX formátumokban
+• Sötét mód az éjszakai használathoz
+• A beépített alapszerkesztővel mindenki javíthatja a térképadatokat
+
+<b>A szabadság itt van</b>
+Fedezze fel utazását, navigáljon a világban, ahol az adatvédelem és a közösség az első!

android/app/src/fdroid/play/listings/hu-HU/short-description.txt

@@ -0,0 +1 @@
+Egyszerű térképnavigáció – Fedezze fel utazását – A közösség támogatásával

android/app/src/fdroid/play/listings/hu-HU/title.txt

@@ -1 +1 @@
-CoMaps - Túra, Bicikli, Vezetés offline diszkréten
+CoMaps – túrázás, kerékpározás, autózás offline

android/app/src/fdroid/play/listings/it-IT/full-description.txt

@@ -1,4 +1,4 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
+Una app realizzata dalla community gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy e senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
 
 Leggi delle ragioni del progetto e della sua direzione futura su <b><i>codeberg.org/comaps</i></b>.
 Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
@@ -15,7 +15,7 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 
 <b>Funzionalità principali</b>:
 • Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
-• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altri punti d'interesse evidenziati
 • Strade pedonali e piste ciclabili
 • Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
 • Cerca per nome, indirizzo o categoria

android/app/src/fdroid/play/listings/it-IT/release-notes.txt

@@ -0,0 +1,10 @@
+• OpenStreetMap aggiornato al 6 Settembre
+• Bici: miglior stima del tempo di percorrenza
+• Auto: punti d'interesse colorati
+• Cerca i punti d'interesse tramite filiale
+• Aggiunte strutture alta tensione, cabine di sicurezza e uffici
+• Aggiornate le icone per torri, discoteche, farmacie e aste per bandiere
+• Salva il colore dei Preferiti nel GPX
+• Evidenziate le aree pedonali nelle piazze
+• AndroidAuto: aggiunto il numero dell'uscita nelle rotonde
+Visita Codeberg per ulteriori dettagli

android/app/src/fdroid/play/listings/it-IT/short-description.txt

@@ -1 +1 @@
-Navigazione semplice - Immergiti nella tua avventura - Sviluppato dalla comunità
+Navigazione semplice - Immergiti nella tua avventura - Realizzato dalla comunità

android/app/src/fdroid/play/listings/lv/short-description.txt

@@ -0,0 +1 @@
+Vienkārša kartes navigācija - Atklāj vairāk par savu ceļojumu - Darbina kopiena

android/app/src/fdroid/play/listings/lv/title.txt

@@ -0,0 +1 @@
+CoMaps - dodies ceļā bezsaistē ar privātumu

android/app/src/fdroid/play/listings/mt/full-description.txt

@@ -0,0 +1,32 @@
+App għall-mapep b'xejn u b'sors miftuħ (open source) immexxi mill-komunità bbażata fuq dejta minn OpenStreetMap, b'impenn għal trasparenza, privatezza u mhux għal-profitt. CoMaps hija fork ta' Organic Maps, li min-naħa tagħha hija fork ta' Maps.ME.
+
+Kompli aqra dwar ir-raġunijiet għall-proġett u d-direzzjoni tiegħu hawn <b><i>codeberg.org/comaps</i></b>.
+Ingħaqad mal-komunità u għin biex toħloq l-aqwa app tal-mapep
+• Uża l-app u semmiha ma' min taf
+• Agħti feedback u rrapporta problemi
+• Aġġorna d-dejta tal-mapep fl-app jew fuq il-websajt OpenStreetMap
+
+‣ <b>Iffokata fuq offlajn</b>: Ippjana u innaviga l-vjaġġ tiegħek barra minn pajjiżek mingħajr ħtieġa ta' servizz ċellulari, fittex waypoints waqt ħajk, eċċ. Il-funzjonijiet kollha tal-app huma ddisinjati biex jaħdmu offlajn.
+‣ <b>Tirrispetta l-Privatezza</b>: L-app hija ddisinjata bil-privatezza f'moħħha - ma tidentifikax nies, ma ssegwikx, u ma tiġborx informazzjoni personali. Bla reklami.
+‣ <b>Sempliċi u Rfinuta</b>: karatteristiċi essenzjali, faċli biex jintużaw u li sempliċement jaħdmu.
+‣ <b>Tiffrankalek Batterija u Spazju</b>: Ma taħlix il-batterija bħal apps oħra tal-mapep. Mapep kompatti li jiffrankawlek spazju prezzjuż fuq il-mowbajl.
+‣ <b>B'xejn u Mibnija mill-Komunità</b>: Nies bħalek għenu fl-iżvilupp tal-app billi żiedu postijiet f'OpenStreetMap, ittestjaw u taw feedback dwar il-karatteristiċi u kkontribwew il-ħiliet u l-flus tagħhom.
+‣ <b>Trasparenza fil-finanzi u fit-teħid ta' deċiżjonijiet, Mhux għall-profitt u sors kompletament miftuħ.</b>
+
+<b>Karatteristiċi Prinċipali</b>:
+• Mapep dettaljati li jistgħu jitniżżlu b'postijiet li mhumiex disponibbli fuq Google Maps
+• Modalità ta' barra b'mogħdijiet tal-mixi, postijiet għal-ikkampjar, sorsi tal-ilma, quċċati, linji tal-kontorn, eċċ.
+• Mogħdijiet għall-mixi u rotti għar-roti
+• Postijiet ta' interess bħal ristoranti, stazzjonijiet tal-petrol, lukandi, ħwienet, postijiet turistiċi u ħafna aktar
+• Fittex bl-isem jew bl-indirizz jew bil-kategorija interess
+• Navigazzjoni b'avviżi bil-vuċi għall-mixi, ċikliżmu, u sewqan
+• Immarka l-postijiet favoriti tiegħek b'tapp waħda
+• Artikli offlajn ta' Wikipedia
+• Direzzjonijiet tas-subways
+• Reġistrazzjoni ta' trekks
+• Esportazzjoni u importazzjoni ta' bookmarks u trekks f'formati KML, KMZ, GPX
+• Modalità mudlama biex tintuża bil-lejl
+• Ittejjeb id-dejta tal-mapep għal kulħadd b'użu ta' editur bażiku u integrat
+
+<b>Il-Libertà Waslet</b>
+Skopri l-vjaġġ tiegħek, innaviga d-dinja bil-privatezza u bil-komunità fuq quddiem nett!

android/app/src/fdroid/play/listings/mt/short-description.txt

@@ -0,0 +1 @@
+Navigazzjoni ta' mapep faċli - Skopri iktar mill-vjaġġ - Imsaħħaħ mill-komunita`

android/app/src/fdroid/play/listings/mt/title.txt

@@ -0,0 +1 @@
+CoMaps - Imxi, Suq Rota u Karozza bil-Privatezza

android/app/src/fdroid/play/listings/nl-NL/title.txt

@@ -1 +1 @@
-CoMaps - Wandel, fiets, rijdt offline met privacy
+CoMaps - Wandel, fiets, rijd offline met privacy

android/app/src/fdroid/play/listings/no-NO/short-description.txt

@@ -0,0 +1 @@
+Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet

android/app/src/fdroid/play/listings/no-NO/title.txt

@@ -0,0 +1 @@
+CoMaps - Gå tur, sykkel, kjør - med personvern

android/app/src/fdroid/play/listings/pl-PL/full-description.txt

@@ -0,0 +1,32 @@
+Prowadzona przez społeczność, darmowa i otwartoźródłowa aplikacja mapowa oparta na danych OpenStreetMap, wzmacniana zobowiązaniem do transparentności, prywatności i działalnością non-profit. CoMaps jest forkiem/spin-off'em Organic Maps, który z kolei jest forkiem Maps.ME.
+
+Przeczytaj o powodach powstania projektu i jego kierunku na stronie <b><i>codeberg.org/comaps</i></b>.
+Dołącz do społeczności i pomóż stworzyć najlepszą aplikację mapową
+• Używaj aplikacji i rozpowszechnia o niej informacje,
+• Przekazuj opinie i zgłaszaj problemy,
+• Aktualizuj dane w aplikacji lub na stronie OpenStreetMap.
+
+‣ <b>Skoncentrowana na pracy w trybie offline</b>: Zaplanuj trasę i nawiguj podczas swojej podróży za granicą bez potrzeby korzystania z sieci komórkowej, wyszukuj punkty nawigacyjne podczas dalekich wędrówek itp. Wszystkie funkcje aplikacji zostały zaprojektowane do pracy w trybie offline.
+‣ <b>Poszanowanie prywatności</b>: Aplikacja została zaprojektowana z myślą o prywatności – nie identyfikuje osób, nie śledzi ich i nie gromadzi danych osobowych. Bez reklam.
+‣ <b>Prosta i dopracowana</b>: niezbędne, łatwe w użyciu funkcje, które po prostu działają.
+‣ <b>Oszczędza baterię i miejsce</b>: Nie wyczerpuje baterii jak inne aplikacje nawigacyjne. Kompaktowe mapy oszczędzają cenne miejsce w telefonie.
+‣ <b>Darmowa i stworzona przez społeczność</b>: Osoby takie jak Ty pomogły w tworzeniu aplikacji, dodając miejsca do OpenStreetMap, testując i przekazując opinie na temat funkcji oraz wnosząc swoje umiejętności programistyczne i pieniądze.
+‣ <b>Otwarte i transparentne podejmowanie decyzji i zarządzanie finansami, nie dla zysku i w pełni otwartoźródłowe.</b>
+
+<b>Główne funkcje</b>:
+• Szczegółowe mapy do pobrania z miejscami niedostępnymi na wielu mapach komercyjnych,
+• Tryb outdoorowy z wyróżnionymi szlakami turystycznymi, kempingami, źródłami wody, szczytami, poziomicami itp.,
+• Ścieżki spacerowe i rowerowe,
+• Punkty zainteresowania, takie jak restauracje, stacje benzynowe, hotele, sklepy, atrakcje turystyczne i wiele innych,
+• Wyszukiwanie według nazwy, adresu lub kategorii punktu zainteresowania,
+• Nawigacja z komunikatami głosowymi dla pieszych, rowerzystów i kierowców,
+• Dodawanie zakładek do ulubionych miejsc jednym dotknięciem,
+• Artykuły z Wikipedii offline,
+• Warstwa z liniami metra oraz nawigacja z użyciem metra,
+• Nagrywanie tras,
+• Eksport i import zakładek i tras w formatach KML, KMZ i GPX,
+• Ciemny tryb do użytku w nocy,
+• Ulepszanie danych mapowych dzięki wbudowanemu edytorowi.
+
+<b>Wolność jest tutaj</b>
+Odkrywaj swoją podróż, nawiguj po świecie z prywatnością i społecznością na pierwszym planie!

android/app/src/fdroid/play/listings/pl-PL/release-notes.txt

@@ -1,9 +0,0 @@
-Wprowadzamy logo CoMaps!
-• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
-• dodanie linków do zdjęć z Panoramax do wybranych POI
-• aktualizacja danych OpenStreetMap z 13 lipca
-• dodanie wypełnienia kolorem dla wielu typów obiektów
-• wyświetlanie stanu godzin otwarcia przy wyborze POI
-• podział mokradeł na kilka typów
-• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
-• tryb outdoorowy: pogrubione warstwice wysokości

android/app/src/fdroid/play/listings/pl-PL/short-description.txt

@@ -0,0 +1 @@
+Łatwa nawigacja – Odkryj więcej ze swojej podróży – Wspierane przez społeczność

android/app/src/fdroid/play/listings/pl-PL/title.txt

@@ -0,0 +1 @@
+CoMaps - Nawiguj offline z zachowaniem prywatności