[fdroid] Release version 2025.06.30-22

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

.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

.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

.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:
@@ -66,4 +67,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,5 +1,6 @@
 name: "💡 Feature Request"
 description: "Suggest an idea or improvement for CoMaps"
+title: "feat: "
 labels:
   - "enhancement"
 body:
@@ -43,4 +44,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,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

.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:

.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

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

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

.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

.forgejo/workflows/appstream-check.yaml

@@ -3,35 +3,34 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.comaps.comaps.metainfo.xml
-      - .forgejo/workflows/appstream-check.yaml # Run check on self change
+      - 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
         run: |
-          apt-get update
-          apt-get install -y flatpak dbus --no-install-recommends
-          mkdir /run/dbus
-          dbus-daemon --system
-          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install -y org.flatpak.Builder
+          sudo apt update -y
+          sudo apt install -y \
+              flatpak
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.flatpak.Builder
 
       - 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

.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:

.forgejo/workflows/dco.yml

@@ -5,4 +5,4 @@ jobs:
   check:
     runs-on: codeberg-tiny
     steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - uses: https://github.com/KineticCafe/actions-dco@v1

.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
-      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
+      - 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"

.forgejo/workflows/ios-check.yaml

@@ -103,4 +103,4 @@ jobs:
             -destination 'generic/platform=iOS' \
             -quiet \
             CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO
+            CODE_SIGNING_ALLOWED=NO

.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,6 +142,10 @@ jobs:
               libqt6positioning6-plugins \
               libqt6positioning6
 
+      - name: Configure repository
+        shell: bash
+        run: ./configure.sh
+
       - name: Configure ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

.forgejo/workflows/macos-check.yaml

@@ -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:

.github/workflows/android-check.yaml

@@ -7,7 +7,6 @@ on:
 
 env:
   JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-  SKIP_MAP_DOWNLOAD: true
 
 jobs:
   lint:
@@ -23,9 +22,9 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Configure repository
+      - name:  Init boost, generate textures
         shell: bash
-        run: SKIP_GENERATE_SYMBOLS=1 ./configure.sh
+        run: ./configure.sh --skip-map-download
 
       - name: Lint
         shell: bash
@@ -66,7 +65,6 @@ jobs:
           libxinerama-dev \
           libxcursor-dev \
           libxi-dev \
-          python3-protobuf \
           zlib1g-dev
 
       - name: Checkout sources
@@ -78,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:

.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

.github/workflows/ios-check.yaml

@@ -30,7 +30,6 @@ jobs:
         run: |
           brew install qt \
           optipng
-          pip3 install "protobuf<3.21" --break-system-packages
       - name: Checkout sources
         uses: actions/checkout@v4
 
@@ -38,7 +37,7 @@ 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
 

.gitignore

@@ -14,24 +14,18 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/symbols/*/design/
+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
 
 # Compiled Python
 *.pyc
@@ -50,9 +44,10 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows/windows.rc
+!qt/res/windows.rc
 *.pdb
-out/
+out/*
+qt/mapswithme.log
 
 # XCode
 xcode/keys/*

.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

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)

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

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}
-    PRIVATE
-      -fno-rtti
-      -fno-exceptions
-      -fno-threadsafe-statics
-      $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
-  )
-endif()
+# 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>
+)
 
 target_compile_definitions(${PROJECT_NAME}
   PRIVATE
@@ -37,20 +28,14 @@ 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,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
 )
 

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

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)
     {

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)

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) {

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,18 +38,16 @@ 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()
 
-execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
-
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_UNITY_BUILD)
@@ -87,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)
@@ -106,29 +103,12 @@ 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)  # Also enables -ffast-math
   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)
@@ -185,7 +165,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}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
+include_directories(${CMAKE_HOME_DIRECTORY})
 
 if (USE_PCH)
   message(STATUS "Precompiled headers are ON")
@@ -197,7 +177,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)
@@ -227,23 +207,46 @@ endif()
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
-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()

CONTRIBUTORS

@@ -7,11 +7,9 @@ CoMaps contributors:
 (in alphabetic order)
 --------------------------------------------------------------------------------
 
-Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
 vikiawv
-Yannik Bloscheck
 
 --------------------------------------------------------------------------------
 Organic Maps (formerly OMaps) contributors:

INSTALL.md

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

README.md

@@ -1,91 +1,62 @@
-<!-- Navigation Bar -->
-<p align="center">
-  <a href="https://codeberg.org/comaps#comaps">Project Intro</a> |
-  <a href="https://codeberg.org/comaps/Governance#comaps-project-governance-docs">Governance</a> |
-  <a href="https://codeberg.org/comaps/Governance/src/branch/main/FAQ.md">FAQ</a> |
-  <a href="#contributing">Contribute</a> |
-  <a href="https://www.comaps.app/donate">Donate</a> |
-  <a href="https://codeberg.org/comaps#keep-connected">Keep Connected</a>
-</p>
+<!--<div align="center">
+  <img src="qt/res/logo.png" height="100"/>
+</div>-->
 
-<div align="center" >
-<img src="docs/badges/logo.svg" width="150">
-</div>
+<!-- a nav bar -->
+[Project Intro](https://codeberg.org/comaps#comaps)
+ | [Governance](https://codeberg.org/comaps/Governance#comaps-project-governance-docs)
+ | [FAQ](https://codeberg.org/comaps/Governance/src/branch/main/FAQ.md)
+ | [Contribute](#contributing)
+ | [Donate](https://www.comaps.app/donate)
+ | [Keep Connected](https://codeberg.org/comaps#keep-connected)
+
+# [CoMaps](https://comaps.app) – Hike, Bike, Drive Offline – Easy Map Navigation with Privacy
+
+[
+  ![GitHub Actions Workflow Android Status](https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github%2Fworkflows%2Fandroid-check.yaml?style=flat&label=Android%20Build&logo=android&logoColor=white)
+](https://github.com/comaps/comaps/actions/workflows/android-check.yaml)
+[
+  ![GitHub Actions Workflow iOS Status](https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github%2Fworkflows%2Fios-check.yaml?style=flat&label=iOS%20Build&logo=apple&logoColor=white)
+](https://github.com/comaps/comaps/actions/workflows/ios-check.yaml)
+[
+  ![Donate via OpenCollective](https://img.shields.io/opencollective/all/comaps?logo=opencollective&color=blue&label=Open%20Collective%20Donors)
+](https://opencollective.com/comaps)
+[
+  ![Donate via Liberapay](https://img.shields.io/liberapay/patrons/CoMaps.svg?logo=liberapay&label=Liberapay%20Patrons&color=efcc00&)
+](https://liberapay.com/CoMaps)
 
 
-<div align="center">
-<h1><a href="https://comaps.app/">CoMaps</a></h1>
-<h2>Hike, Bike, Drive Offline - Easy Map Navigation with Privacy</h2>
-</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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </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"/>
-    </a>
-  </p>
-</div>
 
----
+A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org) data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
 
-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.
+There are apps for Android and iOS (and ARM MacOS).
+An alpha Linux / MacOS Qt desktop version, which is also suitable for Linux phones.
 
-**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
+[<img src="docs/badges/apple-appstore.png" alt="App Store" width="160">](https://apps.apple.com/app/comaps/id6747180809)
+[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps.google)
+[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps.fdroid/)
+[<img src="docs/badges/codeberg.png" alt="Codeberg" width="160">](https://codeberg.org/comaps/comaps/releases)
 
-<p align="center">
-  <a href="https://apps.apple.com/app/comaps/id6747180809">
-    <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
-  </a>
-  <a href="https://play.google.com/store/apps/details?id=app.comaps.google">
-    <img src="docs/badges/google-play.png" alt="Google Play" width="160"/>
-  </a>
-  <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://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>
-</p>
-
-
-<!-- Screenshots -->
-<p align="center">
+<p float="left">
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png" width="180" />
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png" width="180" />
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png" width="180" />
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png" width="180" />
 </p>
 
----
+**Offline-focused**: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
 
-## ⚡️ Highlights
+**Respecting Privacy**: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
 
-- **Offline-first**: Navigate without a connection
-- **Privacy-respecting**: No tracking, Ads or data collection
-- **Lightweight**: Battery- and space-efficient
-- **Simple**: Polished, user-focused interface
-- **Community-built**: Free, open source, and collaborative
-- **Transparent**: Open finances and governance
+**Simple and Polished**: Essential, easy to use features that just work.
 
----
+**Saves Your Battery and Space**: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
 
-## 🚀 Main Features
+**Free and Built by the Community**: People like you helped build the app by adding places to [OpenStreetMap](https://www.openstreetmap.org), testing and giving feedback on features and contributing their development skills and money.
+
+**Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.**
+
+### Main Features
 
 - Downloadable detailed maps with places which are not available with Google Maps
 
@@ -115,50 +86,41 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 
 - Android Auto and CarPlay support
 
- ***Freedom Is Here – Navigate the world with privacy and community at the forefront.***
+*Freedom Is Here - Discover your journey, navigate the world with privacy and community at the forefront!*
 
----
-
-## 🤝 Contributing
+## Contributing
 
 You can help by donating, contributing code, translating, or by telling others about it. To build the best maps app there is a need for software development, design, product, community development, and other areas. Reach out to us and let us know how you want to help.
 
-- Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
-- Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
+If you want to build the project, check [docs/INSTALL.md](docs/INSTALL.md). If you want to help the project,
+see [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md). You can help in many ways, the ability to code is not necessary.
 
-There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
+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: [comaps.zulipchat.com](https://comaps.zulipchat.com)
 
-## 💬 Feedback
+### Feedback
 
-- Rate us on [App Store](https://apps.apple.com/app/comaps/id6747180809) and [Google Play](https://play.google.com/store/apps/details?id=app.comaps.google)
-- Star our repos on Codeberg 
-- Report bugs or request features on the [issue tracker](https://codeberg.org/comaps/comaps/issues)
 
----
+- **Rate us on the [App Store](https://apps.apple.com/app/comaps/id6747180809)
+and [Google Play](https://play.google.com/store/apps/details?id=app.comaps.google)**.
+- Star our repos on Codeberg
+- Report bugs and discuss features at [the issue tracker](https://codeberg.org/comaps/comaps/issues)
 
-## 💸 Funding
+## How is development funded?
+
+The app is free for everyone, so we rely on donations. Please [donate](https://opencollective.com/comaps/donate) to support the CoMaps community and see this open project thrive!
 
-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).
 
----
+## Privacy
 
-## 🔒 Privacy
+The Android application was analysed by the [Exodus platform](https://reports.exodus-privacy.eu.org/fr/reports/app.comaps.google/latest/)
 
-The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/en/reports/app.comaps.google/latest/).
+## License and Copyright
 
-To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
-```
-SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
-SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
-MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
-```
----
-
-## ⚖️ License
-
-Licensed under the Apache License 2.0.  
-See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 
+Licensed under the Apache License, Version 2.0. See
+[LICENSE](LICENSE),
+[NOTICE](NOTICE)
+and [data/copyright.html](data/copyright.html)
+for more information.

android/.idea/icon.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64pt" height="64pt" viewBox="0 0 835 835">
-<path d="M698.5 141.1a20 20 0 0 1 30.8-1.3A416 416 0 0 1 835 417.4a416 416 0 0 1-93.3 263 20 20 0 0 1-31.3-.6l-43-56.6a20 20 0 0 1-.2-24 307 307 0 0 0 59.3-181.8c0-74.2-26.2-142.3-69.9-195.6a20 20 0 0 1-.5-24.8zM260.7 456.4a20 20 0 0 1-7.7-36.7l282-177.4a20 20 0 0 1 29.9 22.7l-97 318.9a20 20 0 0 1-37.5 2.2l-49.2-111.5z" style="fill:#ccdfca"/>
-<path d="M626.3 753a20 20 0 0 1-6.2 29.6A416 416 0 0 1 417.5 835 417.7 417.7 0 0 1 0 417.4 417.7 417.7 0 0 1 603.3 43.5a20 20 0 0 1 7 30l-42.4 55.8a20 20 0 0 1-24.2 6.1 307 307 0 0 0-126.2-27 309 309 0 0 0-309 309c0 170.6 138.5 309 309 309a307 307 0 0 0 141.6-34.3 20 20 0 0 1 25.1 5.6z" style="fill:#fefdf6"/>
-</svg>

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

android/app/build.gradle

@@ -15,17 +15,43 @@ 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'
 
@@ -37,48 +63,86 @@ project.ext.appName = 'CoMaps'
 //}
 
 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'
-
-  dependenciesInfo {
-    // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
-    includeInApk = false
-    // Disables dependency metadata when building Android App Bundles (for Google Play)
-    includeInBundle = false
-  }
+  namespace 'app.organicmaps'
 
   buildFeatures {
     dataBinding = true
     buildConfig = true
   }
-
-  // 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()
+  compileSdk propCompileSdkVersion.toInteger()
+
+  ndkVersion '27.2.12479018'
 
   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 +192,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 +267,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 +302,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,7 +389,7 @@ android {
   }
 
   compileOptions {
-    coreLibraryDesugaringEnabled = true
+    coreLibraryDesugaringEnabled true
 
     sourceCompatibility JavaVersion.VERSION_17
     targetCompatibility JavaVersion.VERSION_17
@@ -317,8 +397,6 @@ android {
 }
 
 dependencies {
-  implementation project(':sdk')
-
   coreLibraryDesugaring libs.android.tools.desugar
 
   // Google Play Location Services
@@ -364,6 +442,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 + "\""
@@ -411,7 +493,3 @@ huaweiPublish {
     }
   }
 }
-
-tasks.withType(JavaCompile).configureEach {
-  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
-}

android/app/src/fdroid/java/app/organicmaps/location

@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location

android/app/src/fdroid/java/app/organicmaps/sdk/location

@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location

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

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

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

@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ

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

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

@@ -6,12 +6,12 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • Poskytujte zpětnou vazbu a nahlašujte problémy
 • Aktualizujte mapová data v aplikaci nebo na webu OpenStreetMap
 
-‣ <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
-‣ <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
-‣ <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
-‣ <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
-‣ <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
-‣ <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
+• <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
+• <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
+• <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
+• <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
+• <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
+• <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
 
 <b>Hlavní funkce</b>:
 • Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google

android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt

@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy

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

@@ -1 +1 @@
-Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
+Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou

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

@@ -1 +0,0 @@
-Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet

android/app/src/fdroid/play/listings/da-DK/title.txt

@@ -1 +0,0 @@
-CoMaps - vandr, cykl og kør offline med privatliv

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

@@ -1,4 +1,4 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
+Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent, datensparsam und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
 
 Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 
-<b>Entdecke die Unabhängigkeit</b>
+<b>Freiheit beginnt hier</b>
 Entdecke deine Reise – navigiere in der Welt mit Datenschutz!

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

@@ -1,7 +1,6 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+• OpenStreetMap-Daten vom 22. Juni
+• Optionale automatische Backups von Lesezeichen & Tracks
+• Neue 100m-Höhenlinien für Regionen die vorher gröbere/keine Isolinien hatten
+• Vegetation & Spielplätze werden früher angezeigt, neue Farben für Campingplätze & andere Einrichtungen
+• Pfade & Tracks werden standardmäßig bei höherem Zoom angezeigt, Outdoor-Stil für Detailübersicht
+• Aktion des linken Button nichtm mehr im Hamburger-Menü, stattdessen werden "Über & Hilfe" dort angezeigt

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

@@ -1,7 +1,7 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+• OpenStreetMap data as of June 22
+• a setting for automatic bookmarks and tracks backup
+• added 100m-step altitude isolines to all regions that had worse or no isolines
+• display vegetation and playground color fills earlier, add fills to camp sites and some amenities
+• paths & tracks appear on the map later by default - still appear earlier in the outdoor style
+• hide active custom button action from the hamburger menu, move there About & Help from the settings
+• update map transport icons

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.

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

@@ -1,7 +1,6 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+• datos de OpenStreetMap a 22 de junio
+• añadido ajuste para la copia de seguridad automática de marcadores y trazas
+• añadidas isolíneas de 100 m a las regiones que tenían isolíneas peores o no tenían isolíneas
+• se muestra antes la vegetación y zonas de juego, añadidas áreas a campings y otros servicios
+• los senderos y pistas aparecen más tarde - siguen igual en estilo de outdoors
+• se oculta botón personalizado del menú y se mueve allí Acerca de y Ayuda desde los ajustes

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+• Données OpenStreetMap du 22 juin
+• Sauvegarde automatique des signets et traces GPS en local
+• Ajout des courbes d'altitude avec un précision de 100 mètres dans toutes les régions qui avaient peu de courbes ou aucune
+• Ajustements des styles notamment sur la végétation, les aires de jeu et les chemins
+• Masque l’action active du bouton personnalisé dans le menu hamburger
+• Correction de certains plantages et bugs

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

@@ -1 +1 @@
-Navigation de cartes facile - Découvrez le monde - Propulsé par la communauté
+Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté

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

@@ -1,32 +0,0 @@
-Aplicación de mapas gratuíta, de código aberto e xestionada pola comunidade, obtén os datos desde OpenStreetMap e co compromiso reforzado coa transparencia, privacidade e non ter o beneficio económico como obxectivo. CoMaps é unha bifurcación ou derivada de Organic Maps, que pola súa parte ven sendo unha bifurcación de Maps.ME.
-
-Vai a <b><i>codeberg.org/comaps</i></b> e coñece as razóns da necesidade deste proxecto e as decisións tomadas.
-Únete alí á comunidade e axuda a que teñamos a mellor aplicación de mapas
-• Usa a aplicación e dille a outras persoas que o fas
-• Informa de fallos e publica túa experiencia
-• Actualiza os datos do mapa na aplicación ou no sitio web OpenStreetMap
-
-‣ <b>Sen conexión de datos</b>: planea a viaxe e sigue a ruta sen precisar unha conexión á rede móbil, busca lugares relevantes nas andainas máis longas, etc. Todas as características da aplicación están deseñadas para funcionar sen precisar conexión de datos.
-‣ <b>Respecto pola privacidade</b>: a aplicación está deseñada coa privacidade en primeiro plano - non identifica ás persoas, non te segue, non recolle información sobre ti. Non ten publicidade.
-‣ <b>Simple e organizada</b>: características esenciais, fáciles de usar e que funcionan.
-‣ <b>Aforra batería e espazo</b>: non esgota a batería como outras aplicacións de navegación. Os mapas compactos aforran espazo na memoria do dispositivo.
-‣ <b>Gratuíta e feita pola comunidade</b>: persoas coma ti que axudan a crear a aplicación engadindo lugares en OpenStreetMap, probando novas características e dando a súa opinión, colaborando ao seu desenvolvemento con código ou financiamento.
-‣ <b>Proceso de toma de decisións Aberto e Transparente para os temas económicos, Sen ánimo de lucro e totalmente de Código Aberto</b>
-
-<b>Características principais</b>:
-• Mapas detallados descargables con lugares que non están dispoñibles en Google Maps
-• Modo para actividades en exterior con camiños para andainas, lugares para acampar, fontes de auga, picos dos montes, curvas de nivel, etc
-• Rutas a pé e en bicicleta
-• Puntos de interese como restaurantes, gasoliñeiras, hoteis, tendas, miradores e moitos máis
-• Busca polo nome ou polo enderezo ou por categoría do punto de interese
-• Navegación con anuncios por voz para camiñar, ir en bicicleta ou conducir
-• Marca os lugares favoritos cun só toque
-• Artigos da Wikipedia sen conexión
-• Mapas do transporte por Metro
-• Gravación das rutas
-• Exportación e Importación de marcadores e rutas nos formatos KML, KMZ e GPX
-• Modo escuro para a noite
-• Contribúe a mellorar o mapa para todas as persoas usando o editor básico incluído
-
-<b>Aquí es Libre</b>
-Atopa o teu camiño, navega polo mundo con privacidade e coa comunidade como prioridade!

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

@@ -1 +0,0 @@
-Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével

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

@@ -1 +0,0 @@
-CoMaps - Túra, Bicikli, Vezetés offline diszkréten

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

@@ -1 +0,0 @@
-Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate

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

@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione

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

@@ -1,32 +0,0 @@
-Een door de community ontwikkelde, gratis en open source kaartenapp, gebaseerd op OpenStreetMap-gegevens, met een sterke focus op transparantie en privacy, en zonder winstoogmerk. CoMaps is een fork/spin-off van Organic Maps, welke is afgeleid van Maps.ME.
-
-Meer informatie over de redenen voor het project en de richting ervan vindt u op <b><i>codeberg.org/comaps</i></b>.
-Sluit je aan bij de community en help mee aan de ontwikkeling van de beste kaartenapp:
-• Gebruik de app en deel je ervaringen met anderen
-• Geef feedback en meld eventuele problemen
-• Houd de kaarten up-to-date, zowel in de app als op de OpenStreetMap-website
-
-‣ <b>Offline-georiënteerd</b>: Plan en navigeer je reis in het buitenland zonder internet, zoek waypoints tijdens een lange wandeling, enzovoort. Alle functies zijn ontworpen om offline te functioneren.
-‣ <b>Respect voor privacy</b>: De app is ontworpen met privacy in gedachten - geen gegevensverzameling en advertentievrij.
-‣ <b>Eenvoudig en verfijnd</b>: essentiële, gebruiksvriendelijke functies die gewoon werken.
-‣ <b>Bespaar je batterij en opslag</b>: De app verbruikt minder batterij dan andere navigatie-apps. Compacte kaarten besparen ruimte op je telefoon.
-‣ <b>Gratis en gebouwd door de community</b>: Mensen zoals jij helpen de app door plaatsen toe te voegen aan OpenStreetMap, functies te testen en feedback te geven, en hun programmervaardigheden bij te dragen of te doneren.
-‣ <b>Open en transparant besluitvormings- en financieel beleid, geen winstoogmerk en volledig open source.</b>
-
-<b>Hoofdfuncties</b>:
-• Downloadbare gedetailleerde kaarten met plaatsen die niet beschikbaar zijn bij Google Maps
-• Buitenmodus met gemarkeerde wandelpaden, campings, waterbronnen, toppen, hoogtelijnen, enz.
-• Wandelpaden en fietspaden
-• Bezienswaardigheden zoals restaurants, tankstations, hotels, winkels en nog veel meer
-• Zoeken op naam of adres of op categorie
-• Navigatie met spraakmeldingen voor wandelen, fietsen of autorijden
-• Sla je favoriete plaatsen op met een enkele klik
-• Offline Wikipedia-artikelen
-• Metro laag en routebeschrijvingen
-• Trackregistratie
-• Exporteer en importeer bladwijzers en tracks in KML, KMZ, GPX-formaten
-• Een donkere modus voor gebruik 's nachts
-• Verbeter kaartgegevens voor iedereen met een eenvoudige ingebouwde editor
-
-<b>Vrijheid is hier/b>
-Ontdek je reis, navigeer over de wereld met privacy en community voorop!

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

@@ -1 +0,0 @@
-Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community

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

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

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

@@ -8,6 +8,7 @@ Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
 
 ‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
 ‣ <b>Respeito à privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Livre de anúncios.
+
 ‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
 ‣ <b>Economiza bateria e espaço</b>: Não esgota a bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
 ‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,7 +0,0 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição

android/app/src/fdroid/play/listings/pt-BR/title.txt

@@ -1 +1 @@
-CoMaps - Mapas e Navegação Offline com Privacidade
+CoMaps - Mapas com Privacidade

android/app/src/fdroid/play/listings/pt-PT/title.txt

@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada

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

@@ -1,32 +1,55 @@
 Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
 
 Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
+
 Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
+
 • Use o aplicativo e divulgue-o.
+
 • Envie feedback e relate problemas.
+
 • Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
 
 ‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
+
 ‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
+
 ‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
+
 ‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
+
 ‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
+
 ‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
 
 <b>Principais recursos</b>:
+
 • Mapas detalhados para download com locais não disponíveis no Google Maps
+
 • Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
+
 • Trilhas para caminhada e ciclovias
+
 • Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
+
 • Pesquise por nome, endereço ou por categoria de ponto de interesse
+
 • Navegação com anúncios de voz para caminhadas, ciclismo ou direção
+
 • Marque seus lugares favoritos com um único toque
+
 • Artigos offline da Wikipédia
+
 • Camada e direções de transporte público do metrô
+
 • Gravação de trilhas
+
 • Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
+
 • Um modo escuro para usar à noite
+
 • Aprimore os dados do mapa para todos usando um editor básico integrado
 
 <b>A Liberdade Chegou</b>
+
 Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!

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

@@ -1 +0,0 @@
-CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate