[fdroid] Release version 2025.06.01-6

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

.forgejo/workflows/appstream-check.yaml

@@ -25,7 +25,11 @@ jobs:
           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
+          sudo flatpak install -y org.freedesktop.appstream-glib org.flatpak.Builder
+
+      - name: Validate appstream data
+        shell: bash
+        run: flatpak run org.freedesktop.appstream-glib validate --nonet packaging/app.organicmaps.desktop.metainfo.xml
 
       - name: Lint appstream data with flatpak Builder
         shell: bash

.forgejo/workflows/dco.yml

@@ -1,8 +0,0 @@
-name: dco
-on: [pull_request]
-
-jobs:
-  check:
-    runs-on: codeberg-tiny
-    steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1

.forgejo/workflows/ios-check.yaml

@@ -41,7 +41,7 @@ jobs:
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
-      TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
+      TEST_RESULTS_BUNDLE_NAME: OMaps-Test-Results
     strategy:
       fail-fast: false
       matrix:
@@ -75,7 +75,7 @@ jobs:
         run: |
           xcodebuild test \
             -workspace xcode/omim.xcworkspace \
-            -scheme CoMaps \
+            -scheme OMaps \
             -configuration Debug \
             -sdk iphonesimulator \
             -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
@@ -98,7 +98,7 @@ jobs:
         run: |
           xcodebuild build \
             -workspace xcode/omim.xcworkspace \
-            -scheme CoMaps \
+            -scheme OMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
             -quiet \

.forgejo/workflows/linux-check.yaml

@@ -90,7 +90,7 @@ jobs:
         # -g1 should slightly reduce build time.
         run: |
           cmake . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug \
-            -DCMAKE_CXX_FLAGS=-g1 -DCMAKE_UNITY_BUILD=OFF
+            -DCMAKE_CXX_FLAGS=-g1 -DUNITY_DISABLE=ON
 
       - name: Compile
         shell: bash

.github/workflows/ios-check.yaml

@@ -15,7 +15,6 @@ jobs:
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
       TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
-      SIMULATOR_DEVICE: 'iPhone 16 Pro Max'
     strategy:
       fail-fast: false
       matrix:
@@ -29,6 +28,8 @@ jobs:
       - name: Install dependencies
         run: |
           brew install qt \
+          freetype \
+          harfbuzz \
           optipng
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -51,15 +52,12 @@ jobs:
         if: matrix.buildType == 'Debug'
         shell: bash
         run: |
-          # Start sim before the build to make sure it's booted when tests start.
-          xcrun simctl boot "${{ env.SIMULATOR_DEVICE }}" || true
-          xcrun simctl bootstatus "${{ env.SIMULATOR_DEVICE }}" -b
           xcodebuild test \
             -workspace xcode/omim.xcworkspace \
-            -scheme CoMaps \
+            -scheme OMaps \
             -configuration Debug \
             -sdk iphonesimulator \
-            -destination "platform=iOS Simulator,name=${{ env.SIMULATOR_DEVICE }},OS=latest" \
+            -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
             -quiet \
             -resultBundlePath ${{ env.TEST_RESULTS_BUNDLE_NAME }}.xcresult \
             CODE_SIGNING_REQUIRED=NO \
@@ -79,7 +77,7 @@ jobs:
         run: |
           xcodebuild build \
             -workspace xcode/omim.xcworkspace \
-            -scheme CoMaps \
+            -scheme OMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
             -quiet \

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "tools/osmctools"]
   path = tools/osmctools
-  url = https://github.com/organicmaps/osmctools.git
+  url = https://git.omaps.dev/organicmaps/osmctools.git
 [submodule "tools/kothic"]
   path = tools/kothic
-  url = https://codeberg.org/comaps/kothic.git
+  url = https://git.omaps.dev/organicmaps/kothic.git
 [submodule "3party/protobuf/protobuf"]
   path = 3party/protobuf/protobuf
-  url = https://codeberg.org/comaps/protobuf.git
+  url = https://git.omaps.dev/organicmaps/protobuf.git
 [submodule "3party/Vulkan-Headers"]
   path = 3party/Vulkan-Headers
   url = https://github.com/KhronosGroup/Vulkan-Headers.git
@@ -17,7 +17,7 @@
   ignore = dirty
 [submodule "3party/just_gtfs"]
   path = 3party/just_gtfs
-  url = https://github.com/organicmaps/just_gtfs.git
+  url = https://git.omaps.dev/organicmaps/just_gtfs.git
   branch = for-usage-as-submodule
 [submodule "3party/expat"]
   path = 3party/expat

3party/CMakeLists.txt

@@ -31,10 +31,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   set(JANSSON_WITHOUT_TESTS ON)
   add_subdirectory(jansson/jansson/)
   target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include")
+  add_library(jansson::jansson ALIAS jansson)
 
   # Add gflags library.
-  set(GFLAGS_BUILD_TESTING OFF)
-  set(GFLAGS_BUILD_PACKAGING OFF)
   add_subdirectory(gflags)
   target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
 

CMakeLists.txt

@@ -12,27 +12,13 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
 # Disable build-id generation to make builds reproducible.
-if (NOT APPLE)
-  add_link_options("LINKER:--build-id=none")
-endif()
+add_link_options("LINKER:--build-id=none")
 
 # Fixes warning ld: warning: ignoring duplicate libraries on Mac and Windows.
 if (POLICY CMP0156)
   cmake_policy(SET CMP0156 NEW)
 endif()
 
-set(OMIM_ROOT ${CMAKE_SOURCE_DIR})
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OMIM_ROOT}/cmake")
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-include(OmimPlatform)
-include(OmimOptions)
-include(OmimConfig)
-include(OmimHelpers)
-include(OmimTesting)
-
 if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   # OBJC/OBJCXX are needed to skip m/mm files in Unity builds.
   # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
@@ -50,14 +36,24 @@ endif()
 
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
-if (CMAKE_UNITY_BUILD)
-  message(STATUS "Using Unity Build with batch ${CMAKE_UNITY_BUILD_BATCH_SIZE}, use -DCMAKE_UNITY_BUILD=OFF to disable it.")
+option(COVERAGE_REPORT "Configure for coverage report" OFF)
+
+option(UNITY_DISABLE "Disable unity build" OFF)
+if (NOT UNITY_DISABLE AND NOT DEFINED ENV{UNITY_DISABLE})
+  set(CMAKE_UNITY_BUILD ON)
+  if (DEFINED ENV{UNITY_BUILD_BATCH_SIZE})
+    set(CMAKE_UNITY_BUILD_BATCH_SIZE $ENV{UNITY_BUILD_BATCH_SIZE})
+  else()
+    set(CMAKE_UNITY_BUILD_BATCH_SIZE 50)
+  endif()
+  message(STATUS "Using Unity Build with batch ${CMAKE_UNITY_BUILD_BATCH_SIZE}, export UNITY_DISABLE=1 or use -DUNITY_DISABLE=ON to disable it.")
 endif()
 
-if (USE_CCACHE)
+option(CCACHE_DISABLE "Disable ccache" OFF)
+if (NOT CCACHE_DISABLE AND NOT DEFINED ENV{CCACHE_DISABLE})
   find_program(CCACHE_PROGRAM ccache HINTS /usr/local/bin/)
   if (CCACHE_PROGRAM)
-    message(STATUS "Using ccache, use -DUSE_CCACHE=OFF to disable it.")
+    message(STATUS "Using ccache, export CCACHE_DISABLE=1 or use -DCCACHE_DISABLE=ON to disable it.")
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
     set(CMAKE_C_COMPILER_LAUNCHER   "${CCACHE_PROGRAM}")
@@ -65,13 +61,44 @@ if (USE_CCACHE)
   endif()
 endif()
 
+option(COLORS_DISABLE "Disable colored compiler output" OFF)
+if (NOT DEFINED ENV{COLORS_DISABLE} AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  message(STATUS "export COLORS_DISABLE=1 or use -DCOLORS_DISABLE=ON to disable colored compiler output.")
+  add_compile_options($<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always> $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>)
+  add_link_options($<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always> $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>)
+endif()
+
+option(WITH_SYSTEM_PROVIDED_3PARTY "Enable compilation with system provided dependencies" OFF)
+set(OMIM_ROOT ${CMAKE_SOURCE_DIR})
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OMIM_ROOT}/cmake")
+
+include(OmimHelpers)
+include(OmimTesting)
+
+set(PLATFORM_DESKTOP TRUE)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(PLATFORM_LINUX TRUE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(PLATFORM_MAC TRUE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(PLATFORM_WIN TRUE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
+  set(PLATFORM_ANDROID TRUE)
+  set(PLATFORM_DESKTOP FALSE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+  set(PLATFORM_IPHONE TRUE)
+  set(PLATFORM_DESKTOP FALSE)
+else()
+  message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
+endif()
+
 if(${PLATFORM_MAC})
   set(XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
 
   # Metal language support
   list(APPEND CMAKE_MODULE_PATH ${OMIM_ROOT}/3party/CMake-MetalShaderSupport/cmake)
   include(CheckLanguage)
-  include(CMakeMetalInformation)
   include(MetalShaderSupport)
   check_language(Metal)
   if(CMAKE_Metal_COMPILER)
@@ -79,6 +106,23 @@ if(${PLATFORM_MAC})
   endif()
 endif()
 
+# Sanitizer
+if (PLATFORM_DESKTOP)
+  # https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
+  set(BUILD_WITH_SANITIZER None CACHE STRING "Set to 'address' or others to enable sanitizer")
+
+  if (NOT ${BUILD_WITH_SANITIZER} MATCHES "None")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${BUILD_WITH_SANITIZER} -fno-omit-frame-pointer")
+      set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=${BUILD_WITH_SANITIZER} -fno-omit-frame-pointer")
+      message(STATUS "Enable sanitizer: ${BUILD_WITH_SANITIZER}")
+  endif()
+endif()
+
+# Set build type:
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
 # Global compile options for all configurations.
 if (MSVC)
   add_compile_options(/utf-8)
@@ -110,6 +154,98 @@ else()
 endif()
 
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
+# End of setting build type
+
+# Options
+
+# Call `make package` after cmake to build design tool.
+option(BUILD_DESIGNER "Build application as design tool" OFF)
+if (BUILD_DESIGNER)
+  message(STATUS "Designer tool building is enabled")
+  add_definitions(-DBUILD_DESIGNER)
+endif()
+
+option(BUILD_STANDALONE "Build standalone application" OFF)
+if (BUILD_STANDALONE)
+  message(STATUS "Standalone building is enabled")
+  add_definitions(-DBUILD_STANDALONE)
+endif()
+
+option(USE_ASAN "Enable Address Sanitizer" OFF)
+option(USE_TSAN "Enable Thread Sanitizer" OFF)
+option(USE_LIBFUZZER "Enable LibFuzzer" OFF)
+option(PYBINDINGS "Create makefiles for building python bindings" OFF)
+option(SKIP_QT_GUI "Skip building of Qt GUI" OFF)
+option(USE_PCH "Use precompiled headers" OFF)
+option(NJOBS "Number of parallel processes" OFF)
+option(ENABLE_VULKAN_DIAGNOSTICS "Enable Vulkan diagnostics" OFF)
+option(ENABLE_TRACE "Enable Tracing" OFF)
+
+if (NJOBS)
+  message(STATUS "Number of parallel processes: ${NJOBS}")
+  set(CMAKE_JOB_POOLS custom=${NJOBS})
+  set(CMAKE_JOB_POOL_COMPILE custom)
+  set(CMAKE_JOB_POOL_LINK custom)
+  set(CMAKE_JOB_POOL_PRECOMPILE_HEADER custom)
+endif()
+
+# GCC 10.0 is required to support <charconv> header inclusion in base/string_utils.hpp
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+  message(FATAL_ERROR "Minimum supported g++ version is 10.0, yours is ${CMAKE_CXX_COMPILER_VERSION}")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set(PCH_EXTENSION "pch")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  set(PCH_EXTENSION "gch")
+endif()
+
+if (PLATFORM_LINUX)
+  option(USE_PPROF "Enable Google Profiler" OFF)
+endif()
+
+if (USE_ASAN)
+  message(STATUS "Address Sanitizer is enabled")
+endif()
+
+if (USE_TSAN)
+  message(STATUS "Thread Sanitizer is enabled")
+endif()
+
+if (USE_ASAN AND USE_TSAN)
+  message(FATAL_ERROR "Can't use two different sanitizers together")
+endif()
+
+if (USE_LIBFUZZER)
+  message(STATUS "LibFuzzer is enabled")
+endif()
+
+if (USE_PPROF)
+  message(STATUS "Google Profiler is enabled")
+  add_definitions(-DUSE_PPROF)
+endif()
+
+if (USE_HEAPPROF)
+  message(STATUS "Heap Profiler is enabled")
+endif()
+
+if (ENABLE_VULKAN_DIAGNOSTICS)
+  message(WARNING "Vulkan diagnostics are enabled. Be aware of performance impact!")
+  add_definitions(-DENABLE_VULKAN_DIAGNOSTICS)
+endif()
+
+if (ENABLE_TRACE)
+  message(STATUS "Tracing is enabled")
+  add_definitions(-DENABLE_TRACE)
+endif()
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Set environment variables
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
 if (PLATFORM_LINUX OR PLATFORM_ANDROID)
   find_program(LLD_FOUND ld.lld)
@@ -167,6 +303,28 @@ endif()
 # To allow #include "base/file_name.hpp" in all sources.
 include_directories(${CMAKE_HOME_DIRECTORY})
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+if (USE_ASAN)
+  add_compile_options(
+    "-fsanitize=address"
+    "-fno-omit-frame-pointer"
+  )
+endif()
+
+if (USE_TSAN)
+  add_compile_options(
+    "-fsanitize=thread"
+    "-fno-omit-frame-pointer"
+  )
+endif()
+
+if (USE_LIBFUZZER)
+  add_compile_options(
+    "-fsanitize=fuzzer"
+  )
+endif()
+
 if (USE_PCH)
   message(STATUS "Precompiled headers are ON")
   set(OMIM_PCH_TARGET_NAME "omim_pch")

README.md

@@ -29,17 +29,16 @@
 
 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.
 
-There are apps for Android and iOS (and ARM MacOS).
-An alpha Linux / MacOS Qt desktop version, which is also suitable for Linux phones.
+There are apps for Android and iOS (and ARM macOS).
+An alpha linux / macOS Qt desktop version, which is also suitable for linux phones.
 
-The June app release is available on Google Play, F-Droid and as an APK to download now! We are working on publishing in the iOS App Store as well, please stay tuned!
+**We're working on getting first app releases out soon, please stay tuned!**
 
 <!--
 [<img src="docs/badges/apple-appstore.png" alt="App Store" width="160">](https://apps.apple.com/app/comaps/id1567437057)
+[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps)
+[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps/)
 -->
-[<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 float="left">
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg" width="180" />
@@ -52,7 +51,7 @@ The June app release is available on Google Play, F-Droid and as an APK to downl
 
 **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.
 
-**Simple and Polished**: Essential, easy to use features that just work.
+**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.
 

android/.idea/icon.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+    <g inkscape:groupmode="layer" inkscape:label="Layer 1">
+        <rect fill="#006c35" fill-opacity="1.0" x="0" y="0" width="1024" height="1024"/>
+        <path fill="#ffffff" d="m861.3562052 256.9139426c18.220574 48.4374573-79.2585233 166.2022835-172.1806378 196.4226995-168.0803471-58.2153969-173.5457836 39.5504743-311.1096159 132.4296677 162.6149552 112.4329497 332.9737882 24.8856325 329.7844002-85.7673036-127.9956457 73.3254376-208.1650824 81.3238121-254.1719349 79.1032962 154.8710218-30.6636026 322.0404219-125.7633124 357.0667834-165.7616685 0.032202 1.7749817 0.049863 3.5523114 0.049863 5.33456 0 191.0905993-295.1650572 474.6148576-295.1650572 474.6148576s-154.5086464-147.95159-239.9499331-302.4701423c-11.943516-0.1614425-83.8230022 25.9633002-110.3310391-9.051445-29.6082623-39.1049397 80.1693081-170.2028122 175.3699196-209.3102117 170.3563508 77.3261904 263.7351577-123.0971499 317.0292402-134.2068293-158.9688193-94.2135154-316.1183714-55.5493358-333.8847017 84.4353407 88.3675802-50.2172465 196.7775505-78.65765 246.8822227-76.4346744-140.7606999 28.7623957-301.9981102 132.8752019-350.2809443 172.4255642 0-159.041983 132.1505407-287.9677052 295.1650569-287.9677052 96.4018995 0 182.0095151 45.0859887 235.8744518 114.8252613 0.00335 0 96.1884344-31.2834041 109.851981 11.3787329zm-33.7059144 14.218972c-12.6607646-17.2289278-56.7341326 2.8936807-56.7341326 2.8936807 6.1678152 10.3446685 11.7002555 21.0960758 16.5352245 32.2084942 4.8995467 11.2622344 9.0867303 22.8954305 12.5044868 34.8382086 0 0 45.0041042-46.3863227 27.6944213-69.9403835zm-629.5734431 294.3797539c13.6858848 18.6189721 61.3258973-3.1309266 61.3258973-3.1309266-6.6716772-11.1802827-12.6484216-22.8033047-17.8755617-34.8139472-5.2966478-12.1727565-9.8213865-24.7454316-13.5171072-37.6545218 0 0-48.6427553 50.1397674-29.9332284 75.5993956z"/>
+    </g>
+</svg>

android/app/build.gradle

@@ -88,6 +88,7 @@ android {
     buildConfigField 'String', 'SUPPORT_MAIL', '"android@comaps.app"'
     // Should be customized in flavors.
     buildConfigField 'String', 'REVIEW_URL', '""'
+    resourceConfigurations += [project.ext.supportedLocalizations]
 
     externalNativeBuild {
       def pchFlag = 'OFF'
@@ -169,7 +170,6 @@ android {
 
     fdroid {
       dimension 'default'
-      applicationIdSuffix '.fdroid'
       versionName = android.defaultConfig.versionName + '-FDroid'
       buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@comaps.app"'
     }
@@ -216,7 +216,7 @@ android {
     android.applicationVariants.all { variant ->
       def task = variant.name.capitalize()
       project.task(type: Exec, "run${task}", dependsOn: "install${task}") {
-        commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "$applicationId/app.organicmaps.DownloadResourcesActivity", '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'
+        commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "$applicationId/app.comaps.DownloadResourcesActivity", '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'
       }
     }
   }
@@ -336,58 +336,6 @@ android {
   androidResources {
     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",
-            "ar",
-            "az",
-            "be",
-            "bg",
-            "ca",
-            "cs",
-            "da",
-            "de",
-            "el",
-            "en",
-            "en-rGB",
-            "es",
-            "es-rMX",
-            "et",
-            "eu",
-            "fa",
-            "fi",
-            "fr",
-            "fr-rCA",
-            "iw",
-            "hi",
-            "hu",
-            "in",
-            "it",
-            "ja",
-            "ko",
-            "lt",
-            "lv",
-            "mr",
-            "mt",
-            "nb",
-            "nl",
-            "pl",
-            "pt",
-            "pt-rBR",
-            "ro",
-            "ru",
-            "sk",
-            "sr",
-            "sv",
-            "sw",
-            "th",
-            "tr",
-            "uk",
-            "vi",
-            "zh",
-            "zh-rHK",
-            "zh-rMO",
-            "zh-rTW"
-    ]
   }
 
   compileOptions {
@@ -442,6 +390,7 @@ dependencies {
   androidTestImplementation libs.androidx.test.junit
   testImplementation libs.junit
   testImplementation libs.mockito.core
+  testImplementation libs.mockito.inline
 }
 
 tasks.withType(JavaCompile) {

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

@@ -1,4 +1,4 @@
-Komunitou vedená bezplatná a otevřená mapová aplikace založená na datech z projektu OpenStreetMap a posílená závazkem k transparentnosti, soukromí a neziskovosti. Aplikace CoMaps je fork/odnož aplikace Organic Maps, která je zase forkem aplikace Maps.ME.
+Komunitou vedené bezplatná a otevřená mapová aplikace založená na datech z projektu OpenStreetMap a posílená závazkem k transparentnosti, soukromí a neziskovosti. Aplikace CoMaps je fork/odnož aplikace Organic Maps, která je zase forkem aplikace Maps.ME.
 
 Důvody vzniku projektu a jeho směr si můžete přečíst na adrese <b><i>codeberg.org/comaps</i></b>.
 Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší mapové aplikace
@@ -14,19 +14,21 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • <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
-• Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.
-• Pěší trasy a cyklostezky
-• Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího
-• Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu
-• Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení
-• Uložení oblíbených míst jedním klepnutím
-• Offline články z Wikipedie
-• Vrstva metra a navigace v něm
-• Záznam tras
-• Export a import záložek a tras ve formátech KML, KMZ a GPX
-• Tmavý režim k použití během noci
-• Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru
+<ul>
+<li>Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google</li>
+<li>Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.</li>
+<li>Pěší trasy a cyklostezky</li>
+<li>Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího</li>
+<li>Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu</li>
+<li>Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení</li>
+<li>Uložení oblíbených míst jedním klepnutím</li>
+<li>Offline články z Wikipedie</li>
+<li>Vrstva metra a navigace v něm</li>
+<li>Záznam tras</li>
+<li>Export a import záložek a tras ve formátech KML, KMZ a GPX</li>
+<li>Tmavý režim k použití během noci</li>
+<li>Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru</li>
+</ul>
 
 <b>Svoboda je tady</b>
 Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!

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

@@ -1,17 +1,17 @@
-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.
+Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap Daten basiert. Transparent, Daten sparsam und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, das 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>.
+Lese mehr über die Gründe und Ziele des Projekt unter <b><i>codeberg.org/comaps</i></b>.
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
-• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap-Webseite
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website
 
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
-‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, diese App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>
+‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Software Entwicklung oder Spenden.
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
 
 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -19,14 +19,14 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Geh- und Radwege
 • Orte wie Restaurants, Tankstellen, Hotels, Geschäfte, Sehenswürdigkeiten und viele mehr
 • Suche nach Namen, Adressen oder Kategorien
-• Sprachausgabe bei der Navigation zu Fuß, Rad oder Auto
+• Navigation mit Sprachausgabe für Fußgänger, Radfahrer und Autos
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
-• U- und S-Bahn-Netze
-• Aufzeichnen von GPS-Tracks
+• U- und S-Bahn Netze
+• Aufzeichnen von GPS Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
-• Dunkler Modus für die Nutzung bei Nacht
+• Darkmode für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 
 <b>Freiheit beginnt hier</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+Entdecke deine Reise – navigiere die Welt mit Privatsphäre!

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

@@ -1,8 +1,10 @@
-• OpenStreetMap Daten vom 2. Juni
-• Neue Einstellungsoption zum Ändern oder Ausblenden der "Über CoMaps" Schaltfläche ganz links
-• Routen als GPS Track speichern
-• Qingdao Metro, Gärtnereien, Leitplanken, Leitern, Studios, Tanzsäle, Feuerstellen und Stundenhotels hinzugefügt
-• transparente Navigationsleiste im Light Mode
-• Mastodon und Bluesky Kontaktoptionen für POIs und im OSM-Editor hinzugefügt
-• Anzeige der Kompassgradzahl in der Richtungspfeilansicht
+Erster CoMaps Release!
+Was ist neu im Vergleich zu Organic Maps:
+• OpenStreetMap-Daten vom 15. Mai
+• OSM Login jetzt über den Webbrowser
+• Der halbtransparente Hintergrund in der U-Bahn-Ansicht wurde entfernt
+• Größe der lokalen Karte beim ersten Karten download anzeigen
+• Der Metaserver wurde durch eine feste Liste an Kartenservern ersetzt
+• Der Nachtmodus schaltet jetzt besser um, auch wenn kein GPS-Signal da ist
 • Übersetzungen aktualisiert
+• Rebranding – das Logo ist noch vorläufig

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

@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community basiert

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

@@ -1 +1 @@
-CoMaps – Offline navigieren mit Datenschutz
+CoMaps – Offline und privat navigieren

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

@@ -14,19 +14,21 @@ Join the community there and help make the best maps app
 ‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
 
 <b>Main Features</b>:
-• Downloadable detailed maps with places which are not available with Google Maps
-• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
-• Walking paths and cycleways
-• Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more
-• Search by name or an address or by point of interest category
-• Navigation with voice announcements for walking, cycling, or driving
-• Bookmark your favorite places with a single tap
-• Offline Wikipedia articles
-• Subway transit layer and directions
-• Track recording
-• Export and import bookmarks and tracks in KML, KMZ, GPX formats
-• A dark mode to use during the night
-• Improve map data for everyone using a basic built-in editor
+<ul>
+<li>Downloadable detailed maps with places which are not available with Google Maps</li>
+<li>Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc</li>
+<li>Walking paths and cycleways</li>
+<li>Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more</li>
+<li>Search by name or an address or by point of interest category</li>
+<li>Navigation with voice announcements for walking, cycling, or driving</li>
+<li>Bookmark your favorite places with a single tap</li>
+<li>Offline Wikipedia articles</li>
+<li>Subway transit layer and directions</li>
+<li>Track recording</li>
+<li>Export and import bookmarks and tracks in KML, KMZ, GPX formats</li>
+<li>A dark mode to use during the night</li>
+<li>Improve map data for everyone using a basic built-in editor</li>
+</ul>
 
 <b>Freedom Is Here</b>
 Discover your journey, navigate the world with privacy and community at the forefront!

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

@@ -1,8 +1,11 @@
-• OpenStreetMap data as of June 2
-• add a setting to change the leftmost button or hide it
-• save built routes as tracks
-• add Qingdao metro, plant nurseries, highway guard rails, ladders, studios, dance venues, firepits, love hotels
-• transparent system navigation bar in the light mode
-• add Mastodon and Bluesky contact options to POIs and OSM editor
-• display Azimuth angle in direction arrow view
+Initial CoMaps release!
+Changes from the Organic Maps upstream:
+• OpenStreetMap data as of May 15
+• login to OSM account via a web browser
+• removed semi-transparent background in Subway layer
+• replaced metaserver with a static map servers list
+• add local map size to the startup download screen
+• improved auto night mode switch when there is no location fix
+• fix incorrect map info when tapping on a not downloaded region
 • update translations
+• rebranding - the logo is provisional still

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

@@ -0,0 +1,12 @@
+Lanzamiento inicial de CoMaps
+
+Cambios respecto a la versión de Organic Maps:
+• Datos nuevos al 15 de mayo
+• Inicio de sesión a OSM a través de navegador
+• Eliminado fondo semitransparente en la capa de Metro
+• Sustitución del metaserver por lista estática de servidores
+• Añadido tamaño del mapa local al inicio
+• Mejora del cambio automático al modo nocturno al no conocerse ubicación
+• Correcciones de fallos
+• Actualización de traducciones
+• Cambio de branding con logo provisional

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

@@ -14,19 +14,21 @@ Liitu kogukonnaga ja aita luua parimat kaardirakendust:
 ‣ <b>Organisatsioon on avatud ja kasutab läbipaistvat otsustusprotsessi ning rahastamist ega taotle kasumit. Rakendus on avatud lähtekoodiga.</b>
 
 <b>Põhifunktsionaalsused</b>:
-• Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist
-• Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud
-• Jalgrajad, rattateed ning maanteed
-• Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud
-• Otsida saad nime, aadressi või huvipunkti kategooria alusel
-• Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel
-• Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana
-• Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta
-• Metroode plaanid ja suunajuhised
-• Raja või teekonna salvestamise võimalus
-• Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes
-• Tume kaardivaade kasutamiseks öösel
-• Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada
+<ul>
+<li>Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist</li>
+<li>Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud</li>
+<li>Jalgrajad, rattateed ning maanteed</li>
+<li>Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud</li>
+<li>Otsida saad nime, aadressi või huvipunkti kategooria alusel</li>
+<li>Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel</li>
+<li>Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana</li>
+<li>Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta</li>
+<li>Metroode plaanid ja suunajuhised</li>
+<li>Raja või teekonna salvestamise võimalus</li>
+<li>Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes</li>
+<li>Tume kaardivaade kasutamiseks öösel</li>
+<li>Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada</li>
+</ul>
 
 <b>Vabadus on siin</b>
 Uuri maailma ja avasta uusi teid - tee seda privaatselt ja kogukonnaga arvestades!

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

@@ -1,32 +0,0 @@
-Yhteisövetoinen, ilmainen ja avoimeen lähdekoodiin perustuva karttasovellus, jonka pohjalla käytetään OpenStreetMapin avointa karttadataa. Sovelluksen kehityksessä on sitouduttu läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomuuteen. CoMapsin projekti on haarautunut Organic Mapsista, joka taas on haarautunut aiemmin Maps.ME:stä
-
-Lue lisää projektin tavotteista ja suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
-Liity yhteisöön ja auta kehittämään paras saatavilla oleva karttasovellus
-• Käytä sovellusta ja kerro siitä myös muille
-• Anna palautetta ja raportoi ongelmia
-• Päivitä karttoja, joko sovelluksessa tai OpenStreetMapin verkkosivuilla
-
-‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi 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>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
-
-<b>Vapaus on täällä</b>
-Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!

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

@@ -1 +0,0 @@
-Helppo karttanavigointi - Löydä lisää matkaltasi - Yhteisön voimin

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

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

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

@@ -1,32 +0,0 @@
-Une application cartographique créée par la communauté, gratuite et open source basée sur les données OpenStreetMap et engagée pour la transparence, le respect de la vie privée et son but non lucratif.
-
-Lisez-en plus sur le projet et sa direction sur <b><i>codeberg.org/comaps</i></b>.
-Rejoignez la communauté et aidez-nous à créer la meilleure application de navigation
-• Utilisez l'application et faites-la connaître
-• Donnez-nous votre avis et signalez les problèmes
-• Corrigez la carte dans l'application ou sur le site web d'OpenStreetMap
-
-‣ <b>Centrée sur le hors-ligne</b> : Planifiez et effectuez votre trajet à l'étranger sans avoir besoin de réseau mobile, recherchez des points de passage lors d'une randonnée lointaine, etc. Toutes les fonctionnalités de l'application sont faites pour fonctionner hors-ligne.
-‣ <b>Respecte la vie privée</b> : L'application est conçue avec la vie privée en tête - elle n'identifie pas ses utilisateurs, ne les piste pas et ne collecte pas d'informations personnelles. Sans pub.
-‣ <b>Simple et soignée</b> : des fonctionnalités faciles à utiliser, essentielles et qui fonctionnent.
-‣ <b>Économise votre batterie et votre stockage</b> : Ne vide pas votre batterie comme les autres applications de navigation. Les cartes compactes économisent de l'espace sur votre téléphone.
-‣ <b>Gratuit et créé par la communauté</b> : Des gens comme vous ont aidé à créer l'application en ajoutant des lieux sur OpenStreetMap, en la testant, en donnant leur avis sur les fonctionnalités et en contribuant au développement et aux frais financiers.
-‣ <b>Prises de décisions et comptes clairs et transparents, but non lucratif et complètement open source.</b>
-
-<b>Fonctionnalités principales :</b>
-• Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps
-• Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés
-• Chemins piétons et pistes cyclables
-• Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus
-• Recherche par nom, adresse ou catégorie de point d'intérêt
-• Navigation avec annonces vocales pour la marche, le vélo ou la conduite
-• Mettez en favori vos lieux préférés en un seul clic
-• Articles Wikipédia hors-ligne
-• Plan de métro et indications pour s'y rendre
-• Enregistrement des parcours
-• Exportez et importez vos favoris aux formats KML, KMZ et GPX
-• Mode sombre pour utiliser pendant la nuit
-• Amélioration de la carte par tout le monde avec un éditeur simple intégré
-
-<b>La liberté est ici</b>
-Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !

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

@@ -1,8 +1,11 @@
-• Données OpenStreetMap du 02 juin
-• Ajout d'une option pour personnaliser le bouton tout à gauche sur l'écran principal
-• Ajout de la possibilité d'enregistrer un itinéraire en tant que traces GPS
-• Ajout du métro de Qingdao, et divers objets sur la carte
-• Support de la barre de navigation transparent en mode clair
-• Ajout des tags Mastodon et Bluesky sur les lieux et dans l'éditeur
-• Affichage de l'azimut
+Première version de CoMaps!
+Changements par rapport à Organic Maps:
+• Données OpenStreetMap du 15 mai
+• Connexion au compte OSM via le navigateur
+• Retrait du fond semi-transparent sur la couche Métro
+• Remplacement du metaserveur par une liste statique de serveurs
+• Ajout de la taille de la carte locale au premier démarrage
+• Amélioration du mode nuit automatique
+• Correction de la suggestion de téléchargements de cartes
 • Mise à jour des traductions
+• Rebranding - le logo est encore provisoire

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

@@ -1 +0,0 @@
-Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté

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

@@ -1 +0,0 @@
-CoMaps - Rando, vélo, conduite hors ligne & privée

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

@@ -1,32 +0,0 @@
-Besplatna aplikacija otvorenog koda koju vodi zajednica i temelji se na podacima OpenStreetMap-a, usmjerana transparentnosti, privatnosti i neprofitnosti. CoMaps je fork Organic Maps aplikacije, koja je pak fork Maps.ME.
-
-Pročitajte o razlozima za projekt i njegovom smjeru na <b><i>codeberg.org/comaps</i></b>.
-Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za karte
-• Koristite aplikaciju i proširite glas o njoj
-• Dajte povratne informacije i prijavite probleme
-• Ažurirajte podatke na karti u aplikaciji ili na web stranici OpenStreetMap-a
-
-‣ <b>Fokusirana na Offline rad</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom uslugom, tražite putne točke dok ste na udaljenom pješačenju itd. Sve funkcije aplikacije dizajnirane su za offline rad.
-‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez reklama.
-‣ <b>Jednostavna i dotjerana</b>: aplikacija je trivijalna za korištenje i jednostavno radi.
-‣ <b>Štedi vašu bateriju i prostor</b>: Ne troši bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
-‣ <b>Otvorena i izrađena od strane zajednice</b>: Ljudi poput vas pomogli su izraditi aplikaciju dodavanjem lokacija na OpenStreetMap-u, testiranjem i davanjem povratnih informacija o aplikaciji te doprinoseći svojim razvojnim vještinama i novcem.
-‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
-
-<b>Glavne značajke</b>:
-• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
-• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
-• Pješačke i biciklističke staze
-• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
-• Pretražujte po nazivu ili adresi ili po kategoriji interesa
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
-• Obilježite svoja omiljena mjesta jednim dodirom
-• Offline članci Wikipedije
-• Tranzitni sloj podzemne željeznice sa navigacijom
-• Snimanje GPS tragova
-• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
-• Tamni način rada za korištenje tijekom noći
-• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
-
-<b>Sloboda je ovdje</b>
-Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!

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

@@ -1 +0,0 @@
-Jednostavna navigacija - Otkrijte više o svom putovanju - Pokreće zajednica

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

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

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

@@ -14,19 +14,21 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 ‣ <b>Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source</b>
 
 <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
-• 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
-• Navigazione con assistente vocale a piedi, in bici o in macchina
-• Salva i tuoi luoghi preferiti con un tocco
-• Leggi gli articoli Wikipedia Offline
-• Cartina delle metropolitane con direzioni
-• Registrazione del percorso
-• Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX
-• Modalità notturna per la notte
-• Migliora le mappe per tutti usando l'editor interno
+<ul>
+<li>Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps</li>
+<li>Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati</li>
+<li>Strade pedonali e piste ciclabili</li>
+<li>Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro</li>
+<li>Cerca per nome, indirizzo o categoria</li>
+<li>Navigazione con assistente vocale a piedi, in bici o in macchina</li>
+<li>Salva i tuoi luoghi preferiti con un tocco</li>
+<li>Leggi gli articoli Wikipedia Offline</li>
+<li>Cartina delle metropolitane con direzioni</li>
+<li>Registrazione del percorso</li>
+<li>Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX</li>
+<li>Modalità notturna per la notte</li>
+<li>Migliora le mappe per tutti usando l'editor interno</li>
+</ul>
 
 <b>La Libertà è Qui</b>
 Esplora la tua nuova avventura, naviga il mondo con Privacy e la comunità in prima linea!

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

@@ -1,8 +0,0 @@
-• Data di OpenStreetmap fino a giugno 2°
-• Nuova impostazione per cambiare o modificare la positione del tasto sinistra
-• Salvare i percorsi costruiti come tracce
-• È stato aggiunto: metropolitana di Qingdao, giardinaggi, guardrail, scale, studio,
-sala da ballo, focolari, love hotel
-• Barra di navigatione transparente di sisteme in moda luce
-• Aggiungi le opzioni di contatto Mastodon e Bluesky ai POI e all'editor di OSM
-• Visualizza l'angolo di azimut nella freccia di direzione

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

@@ -1 +0,0 @@
-CoMaps - Navigazione Offline con Privacy

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

@@ -0,0 +1,11 @@
+Pierwsze wydanie CoMaps!
+Zmiany w stosunku do Organic Maps:
+• dane OSM z 15.05,
+• logowanie do OSM przez przeglądarkę,
+• usunięto półprzezroczyste tło w warstwie Metra,
+• zastąpiono metaserver statyczną listą serwerów map,
+• dodano rozmiar mapy do ekranu pobierania przy uruchamianiu,
+• poprawiono przełączanie trybu nocnego bez lokalizacji,
+• poprawiono niepoprawne informacje o mapie po dotknięciu niepobranego regionu,
+• zaktualizowano tłumaczenia,
+• rebranding - logo wciąż tymczasowe.

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

@@ -1,33 +0,0 @@
-Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade e baseado em dados do OpenStreetMap, 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>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.
-‣ <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 categoria de ponto de interesse
-• Navegação com anúncios de voz para caminhada, ciclismo ou direção
-• Marque seus lugares favoritos com um único toque
-• Artigos offline da Wikipédia
-• Caminho de transporte e direções do metrô
-• Gravação de trilhas
-• Exporte e importe favoritos e trilhas em Formatos KML, KMZ, 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/pt-BR/release-notes.txt

@@ -1,8 +1,9 @@
-• Dados do OSM de 2/06
-• Adicionada uma configuração para alterar ou ocultar o botão mais à esquerda
-• Salve rotas construídas como trilhas
-• Adicionado metrô de Qingdao, viveiros de plantas, guarda-corpos de rodovias, escadas, estúdios, casas de dança, fogueiras e motéis
-• Barra de navegação do sistema transparente no modo claro
-• Adicionadas opções de contato Mastodon e Bluesky aos POIs e ao editor OSM
-• Exibição de ângulo de azimute na visualização de seta de direção
+Lançamento inicial do CoMaps!
+Alterações em relação ao Organic Maps:
+• Dados do OSM de 15/05
+• Login na conta OSM por meio de autenticação no navegador
+• Remoção do fundo semitransparente na camada Metrô
+• Substituição do metaserver por uma lista estática de servidores de mapas
+• Melhoria na alternância automática do modo noturno quando não há localização
 • Novas traduções
+• Rebranding - O logo ainda é provisório

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

@@ -1 +0,0 @@
-Fácil navegação - Descubra mais sobre sua jornada - Desenvolvido pela comunidade

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

@@ -1 +0,0 @@
-CoMaps - Mapas com Privacidade

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

@@ -0,0 +1,9 @@
+Lançamento inicial do CoMaps!
+Alterações em relação ao Organic Maps:
+• Dados do OSM de 15/05
+• Login na conta OSM através de um navegador web auth
+• Removido o fundo semi-transparente na camada do Metro
+• Substituído o metaserver por uma lista estática de servidores de mapas
+• Melhoria na mudança automática do modo noturno quando não há localização
+• Novas traduções
+• Rebranding - logótipo ainda provisório

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

@@ -1 +0,0 @@
-CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade

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

@@ -8,19 +8,21 @@
 ‣ <b>Открытое и прозрачное принятие решений, финансовая отчетность, некоммерческая организация и полностью открытый исходный код.</b>
 
 <b>Главные особенности</b>:
-• Загружаемые и подробные карты с местами, которые недоступны в Google Maps
-• Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
-• Пешеходные переходы и велодорожки
-• Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое
-• Поиск по имени, адресу или категории достопримечательностей
-• Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
-• Возможность добавлять любимые места в закладки одним касанием
-• Загружаемые страницы Википедии
-• Слой общественного транспорта (метро)
-• Запись маршрута
-• Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
-• Темный режим для использования в ночное время
-• Улучшение картографических данных для всех с помощью базового встроенного редактора
-• Поддержка Android Auto и CarPlay
+<ul>
+<li>Загружаемые и подробные карты с местами, которые недоступны в Google Maps</li>
+<li>Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.</li>
+<li>Пешеходные переходы и велодорожки</li>
+<li>Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое</li>
+<li>Поиск по имени, адресу или категории достопримечательностей</li>
+<li>Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей</li>
+<li>Возможность добавлять любимые места в закладки одним касанием</li>
+<li>Загружаемые страницы Википедии</li>
+<li>Слой общественного транспорта (метро)</li>
+<li>Запись маршрута</li>
+<li>Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX</li>
+<li>Темный режим для использования в ночное время</li>
+<li>Улучшение картографических данных для всех с помощью базового встроенного редактора</li>
+<li>Поддержка Android Auto и CarPlay</li>
+</ul>
 
 <i>Свобода здесь - Открой для себя поездки, навигацию по миру, ставя приватность и сообщество во главе</i>

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,7 +0,0 @@
-• карты OpenStreetMap от 2 июня
-• настройка для изменения функции левой кнопки или её скрытия
-• сохранение построенных маршрутов в виде треков
-• добавлены: метро в Qingdao, питомники растений, отбойники на шоссе, постоянные лестницы-стремянки, студии, места для танцев, кострища, отели любви
-• прозрачная полоска с системными кнопками (в светлом режиме)
-• в объекты на карте (а также в их редактор) добавлены Mastodon и Bluesky контакты
-• к стрелке направления на выбранный объект добавлен азимут

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

@@ -1,33 +0,0 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОпенСтреетМап-у подацима, усмерени транспарентност, приватност и непрофитни. ЦОМПАПС је Апликације за органске карте виљушка, које је пак форк мапс.ме.
-
-Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
-Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
-• Користите апликацију и проширите глас о томе
-• Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
-‣<b>фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. 
-
-Све апликације су дизајниране за рад ван мреже.
-‣<b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
-‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
-‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </ Б>
-
-<b> Главне карактеристике </b>:
-• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
-• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
-• Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
-• Претражите име или адресу или по категоријама камате
-• навигација са гласовним најавама за ходање, бициклизам или аутомобил
-• Означите своја омиљена места једним додиром
-• Офлајн чланци Википедије
-• транзитни слој подземне пруге са навигацијом
-• Снимање ГПС трагова
-• Ознака и увоз и увоз у KML, KMZ, GPX формате
-• Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
-
-<b> Слобода је овде </b>
-Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!

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

@@ -1,32 +0,0 @@
-OpenStreetMap'in verilerine ve kar amacı gütmeyen olma taahhüdündeki topluluk liderliğine dayanan şeffaflık, gizlilik, ücretsiz ve açık kaynaklı haritalar uygulaması. Comaps, Organic Maps çatalı/düzenlemesidir, bu da bir Maps.ME çatalıdır.
-
-Projenin sebepleri ve rotası hakkında <b><i>codeberg.org/comaps</i></b> adresinden bilgi edinebilirsiniz.
-Oradaki topluluğa katılın ve en iyi harita uygulamasını yapmanıza yardımcı olun
-• Uygulamayı kullanın ve bu bilgiyi yayın
-• Geri bildirim verin ve sorunları bildirin
-• Uygulamada veya OpenStreetMap internet sitesinde harita verilerini güncelleyin
-
-‣ <b>Çevrimdışı odaklı</b>: Hücresel veriye ihtiyaç duymadan yurt dışında seyahatinizi planlayın ve gezin, uzak bir yürüyüş sırasında durak noktaları arama, vb. Tüm uygulama işlevleri çevrimdışı çalışacak şekilde tasarlanmıştır.
-‣ <b>Gizliliğe saygı gösterir</b>: Uygulama gizlilik göz önünde bulundurularak tasarlanmıştır - insanları fişlemez, izlemez ve kişisel bilgileri toplamaz. Reklamsızdır.
-‣ <b>Basit ve parlak</b>: Sadece işe yarayan kullanımı kolay özellikler.
-‣ <b>Pilinizi ve hafızanızı kurtarın</b>: Pilinizi diğer gezinme uygulamaları gibi boşaltmaz. Sıkıştırılmış haritalar telefonunuzdaki değerli hafızadan tasarruf eder.
-‣ <b>Özgür ve topluluk tarafından inşa edilmiştir</b>: Sizin gibi insanlar, OpenStreetMap'e yerler ekleyerek, özellikleri test edip hakkında geri bildirim vererek, geliştirme becerileri ve paralarıyla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
-‣ <b>Açık, şeffaf finans ve karar verme, kar amacı gütmeyen ve tamamen açık kaynaklı.</b>
-
-<b>Ana Özellikler</b>:
-• Google Haritalarda mevcut olmayan yerlerle, indirilebilir ve ayrıntılı haritalar
-• Vurgulanmış yürüyüş parkurları, kamp alanları, su kaynakları, zirveler, yükseklik çizgileri, vb.
-• Yürüyüş ve bisiklet yolları
-• Lokantalar, benzin istasyonları, oteller, mağazalar, şahin tepeleri ve daha fazla ilgi çekici nokta
-• Ada, adrese veya ilgi alanına göre arayın
-• Yürüyüş, bisiklete binme veya sürüş için sesli bildirimlerle gezinme
-• En sevdiğiniz yerlere tek bir dokunuşla yer işareti koyun
-• Çevrimdışı Vikipedi makaleleri
-• Metro katmanı ve tarifler
-• Rota kaydı
-• KML, KMZ, GPX biçimlerindeki yer imlerini ve izlerini dışa veya içe aktarın
-• Gece boyunca kullanılacak karanlık kip
-• Temel yerleşik bir arayüz kullanan herkes için harita verilerini geliştirin
-
-<b>Özgürlük Burada</b>
-Yolculuğunuzu keşfedin, dünyayı gizlilik ve topluluk desteğiyle gezin!

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

@@ -1 +0,0 @@
-Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı

android/app/src/fdroid/play/listings/tr-TR/title.txt

@@ -1 +0,0 @@
-CoMaps - İnternetsiz Seyahat Edin

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

@@ -9,24 +9,26 @@
 ‣ <b>以提供离线服务为核心</b>：无需移动网络即可规划和导航您的海外旅行，郊外远足时仍可搜索航点等等。所有功能均可离线使用。
 ‣ <b>尊重隐私</b>：开发者们在设计 CoMaps 时，优先考虑的是保护用户隐私。CoMaps 无法识别用户身份、无法跟踪用户活动，也无法收集个人信息。此外，CoMaps 不会也不能显示任何广告。
 ‣ <b>简洁精致</b>：轻便易用、不出差错的基本功能。
-‣ <b>节省电池电量和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
+‣ <b>节省电池和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
 ‣ <b>由社区合作创建的免费应用</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>
 
 <b>主要功能</b>：
-• 可下载详细的地图，包括许多Google地图中未显示的地方
-• 突出显示远足路线、露营地、水源、山峰、等高线等的户外模式
-• 步行道和自行车道
-• 餐厅、加油站、酒店、商店、景点等众多兴趣点
-• 按名称、地址或兴趣点类别搜索
-• 步行、骑车或驾驶时，可通过语音提示进行导航
-• 一键收藏您中意的地点
-• 离线阅读维基百科文章
-• 地铁交通图层和路线指示
-• 轨迹记录
-• 以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹
-• 选择天暗后自动开启的黑暗模式
-• 使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据
+<ul>
+<li>可下载详细的地图，包括许多Google地图中未显示的地方</li>
+<li>突出显示远足路线、露营地、水源、山峰、等高线等的户外模式</li>
+<li>步行道和自行车道</li>
+<li>餐厅、加油站、酒店、商店、景点等众多兴趣点</li>
+<li>按名称、地址或兴趣点类别搜索</li>
+<li>步行、骑车或驾驶时，可通过语音提示进行导航</li>
+<li>一键收藏您中意的地点</li>
+<li>离线阅读维基百科文章</li>
+<li>地铁交通图层和路线指示</li>
+<li>轨迹记录</li>
+<li>以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹</li>
+<li>选择天暗后自动开启的黑暗模式</li>
+<li>使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据</li>
+</ul>
 
 <b>自由在此</b>
 探索您的旅程，以隐私和社区为本，畅游世界！

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

@@ -9,24 +9,26 @@
 ‣ <b>以提供離線服務為核心</b>：無需行動網路即可規劃和導航您的海外旅行，郊外遠足時仍可搜尋航點等等。所有功能均可離線使用。
 ‣ <b>尊重隱私</b>：開發人員在設計 CoMaps 時，優先考慮的是保護使用者隱私。CoMaps 無法辨識使用者身分、無法追蹤使用者活動、無法收集個人資訊，也無法顯示任何廣告。
 ‣ <b>簡潔精緻</b>：易上手、不出錯的基本功能。
-‣ <b>節省電池電力和空間</b>：不會像其他導航應用那樣耗電。精簡的地圖可以節省寶貴的手機空間。
+‣ <b>節省電池和空間</b>：不會像其他導航應用那樣耗電。精簡的地圖可以節省寶貴的手機空間。
 ‣ <b>由社群合作創建的免費應用</b>：如同您一樣的使用者透過向 OpenStreetMap 添加地點、測試功能並提供回饋、無私地貢獻自己的編碼技能和資金，協力開發了 CoMaps。
 ‣ <b>決策問責、財務透明、非營利性、完全開源。</b>
 
 <b>主要功能</b>：
-• 可下載詳細的地圖，包括許多Google地圖中未顯示的地方
-• 突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式
-• 步道和自行車道
-• 餐廳、加油站、旅館、商店、景點等眾多興趣點
-• 按名稱、地址或興趣點類別搜尋
-• 步行、騎車或駕駛時，可透過語音提示進行導航
-• 一鍵收藏您喜愛的地點
-• 離線閱讀維基百科文章
-• 列車運輸圖層及路線指示
-• 軌跡記錄
-• 以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡
-• 選擇天暗後自動開啟的黑暗模式
-• 使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料
+<ul>
+<li>可下載詳細的地圖，包括許多Google地圖中未顯示的地方</li>
+<li>突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式</li>
+<li>步道和自行車道</li>
+<li>餐廳、加油站、旅館、商店、景點等眾多興趣點</li>
+<li>按名稱、地址或興趣點類別搜尋</li>
+<li>步行、騎車或駕駛時，可透過語音提示進行導航</li>
+<li>一鍵收藏您喜愛的地點</li>
+<li>離線閱讀維基百科文章</li>
+<li>列車運輸圖層及路線指示</li>
+<li>軌跡記錄</li>
+<li>以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡</li>
+<li>選擇天暗後自動開啟的黑暗模式</li>
+<li>使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料</li>
+</ul>
 
 <b>自由在此</b>
 探索您的旅程，以隱私和社群為本，暢遊世界！

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.06.01-6-FDroid+25060106

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

@@ -1,36 +0,0 @@
-Komunitou vedená bezplatná a otevřená mapová aplikace založená na datech z projektu OpenStreetMap a posílená závazkem k transparentnosti, soukromí a neziskovosti.
-
-Připojte se ke komunitě a pomáhejte s vytvářením nejlepší mapové aplikace
-• Používejte aplikaci a sdílejte ji se známými
-• Poskytujte zpětnou vazbu a nahlašujte problémy
-• Aktualizujte mapová data v aplikaci nebo na webu OpenStreetMap
-
-<i>Vaše zpětná vazba a 5hvězdičkové hodnocení jsou pro nás nejlepší podporou!</i>
-
-• <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
-• <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>Š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
-• Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.
-• Pěší trasy a cyklostezky
-• Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího
-• Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu
-• Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení
-• Uložení oblíbených míst jedním klepnutím
-• Offline články z Wikipedie
-• Vrstva metra a navigace v něm
-• Záznam tras
-• Export a import záložek a tras ve formátech KML, KMZ a GPX
-• Tmavý režim k použití během noci
-• Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru
-• Podpora Android Auto
-
-Nahlaste problémy s aplikací, navrhněte funkce a připojte se k naší komunitě na webu <b><i>comaps.app</i></b>.
-
-<b>Svoboda je tady</b>
-Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!

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

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

android/app/src/google/play/listings/cs-CZ/title.txt

@@ -1 +0,0 @@
-CoMaps – Navigace se soukromím

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

@@ -1,17 +1,17 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap-Daten basiert. Transparent, datensparsam und nicht gewinnorientiert.
+Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap Daten basiert. Transparent, Daten sparsam und nicht gewinnorientiert.
 
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
 • Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website
 
-<i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>
+<i>Dein Feedback und deine 5 Sterne Bewertung sind die beste Unterstützung für uns!</i>
 
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
-‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
-‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
+‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Software Entwicklung oder Spenden.
 ‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
 
 <b>Hauptfunktionen</b>:
@@ -20,17 +20,17 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Geh- und Radwege
 • Orte wie Restaurants, Tankstellen, Hotels, Geschäfte, Sehenswürdigkeiten und viele mehr
 • Suche nach Namen, Adressen oder Kategorien
-• Sprachausgabe bei der Navigation zu Fuß, Rad oder Auto
+• Navigation mit Sprachausgabe für Fußgänger, Radfahrer und Autos
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
-• U- und S-Bahn-Netze
+• U- und S-Bahn Netze
 • Aufzeichnen von GPS Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
-• Dunkler Modus für die Nutzung bei Nacht
+• Darkmode für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 • Unterstützung für Android Auto
 
 Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>
 
 <b>Freiheit beginnt hier</b>
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+Entdecke deine Reise – navigiere die Welt mit Privatsphäre!

android/app/src/google/play/listings/de-DE/short-description.txt

@@ -1 +1 @@
-Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community basiert

android/app/src/google/play/listings/de-DE/title.txt

@@ -1 +1 @@
-CoMaps
+CoMaps – Privat navigieren

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

@@ -1,36 +0,0 @@
-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.
-
-Liity yhteisöön ja auta kehittämään parasta karttasovellusta
-• Käytä sovellusta ja levitä sanaa
-• Anna palautetta ja raportoi ongelmista
-• Päivitä karttadataa sovelluksessa tai OpenStreetMap:n verkkosivuilla
-
-<i>Palautteesi ja 5-tähden arvostelu on paras tukesi meille!</i>
-
-‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää.
-‣ <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>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
-• Android Auto -tuki
-
-Raportoi sovellusvirheistä, ehdota ideoita liity yhteisöön osoitteessa <b><i>comaps.app</i></b>
-
-<b>Vapaus on täällä</b>
-Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!

android/app/src/google/play/listings/fi-FI/short-description.txt

@@ -1 +0,0 @@
-Helppo karttanavigointi - Löydä lisää matkaltasi - Yhteisön voimin

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

@@ -1 +0,0 @@
-CoMaps - Navigoi yksityisesti

android/app/src/google/play/listings/fr-FR/full-description.txt

@@ -1,36 +0,0 @@
-Une application cartographique créée par la communauté, gratuite et open source basée sur les données OpenStreetMap et engagée pour la transparence, le respect de la vie privée et son but non lucratif.
-
-Rejoignez la communauté et aidez-nous à créer la meilleure application de navigation
-• Utilisez l'application et faites-la connaître
-• Donnez-nous votre avis et signalez les problèmes
-• Corrigez la carte dans l'application ou sur le site web d'OpenStreetMap
-
-<i>Vos commentaires et une note de 5 étoiles sont notre meilleur soutien !</i>
-
-‣ <b>Simple et soignée</b> : des fonctionnalités faciles à utiliser, essentielles et qui fonctionnent.
-‣ <b>Centrée sur le hors-ligne</b> : Planifiez et effectuez votre trajet à l'étranger sans avoir besoin de réseau mobile, recherchez des points de passage lors d'une randonnée lointaine, etc. Toutes les fonctionnalités de l'application sont faites pour fonctionner hors-ligne.
-‣ <b>Respecte la vie privée</b> : L'application est conçue avec la vie privée en tête - elle n'identifie pas ses utilisateurs, ne les piste pas et ne collecte pas d'informations personnelles. Sans pub.
-‣ <b>Économise votre batterie et votre stockage</b> : Ne vide pas votre batterie comme les autres applications de navigation. Les cartes compactes économisent de l'espace sur votre téléphone.
-‣ <b>Gratuit et créé par la communauté</b> : Des gens comme vous ont aidé à créer l'application en ajoutant des lieux sur OpenStreetMap, en la testant, en donnant leur avis sur les fonctionnalités et en contribuant au développement et aux frais financiers.
-‣ <b>Prises de décisions et comptes clairs et transparents, but non lucratif et complètement open source.</b>
-
-<b>Fonctionnalités principales :</b>
-• Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps
-• Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés
-• Chemins piétons et pistes cyclables
-• Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus
-• Recherche par nom, adresse ou catégorie de point d'intérêt
-• Navigation avec annonces vocales pour la marche, le vélo ou la conduite
-• Mettez en favori vos lieux préférés en un seul clic
-• Articles Wikipédia hors-ligne
-• Plan de métro et indications pour s'y rendre
-• Enregistrement des parcours
-• Exportez et importez vos favoris aux formats KML, KMZ et GPX
-• Mode sombre pour utiliser pendant la nuit
-• Amélioration de la carte par tout le monde avec un éditeur simple intégré
-• Support pour Android Auto
-
-Veuillez signaler les problèmes, suggérer des idées et rejoindre notre communauté sur le site <b><i>comaps.app</i></b>.
-
-<b>La liberté est ici</b>
-Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !

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

@@ -1 +0,0 @@
-Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté

android/app/src/google/play/listings/fr-FR/title.txt

@@ -1 +0,0 @@
-CoMaps - Naviguer sans suivi

android/app/src/google/play/listings/hr/full-description.txt

@@ -1,36 +0,0 @@
-Besplatna aplikacija otvorenog koda koju vodi zajednica i temelji se na podacima OpenStreetMap-a, usmjerana transparentnosti, privatnosti i neprofitnosti. 
-
-Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za karte
-• Koristite aplikaciju i proširite glas o njoj
-• Dajte povratne informacije i prijavite probleme
-• Ažurirajte podatke na karti u aplikaciji ili na web stranici OpenStreetMap-a
-
-<i>Vaše povratne informacije i recenzije s 5 zvjezdica najbolja su nam podrška!</i>
-
-‣ <b>Jednostavna i dotjerana</b>: aplikacija je trivijalna za korištenje i jednostavno radi.
-‣ <b>Fokusirana na Offline rad</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom uslugom, tražite putne točke dok ste na udaljenom pješačenju itd. Sve funkcije aplikacije dizajnirane su za offline rad.
-‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez reklama.
-‣ <b>Štedi vašu bateriju i prostor</b>: Ne troši bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
-‣ <b>Otvorena i izrađena od strane zajednice</b>: Ljudi poput vas pomogli su izraditi aplikaciju dodavanjem lokacija na OpenStreetMap-u, testiranjem i davanjem povratnih informacija o aplikaciji te doprinoseći svojim razvojnim vještinama i novcem.
-‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
-
-<b>Glavne značajke</b>:
-• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
-• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
-• Pješačke i biciklističke staze
-• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
-• Pretražujte po nazivu ili adresi ili po kategoriji interesa
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
-• Obilježite svoja omiljena mjesta jednim dodirom
-• Offline članci Wikipedije
-• Tranzitni sloj podzemne željeznice sa navigacijom
-• Snimanje GPS tragova
-• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
-• Tamni način rada za korištenje tijekom noći
-• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
-• Android Auto podrška
-
-Prijavite probleme s aplikacijom, predložite ideje i pridružite se našoj zajednici na web stranici <b><i>comaps.app</i></b>.
-
-<b>Sloboda je ovdje</b>
-Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!

android/app/src/google/play/listings/hr/short-description.txt

@@ -1 +0,0 @@
-Jednostavna navigacija - Otkrijte više o svom putovanju - Pokreće zajednica

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

@@ -1 +0,0 @@
-CoMaps - Navigirajte Privatno

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

@@ -1,36 +0,0 @@
-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.
-
-Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
-• usa l'app e consigliala
-• Dacci il tuo parere e riporta eventuali problemi
-• Aggiorna i dati delle mappe direttamente nell'app o sul sito OpenStreetMap
-
-<i>Il vostro feedback e le vostre recensioni a 5 stelle sono il miglior supporto per noi!</i>
-
-‣ <b>Semplice ed Elegante</b>: funzionalità semplici e affidabili.
-‣ <b>Offline</b>: Pianifica e percorri il tuo viaggio senza necessità di essere connesso alla rete, cerca tappe mentre sei in una escursione etc. Tutte le funzionalità dell'app sono pensate per operare senza rete.
-‣ <b>Rispetta la Privacy</b>: L'app è pensata per rispettare la tua Privacy, non identifica le persone e non registra o colleziona i tuoi dati personali. Senza pubblicità.
-‣ <b>Preserva la Batteria e lo Spazio in Memoria</b>: Non consuma batteria come altre app di navigazione. Le mappe compatte salvano il prezioso spazio del tuo telefono.
-‣ <b>Gratis e Sviluppata dalla Comunità</b>: Persone come te posso aiutare a migliorare l'app aggiungendo luoghi su OpenStreetMap, testando e dando opinioni sulle funzionalità dell'app e contribuendo al loro sviluppo e sostentamento economico.
-‣ <b>Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source</b>
-
-<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
-• 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
-• Navigazione con assistente vocale a piedi, in bici o in macchina
-• Salva i tuoi luoghi preferiti con un tocco
-• Leggi gli articoli Wikipedia Offline
-• Cartina delle metropolitane con direzioni
-• Registrazione del percorso
-• Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX
-• Modalità notturna per la notte
-• Migliora le mappe per tutti usando l'editor interno
-• Supporto Android Auto
-
-Segnalate i problemi delle app, suggerite idee e unitevi alla nostra comunità sul sito <b><i>comaps.app</i></b>.
-
-<b>La Libertà è Qui</b>
-Esplora la tua nuova avventura, naviga il mondo con Privacy e la comunità in prima linea!

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

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

android/app/src/google/play/listings/it-IT/title.txt

@@ -1 +0,0 @@
-CoMaps - Viaggia con privacy

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

@@ -1,45 +0,0 @@
-Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade e baseado em dados do OpenStreetMap, reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos.
-
-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.
-
-<i>Seu feedback e avaliações 5 estrelas são o nosso melhor suporte!</i>
-
-‣ <b>Simples e refinado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
-‣ <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. Livre de anúncios.
-‣ <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 locais ao OpenStreetMap, testando e dando feedback sobre os recursos, além de contribuir com suas habilidades de desenvolvimento e recursos financeiros.
-‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
-
-‣ Simples e sofisticado: recursos essenciais e fáceis de usar que simplesmente funcionam.
-‣ Foco offline: 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.
-‣ Respeito à privacidade: 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.
-‣ Economiza bateria e espaço: Não consome bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
-‣ Gratuito e desenvolvido pela comunidade: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com dinheiro e habilidades de desenvolvimento.
-‣ Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.
-
-Principais recursos:
-• Mapas detalhados para download com locais que não estão disponíveis em muitos mapas comerciais
-• Modo ao ar livre com trilhas destacadas, 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 categoria de ponto de interesse
-• Navegação com anúncios de voz para caminhada, ciclismo ou direção
-• Marque seus lugares favoritos com um único toque
-• Sincronização com iCloud para seus favoritos e trilhas
-• Artigos offline da Wikipédia
-• Camada e direções de transporte público de metrô
-• Gravação de trilhas
-• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
-• Modo escuro para usar à noite
-• Aprimore os dados do mapa para todos usando um editor básico integrado
-• Suporte para Android Auto
-
-Por favor, reporte problemas com o aplicativo, sugira ideias e junte-se à nossa comunidade no site <b><i>comaps.app</i></b>.
-
-<b>A Liberdade Chegou</b>
-Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!

android/app/src/google/play/listings/pt-BR/short-description.txt

@@ -1 +0,0 @@
-Fácil navegação - Descubra mais sobre sua jornada - Desenvolvido pela comunidade

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

@@ -1 +0,0 @@
-CoMaps - Navegue privadamente

android/app/src/google/play/listings/sr/full-description.txt

@@ -1,6 +1,6 @@
 Бесплатна апликација за мапе отвореног кода коју води заједница заснована на OpenStreetMap подацима и ојачана посвећеношћу транспарентности, приватности и непрофитности.
 
-Придружите се заједници и помозите да направимо најбољу навигацију
+Придружите се заједници и помозите да направите најбољу навигацију
 • Користите апликацију и ширите информације о њој
 • Оставите повратне информације и пријавите проблеме
 • Ажурирајте мапе из апликације или на сајту OpenStreetMap

android/app/src/google/play/listings/tr-TR/short-description.txt

@@ -1 +0,0 @@
-Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı

android/app/src/google/play/listings/tr-TR/title.txt

@@ -1 +0,0 @@
-CoMaps - Gizlilikle Gezin

android/app/src/google/play/listings/zh-CN/full-description.txt

@@ -10,7 +10,7 @@
 ‣ <b>简洁精致</b>：轻便易用、不出差错的基本功能。
 ‣ <b>以提供离线服务为核心</b>：无需移动网络即可规划和导航您的海外旅行，郊外远足时仍可搜索航点等等。所有功能均可离线使用。
 ‣ <b>尊重隐私</b>：开发者们在设计 CoMaps 时，优先考虑的是保护用户隐私。CoMaps 无法识别用户身份、无法跟踪用户活动，也无法收集个人信息。此外，CoMaps 不会也不能显示任何广告。
-‣ <b>节省电池电量和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
+‣ <b>节省电池和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
 ‣ <b>由社区合作创建的免费应用</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>
 

android/app/src/google/play/listings/zh-TW/full-description.txt

@@ -10,7 +10,7 @@
 ‣ <b>簡潔精緻</b>：易上手、不出錯的基本功能。
 ‣ <b>以提供離線服務為核心</b>：無需行動網路即可規劃和導航您的海外旅行，郊外遠足時仍可搜尋航點等等。所有功能均可離線使用。
 ‣ <b>尊重隱私</b>：開發人員在設計 CoMaps 時，優先考慮的是保護使用者隱私。CoMaps 無法辨識使用者身分、無法追蹤使用者活動、無法收集個人資訊，也無法顯示任何廣告。
-‣ <b>節省電池電力和空間</b>：不會像其他導航應用那樣耗電。精簡的地圖可以節省寶貴的手機空間。 
+‣ <b>節省電池和空間</b>：不會像其他導航應用那樣耗電。精簡的地圖可以節省寶貴的手機空間。 
 ‣ <b>由社群合作創建的免費應用</b>：如同您一樣的使用者透過向 OpenStreetMap 添加地點、測試功能並提供回饋、無私地貢獻自己的編碼技能和資金，協力開發了 CoMaps。
 ‣ <b>決策問責、財務透明、非營利性、完全開源。</b>
 

android/app/src/main/AndroidManifest.xml

@@ -119,7 +119,7 @@
 
         <data android:scheme="http"/>
         <data android:scheme="https"/>
-        <data android:host="comaps.at"/>
+        <data android:host="comaps.app"/>
       </intent-filter>
 
       <intent-filter>

android/app/src/main/cpp/CMakeLists.txt

@@ -25,20 +25,6 @@ set(SRC
   app/organicmaps/sdk/search/DisplayedCategories.cpp
   app/organicmaps/sdk/search/SearchEngine.cpp
   app/organicmaps/sdk/search/SearchRecents.cpp
-  app/organicmaps/sdk/routing/JunctionInfo.hpp
-  app/organicmaps/sdk/routing/RouteMarkData.hpp
-  app/organicmaps/sdk/routing/RouteMarkType.hpp
-  app/organicmaps/sdk/routing/RoutePointInfo.hpp
-  app/organicmaps/sdk/routing/RouteRecommendationType.hpp
-  app/organicmaps/sdk/routing/RoutingInfo.hpp
-  app/organicmaps/sdk/routing/RoutingOptions.cpp
-  app/organicmaps/sdk/routing/SingleLaneInfo.hpp
-  app/organicmaps/sdk/routing/TransitRouteInfo.hpp
-  app/organicmaps/sdk/routing/TransitStepInfo.hpp
-  app/organicmaps/sdk/ChoosePositionMode.cpp
-  app/organicmaps/sdk/MapStyle.cpp
-  app/organicmaps/sdk/OrganicMaps.cpp
-  app/organicmaps/sdk/Router.cpp
   app/organicmaps/core/jni_helper.cpp
   app/organicmaps/core/jni_java_methods.cpp
   app/organicmaps/core/logging.cpp
@@ -52,6 +38,8 @@ set(SRC
   app/organicmaps/LocationState.cpp
   app/organicmaps/Map.cpp
   app/organicmaps/MapManager.cpp
+  app/organicmaps/MwmApplication.cpp
+  app/organicmaps/routing/RoutingOptions.cpp
   app/organicmaps/settings/UnitLocale.cpp
   app/organicmaps/settings/MapLanguageCode.cpp
   app/organicmaps/sound/tts.cpp

android/app/src/main/cpp/app/organicmaps/Framework.cpp

@@ -4,12 +4,6 @@
 #include "app/organicmaps/UserMarkHelper.hpp"
 #include "app/organicmaps/opengl/androidoglcontextfactory.hpp"
 #include "app/organicmaps/platform/AndroidPlatform.hpp"
-#include "app/organicmaps/sdk/routing/JunctionInfo.hpp"
-#include "app/organicmaps/sdk/routing/RouteMarkData.hpp"
-#include "app/organicmaps/sdk/routing/RouteMarkType.hpp"
-#include "app/organicmaps/sdk/routing/RouteRecommendationType.hpp"
-#include "app/organicmaps/sdk/routing/RoutingInfo.hpp"
-#include "app/organicmaps/sdk/routing/TransitRouteInfo.hpp"
 #include "app/organicmaps/util/Distance.hpp"
 #include "app/organicmaps/util/FeatureIdBuilder.hpp"
 #include "app/organicmaps/util/NetworkPolicy.hpp"
@@ -809,8 +803,8 @@ void CallRouteRecommendationListener(shared_ptr<jobject> listener,
                                      RoutingManager::Recommendation recommendation)
 {
   JNIEnv * env = jni::GetEnv();
-  jmethodID const methodId = jni::GetMethodID(env, *listener, "onRecommend", "(Lapp/organicmaps/sdk/routing/RouteRecommendationType;)V");
-  env->CallVoidMethod(*listener, methodId, GetRouteRecommendationType(env, recommendation));
+  jmethodID const methodId = jni::GetMethodID(env, *listener, "onRecommend", "(I)V");
+  env->CallVoidMethod(*listener, methodId, static_cast<int>(recommendation));
 }
 
 void CallSetRoutingLoadPointsListener(shared_ptr<jobject> listener, bool success)
@@ -1143,12 +1137,6 @@ Java_app_organicmaps_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong t
   frm()->ShowTrack(static_cast<kml::TrackId>(track));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_Framework_nativeSaveRoute(JNIEnv *, jclass)
-{
-  frm()->SaveRoute();
-}
-
 JNIEXPORT jstring JNICALL
 Java_app_organicmaps_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass)
 {
@@ -1252,7 +1240,7 @@ Java_app_organicmaps_Framework_nativeDisableFollowing(JNIEnv * env, jclass)
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets)
+Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, bool announceStreets)
 {
   ::Framework * fr = frm();
   if (!fr->GetRoutingManager().IsRoutingActive())
@@ -1282,16 +1270,64 @@ Java_app_organicmaps_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass
 JNIEXPORT jobject JNICALL
 Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass)
 {
-  RoutingManager & rm = frm()->GetRoutingManager();
-  if (!rm.IsRoutingActive())
+  ::Framework * fr = frm();
+  if (!fr->GetRoutingManager().IsRoutingActive())
     return nullptr;
 
   routing::FollowingInfo info;
-  rm.GetRouteFollowingInfo(info);
+  fr->GetRoutingManager().GetRouteFollowingInfo(info);
   if (!info.IsValid())
     return nullptr;
 
-  return CreateRoutingInfo(env, info, rm);
+  static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/routing/RoutingInfo");
+  // Java signature : RoutingInfo(Distance distToTarget, Distance distToTurn,
+  //                              String currentStreet, String nextStreet, String nextNextStreet,
+  //                              double completionPercent, int vehicleTurnOrdinal, int
+  //                              vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
+  //                              int totalTime, SingleLaneInfo[] lanes)
+  static jmethodID const ctorRouteInfoID =
+      jni::GetConstructorID(env, klass,
+                            "(Lapp/organicmaps/util/Distance;Lapp/organicmaps/util/Distance;"
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
+                            "[Lapp/organicmaps/routing/SingleLaneInfo;DZZ)V");
+
+  vector<routing::FollowingInfo::SingleLaneInfoClient> const & lanes = info.m_lanes;
+  jobjectArray jLanes = nullptr;
+  if (!lanes.empty())
+  {
+    static jclass const laneClass = jni::GetGlobalClassRef(env, "app/organicmaps/routing/SingleLaneInfo");
+    auto const lanesSize = static_cast<jsize>(lanes.size());
+    jLanes = env->NewObjectArray(lanesSize, laneClass, nullptr);
+    ASSERT(jLanes, (jni::DescribeException()));
+    static jmethodID const ctorSingleLaneInfoID = jni::GetConstructorID(env, laneClass, "([BZ)V");
+
+    for (jsize j = 0; j < lanesSize; ++j)
+    {
+      auto const laneSize = static_cast<jsize>(lanes[j].m_lane.size());
+      jni::TScopedLocalByteArrayRef singleLane(env, env->NewByteArray(laneSize));
+      ASSERT(singleLane.get(), (jni::DescribeException()));
+      env->SetByteArrayRegion(singleLane.get(), 0, laneSize, lanes[j].m_lane.data());
+
+      jni::TScopedLocalRef singleLaneInfo(
+          env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(),
+                              lanes[j].m_isRecommended));
+      ASSERT(singleLaneInfo.get(), (jni::DescribeException()));
+      env->SetObjectArrayElement(jLanes, j, singleLaneInfo.get());
+    }
+  }
+
+  auto const & rm = frm()->GetRoutingManager();
+  auto const isSpeedCamLimitExceeded = rm.IsRoutingActive() ? rm.IsSpeedCamLimitExceeded() : false;
+  auto const shouldPlaySignal = frm()->GetRoutingManager().GetSpeedCamManager().ShouldPlayBeepSignal();
+  jobject const result = env->NewObject(
+      klass, ctorRouteInfoID, ToJavaDistance(env, info.m_distToTarget),
+      ToJavaDistance(env, info.m_distToTurn), jni::ToJavaString(env, info.m_currentStreetName),
+      jni::ToJavaString(env, info.m_nextStreetName), jni::ToJavaString(env, info.m_nextNextStreetName),
+      info.m_completionPercent, info.m_turn, info.m_nextTurn, info.m_pedestrianTurn, info.m_exitNum,
+      info.m_time, jLanes, info.m_speedLimitMps, static_cast<jboolean>(isSpeedCamLimitExceeded),
+      static_cast<jboolean>(shouldPlaySignal));
+  ASSERT(result, (jni::DescribeException()));
+  return result;
 }
 
 JNIEXPORT jobjectArray JNICALL
@@ -1304,7 +1340,17 @@ Java_app_organicmaps_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass
     return nullptr;
   }
 
-  return CreateJunctionInfoArray(env, junctionPoints);
+  static jclass const junctionClazz = jni::GetGlobalClassRef(env, "app/organicmaps/routing/JunctionInfo");
+  // Java signature : JunctionInfo(double lat, double lon)
+  static jmethodID const junctionConstructor = jni::GetConstructorID(env, junctionClazz, "(DD)V");
+
+  return jni::ToJavaArray(env, junctionClazz, junctionPoints,
+    [](JNIEnv * env, m2::PointD const & point)
+    {
+      return env->NewObject(junctionClazz, junctionConstructor,
+                            mercator::YToLat(point.y),
+                            mercator::XToLon(point.x));
+    });
 }
 
 JNIEXPORT jintArray JNICALL
@@ -1453,23 +1499,82 @@ Java_app_organicmaps_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env,
   return g_framework->DeactivateMapSelectionCircle();
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeSetMapStyle(JNIEnv * env, jclass, jint mapStyle)
+{
+  MapStyle const val = static_cast<MapStyle>(mapStyle);
+  if (val != g_framework->GetMapStyle())
+    g_framework->SetMapStyle(val);
+}
+
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetMapStyle(JNIEnv * env, jclass)
+{
+  return g_framework->GetMapStyle();
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeMarkMapStyle(JNIEnv * env, jclass, jint mapStyle)
+{
+  MapStyle const val = static_cast<MapStyle>(mapStyle);
+  if (val != g_framework->GetMapStyle())
+    g_framework->MarkMapStyle(val);
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeSetRouter(JNIEnv * env, jclass, jint routerType)
+{
+  using Type = routing::RouterType;
+  Type type = Type::Vehicle;
+  switch (routerType)
+  {
+    case 0: break;
+    case 1: type = Type::Pedestrian; break;
+    case 2: type = Type::Bicycle; break;
+    case 3: type = Type::Transit; break;
+    case 4: type = Type::Ruler; break;
+    default: assert(false); break;
+  }
+  g_framework->GetRoutingManager().SetRouter(type);
+}
+
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetRouter(JNIEnv * env, jclass)
+{
+  return static_cast<jint>(g_framework->GetRoutingManager().GetRouter());
+}
+
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetLastUsedRouter(JNIEnv * env, jclass)
+{
+  return static_cast<jint>(g_framework->GetRoutingManager().GetLastUsedRouter());
+}
+
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetBestRouter(JNIEnv * env, jclass,
+                                                       jdouble srcLat, jdouble srcLon,
+                                                       jdouble dstLat, jdouble dstLon)
+{
+  return static_cast<jint>(frm()->GetRoutingManager().GetBestRouter(
+      mercator::FromLatLon(srcLat, srcLon), mercator::FromLatLon(dstLat, dstLon)));
+}
+
 JNIEXPORT void JNICALL
 Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title,
-                                                       jstring subtitle, jobject markType,
+                                                       jstring subtitle, jint markType,
                                                        jint intermediateIndex,
                                                        jboolean isMyPosition,
-                                                       jdouble lat, jdouble lon,
-                                                       jboolean reorderIntermediatePoints)
+                                                       jdouble lat, jdouble lon)
 {
   RouteMarkData data;
   data.m_title = jni::ToNativeString(env, title);
   data.m_subTitle = jni::ToNativeString(env, subtitle);
-  data.m_pointType = GetRouteMarkType(env, markType);
+  data.m_pointType = static_cast<RouteMarkType>(markType);
   data.m_intermediateIndex = static_cast<size_t>(intermediateIndex);
   data.m_isMyPosition = static_cast<bool>(isMyPosition);
   data.m_position = m2::PointD(mercator::FromLatLon(lat, lon));
 
-  frm()->GetRoutingManager().AddRoutePoint(std::move(data), reorderIntermediatePoints);
+  frm()->GetRoutingManager().AddRoutePoint(std::move(data));
 }
 
 JNIEXPORT void JNICALL
@@ -1479,9 +1584,10 @@ Java_app_organicmaps_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass)
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex)
+Java_app_organicmaps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass,
+                                                          jint markType, jint intermediateIndex)
 {
-  frm()->GetRoutingManager().RemoveRoutePoint(GetRouteMarkType(env, markType),
+  frm()->GetRoutingManager().RemoveRoutePoint(static_cast<RouteMarkType>(markType),
                                               static_cast<size_t>(intermediateIndex));
 }
 
@@ -1500,7 +1606,30 @@ Java_app_organicmaps_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jcl
 JNIEXPORT jobjectArray JNICALL
 Java_app_organicmaps_Framework_nativeGetRoutePoints(JNIEnv * env, jclass)
 {
-  return CreateRouteMarkDataArray(env, frm()->GetRoutingManager().GetRoutePoints());
+  auto const points = frm()->GetRoutingManager().GetRoutePoints();
+
+  static jclass const pointClazz = jni::GetGlobalClassRef(env,
+                                   "app/organicmaps/routing/RouteMarkData");
+  // Java signature : RouteMarkData(String title, String subtitle,
+  //                                @RoutePointInfo.RouteMarkType int pointType,
+  //                                int intermediateIndex, boolean isVisible, boolean isMyPosition,
+  //                                boolean isPassed, double lat, double lon)
+  static jmethodID const pointConstructor = jni::GetConstructorID(env, pointClazz,
+                                            "(Ljava/lang/String;Ljava/lang/String;IIZZZDD)V");
+  return jni::ToJavaArray(env, pointClazz, points, [&](JNIEnv * jEnv, RouteMarkData const & data)
+  {
+    jni::TScopedLocalRef const title(env, jni::ToJavaString(env, data.m_title));
+    jni::TScopedLocalRef const subtitle(env, jni::ToJavaString(env, data.m_subTitle));
+    return env->NewObject(pointClazz, pointConstructor,
+                          title.get(), subtitle.get(),
+                          static_cast<jint>(data.m_pointType),
+                          static_cast<jint>(data.m_intermediateIndex),
+                          static_cast<jboolean>(data.m_isVisible),
+                          static_cast<jboolean>(data.m_isMyPosition),
+                          static_cast<jboolean>(data.m_isPassed),
+                          mercator::YToLat(data.m_position.y),
+                          mercator::XToLon(data.m_position.x));
+  });
 }
 
 JNIEXPORT void JNICALL
@@ -1513,7 +1642,49 @@ Java_app_organicmaps_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass,
 JNIEXPORT jobject JNICALL
 Java_app_organicmaps_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass)
 {
-  return CreateTransitRouteInfo(env, frm()->GetRoutingManager().GetTransitRouteInfo());
+  auto const routeInfo = frm()->GetRoutingManager().GetTransitRouteInfo();
+
+  static jclass const transitStepClass = jni::GetGlobalClassRef(env,
+                                         "app/organicmaps/routing/TransitStepInfo");
+  // Java signature : TransitStepInfo(@TransitType int type, @Nullable String distance, @Nullable String distanceUnits,
+  //                                  int timeInSec, @Nullable String number, int color, int intermediateIndex)
+  static jmethodID const transitStepConstructor = jni::GetConstructorID(env, transitStepClass,
+                                                  "(ILjava/lang/String;Ljava/lang/String;ILjava/lang/String;II)V");
+
+  jni::TScopedLocalRef const steps(env, jni::ToJavaArray(env, transitStepClass,
+                                                         routeInfo.m_steps,
+                                                         [&](JNIEnv * jEnv, TransitStepInfo const & stepInfo)
+  {
+      jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, stepInfo.m_distanceStr));
+      jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, stepInfo.m_distanceUnitsSuffix));
+      jni::TScopedLocalRef const number(env, jni::ToJavaString(env, stepInfo.m_number));
+      return env->NewObject(transitStepClass, transitStepConstructor,
+                            static_cast<jint>(stepInfo.m_type),
+                            distance.get(),
+                            distanceUnits.get(),
+                            static_cast<jint>(stepInfo.m_timeInSec),
+                            number.get(),
+                            static_cast<jint>(stepInfo.m_colorARGB),
+                            static_cast<jint>(stepInfo.m_intermediateIndex));
+  }));
+
+  static jclass const transitRouteInfoClass = jni::GetGlobalClassRef(env,
+                                                                     "app/organicmaps/routing/TransitRouteInfo");
+  // Java signature : TransitRouteInfo(@NonNull String totalDistance, @NonNull String totalDistanceUnits, int totalTimeInSec,
+  //                                   @NonNull String totalPedestrianDistance, @NonNull String totalPedestrianDistanceUnits,
+  //                                   int totalPedestrianTimeInSec, @NonNull TransitStepInfo[] steps)
+  static jmethodID const transitRouteInfoConstructor = jni::GetConstructorID(env, transitRouteInfoClass,
+                                                                             "(Ljava/lang/String;Ljava/lang/String;I"
+                                                                             "Ljava/lang/String;Ljava/lang/String;I"
+                                                                             "[Lapp/organicmaps/routing/TransitStepInfo;)V");
+  jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, routeInfo.m_totalDistanceStr));
+  jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, routeInfo.m_totalDistanceUnitsSuffix));
+  jni::TScopedLocalRef const distancePedestrian(env, jni::ToJavaString(env, routeInfo.m_totalPedestrianDistanceStr));
+  jni::TScopedLocalRef const distancePedestrianUnits(env, jni::ToJavaString(env, routeInfo.m_totalPedestrianUnitsSuffix));
+  return env->NewObject(transitRouteInfoClass, transitRouteInfoConstructor,
+                        distance.get(), distanceUnits.get(), static_cast<jint>(routeInfo.m_totalTimeInSec),
+                        distancePedestrian.get(), distancePedestrianUnits.get(), static_cast<jint>(routeInfo.m_totalPedestrianTimeInSec),
+                        steps.get());
 }
 
 JNIEXPORT void JNICALL
@@ -1649,6 +1820,25 @@ Java_app_organicmaps_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint
   return jni::ToJavaString(env, value);
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeSetChoosePositionMode(JNIEnv *, jclass, jint mode, jboolean isBusiness,
+                                                           jboolean applyPosition)
+{
+  // TODO(AB): Move this code into the Framework to share with iOS and other platforms.
+  auto const f = frm();
+  if (applyPosition && f->HasPlacePageInfo())
+    g_framework->SetChoosePositionMode(static_cast<android::ChoosePositionMode>(mode), isBusiness,
+                                       &f->GetCurrentPlacePageInfo().GetMercator());
+  else
+    g_framework->SetChoosePositionMode(static_cast<android::ChoosePositionMode>(mode), isBusiness, nullptr);
+}
+
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetChoosePositionMode(JNIEnv *, jclass)
+{
+  return static_cast<jint>(g_framework->GetChoosePositionMode());
+}
+
 JNIEXPORT jboolean JNICALL
 Java_app_organicmaps_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass)
 {

android/app/src/main/cpp/app/organicmaps/MwmApplication.cpp

@@ -0,0 +1,60 @@
+#include "app/organicmaps/Framework.hpp"
+
+#include "app/organicmaps/platform/AndroidPlatform.hpp"
+
+#include "app/organicmaps/core/jni_helper.hpp"
+
+extern "C"
+{
+  // static void nativeSetSettingsDir(String settingsPath);
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_MwmApplication_nativeSetSettingsDir(JNIEnv * env, jclass clazz, jstring settingsPath)
+  {
+    android::Platform::Instance().SetSettingsDir(jni::ToNativeString(env, settingsPath));
+  }
+
+  // static void nativeInitPlatform(Context context, String apkPath, String storagePath, String privatePath, String tmpPath,
+  // String flavorName, String buildType, boolean isTablet);
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_MwmApplication_nativeInitPlatform(JNIEnv * env, jclass clazz, jobject context,
+                                                         jstring apkPath, jstring writablePath,
+                                                         jstring privatePath, jstring tmpPath,
+                                                         jstring flavorName, jstring buildType,
+                                                         jboolean isTablet)
+  {
+    android::Platform::Instance().Initialize(env, context, apkPath, writablePath, privatePath, tmpPath,
+                                             flavorName, buildType, isTablet);
+  }
+
+  // static void nativeInitFramework(@NonNull Runnable onComplete);
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_MwmApplication_nativeInitFramework(JNIEnv * env, jclass clazz, jobject onComplete)
+  {
+    if (!g_framework)
+    {
+      g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref(onComplete)]()
+      {
+        JNIEnv * env = jni::GetEnv();
+        jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
+        env->CallVoidMethod(*onComplete, methodId);
+      });
+    }
+  }
+
+  // static void nativeAddLocalization(String name, String value);
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_MwmApplication_nativeAddLocalization(JNIEnv * env, jclass clazz, jstring name, jstring value)
+  {
+    g_framework->AddString(jni::ToNativeString(env, name),
+                           jni::ToNativeString(env, value));
+  }
+
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_MwmApplication_nativeOnTransit(JNIEnv *, jclass, jboolean foreground)
+  {
+    if (static_cast<bool>(foreground))
+      g_framework->NativeFramework()->EnterForeground();
+    else
+      g_framework->NativeFramework()->EnterBackground();
+  }
+}

android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp

@@ -1,7 +1,5 @@
 #include "UserMarkHelper.hpp"
 
-#include "app/organicmaps/sdk/routing/RoutePointInfo.hpp"
-
 #include "map/elevation_info.hpp"
 #include "map/place_page_info.hpp"
 
@@ -49,7 +47,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje
   static jmethodID const ctorId = jni::GetConstructorID(
       env, g_mapObjectClazz,
       "("
-      "Lapp/organicmaps/bookmarks/data/FeatureId;"      // featureId
+      "Lapp/organicmaps/bookmarks/data/FeatureId;" // featureId
       "I"                                               // mapObjectType
       "Ljava/lang/String;"                              // title
       "Ljava/lang/String;"                              // secondaryTitle
@@ -57,7 +55,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje
       "Ljava/lang/String;"                              // address
       "DD"                                              // lat, lon
       "Ljava/lang/String;"                              // appId
-      "Lapp/organicmaps/sdk/routing/RoutePointInfo;"    // routePointInfo
+      "Lapp/organicmaps/routing/RoutePointInfo;"   // routePointInfo
       "I"                                               // openingMode
       "Lapp/organicmaps/sdk/search/Popularity;"         // popularity
       "Ljava/lang/String;"                              // description
@@ -106,7 +104,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info,
           jni::GetConstructorID(env, g_bookmarkClazz,
                                 "(Lapp/organicmaps/bookmarks/data/FeatureId;JJLjava/lang/String;"
                                 "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
-                                "Lapp/organicmaps/sdk/routing/RoutePointInfo;"
+                                "Lapp/organicmaps/routing/RoutePointInfo;"
                                 "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
                                 "[Ljava/lang/String;)V");
   static jmethodID const featureCtorId =
@@ -215,6 +213,14 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
                          routingPointInfo.get(), popularity, jrawTypes.get());
 }
 
+jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info)
+{
+  static jclass const clazz = jni::GetGlobalClassRef(env, "app/organicmaps/routing/RoutePointInfo");
+  static jmethodID const ctorId = jni::GetConstructorID(env, clazz, "(II)V");
+  int const markType = static_cast<int>(info.GetRouteMarkType());
+  return env->NewObject(clazz, ctorId, markType, info.GetIntermediateIndex());
+}
+
 jobject CreateFeatureId(JNIEnv * env, FeatureID const & fid)
 {
   static jmethodID const featureCtorId =

android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp

@@ -40,6 +40,8 @@ jobjectArray ToRatingArray(JNIEnv * env, std::vector<std::string> const & rating
 
 jobject CreateLocalAdInfo(JNIEnv * env, place_page::Info const & info);
 
+jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info);
+
 jobject CreateFeatureId(JNIEnv * env, FeatureID const & fid);
 jobjectArray ToFeatureIdArray(JNIEnv * env, std::vector<FeatureID> const & ids);
 }  // namespace usermark_helper

android/app/src/main/cpp/app/organicmaps/routing/RoutingOptions.cpp

@@ -5,15 +5,16 @@
 
 routing::RoutingOptions::Road makeValue(jint option)
 {
-  auto const road = static_cast<uint8_t>(1u << static_cast<int>(option));
+  uint8_t const road = static_cast<uint8_t>(1u << static_cast<int>(option));
   CHECK_LESS(road, static_cast<uint8_t>(routing::RoutingOptions::Road::Max), ());
   return static_cast<routing::RoutingOptions::Road>(road);
 }
 
 extern "C"
 {
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_routing_RoutingOptions_nativeHasOption(JNIEnv *, jclass,
-                                                                                           jint option)
+
+JNIEXPORT jboolean JNICALL
+Java_app_organicmaps_routing_RoutingOptions_nativeHasOption(JNIEnv * env, jclass clazz, jint option)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   routing::RoutingOptions routingOptions = routing::RoutingOptions::LoadCarOptionsFromSettings();
@@ -21,7 +22,8 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_routing_RoutingOptions_nativ
   return static_cast<jboolean>(routingOptions.Has(road));
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_routing_RoutingOptions_nativeAddOption(JNIEnv *, jclass, jint option)
+JNIEXPORT void JNICALL
+Java_app_organicmaps_routing_RoutingOptions_nativeAddOption(JNIEnv * env, jclass clazz, jint option)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   routing::RoutingOptions routingOptions = routing::RoutingOptions::LoadCarOptionsFromSettings();
@@ -30,7 +32,9 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_routing_RoutingOptions_nativeAdd
   routing::RoutingOptions::SaveCarOptionsToSettings(routingOptions);
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_routing_RoutingOptions_nativeRemoveOption(JNIEnv *, jclass, jint option)
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_routing_RoutingOptions_nativeRemoveOption(JNIEnv * env, jclass clazz, jint option)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   routing::RoutingOptions routingOptions = routing::RoutingOptions::LoadCarOptionsFromSettings();

android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp

@@ -1,26 +0,0 @@
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "app/organicmaps/Framework.hpp"
-
-#include "indexer/map_style.hpp"
-
-extern "C"
-{
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_ChoosePositionMode_nativeSet(JNIEnv *, jclass, jint mode,
-                                                                             jboolean isBusiness,
-                                                                             jboolean applyPosition)
-{
-  // TODO(AB): Move this code into the Framework to share with iOS and other platforms.
-  auto const f = frm();
-  if (applyPosition && f->HasPlacePageInfo())
-    g_framework->SetChoosePositionMode(static_cast<android::ChoosePositionMode>(mode), isBusiness,
-                                       &f->GetCurrentPlacePageInfo().GetMercator());
-  else
-    g_framework->SetChoosePositionMode(static_cast<android::ChoosePositionMode>(mode), isBusiness, nullptr);
-}
-
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_ChoosePositionMode_nativeGet(JNIEnv *, jclass)
-{
-  return static_cast<jint>(g_framework->GetChoosePositionMode());
-}
-}

android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp

@@ -1,27 +0,0 @@
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "app/organicmaps/Framework.hpp"
-
-#include "indexer/map_style.hpp"
-
-extern "C"
-{
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapStyle_nativeSet(JNIEnv *, jclass, jint mapStyle)
-{
-  auto const val = static_cast<MapStyle>(mapStyle);
-  if (val != g_framework->GetMapStyle())
-    g_framework->SetMapStyle(val);
-}
-
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_MapStyle_nativeGet(JNIEnv *, jclass)
-{
-  return g_framework->GetMapStyle();
-}
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapStyle_nativeMark(JNIEnv *, jclass, jint mapStyle)
-{
-  auto const val = static_cast<MapStyle>(mapStyle);
-  if (val != g_framework->GetMapStyle())
-    g_framework->MarkMapStyle(val);
-}
-}

android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp

@@ -1,56 +0,0 @@
-#include "app/organicmaps/Framework.hpp"
-
-#include "app/organicmaps/platform/AndroidPlatform.hpp"
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-extern "C"
-{
-// static void nativeSetSettingsDir(String settingsPath);
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeSetSettingsDir(JNIEnv * env, jclass clazz,
-                                                                                 jstring settingsPath)
-{
-  android::Platform::Instance().SetSettingsDir(jni::ToNativeString(env, settingsPath));
-}
-
-// static void nativeInitPlatform(Context context, String apkPath, String storagePath, String privatePath, String
-// tmpPath, String flavorName, String buildType, boolean isTablet);
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitPlatform(
-  JNIEnv * env, jclass clazz, jobject context, jstring apkPath, jstring writablePath, jstring privatePath,
-  jstring tmpPath, jstring flavorName, jstring buildType, jboolean isTablet)
-{
-  android::Platform::Instance().Initialize(env, context, apkPath, writablePath, privatePath, tmpPath, flavorName,
-                                           buildType, isTablet);
-}
-
-// static void nativeInitFramework(@NonNull Runnable onComplete);
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(JNIEnv * env, jclass clazz,
-                                                                                jobject onComplete)
-{
-  if (!g_framework)
-  {
-    g_framework = std::make_unique<android::Framework>(
-      [onComplete = jni::make_global_ref(onComplete)]()
-      {
-        JNIEnv * env = jni::GetEnv();
-        jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
-        env->CallVoidMethod(*onComplete, methodId);
-      });
-  }
-}
-
-// static void nativeAddLocalization(String name, String value);
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeAddLocalization(JNIEnv * env, jclass clazz,
-                                                                                  jstring name, jstring value)
-{
-  g_framework->AddString(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
-}
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeOnTransit(JNIEnv *, jclass, jboolean foreground)
-{
-  if (static_cast<bool>(foreground))
-    g_framework->NativeFramework()->EnterForeground();
-  else
-    g_framework->NativeFramework()->EnterBackground();
-}
-}

android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp

@@ -1,41 +0,0 @@
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "app/organicmaps/Framework.hpp"
-
-#include "indexer/map_style.hpp"
-
-extern "C"
-{
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Router_nativeSet(JNIEnv *, jclass, jint routerType)
-{
-  using Type = routing::RouterType;
-  Type type;
-  switch (routerType)
-  {
-  case 0: type = Type::Vehicle; break;
-  case 1: type = Type::Pedestrian; break;
-  case 2: type = Type::Bicycle; break;
-  case 3: type = Type::Transit; break;
-  case 4: type = Type::Ruler; break;
-  default: assert(false); break;
-  }
-  frm()->GetRoutingManager().SetRouter(type);
-}
-
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Router_nativeGet(JNIEnv *, jclass)
-{
-  return static_cast<jint>(frm()->GetRoutingManager().GetRouter());
-}
-
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Router_nativeGetLastUsed(JNIEnv *, jclass)
-{
-  return static_cast<jint>(frm()->GetRoutingManager().GetLastUsedRouter());
-}
-
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Router_nativeGetBest(JNIEnv *, jclass, jdouble srcLat, jdouble srcLon,
-                                                                     jdouble dstLat, jdouble dstLon)
-{
-  return static_cast<jint>(frm()->GetRoutingManager().GetBestRouter(mercator::FromLatLon(srcLat, srcLon),
-                                                                    mercator::FromLatLon(dstLat, dstLon)));
-}
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "geometry/point2d.hpp"
-
-#include <vector>
-
-jobjectArray CreateJunctionInfoArray(JNIEnv * env, std::vector<m2::PointD> const & junctionPoints)
-{
-  static jclass const junctionClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/JunctionInfo");
-  // Java signature : JunctionInfo(double lat, double lon)
-  static jmethodID const junctionConstructor = jni::GetConstructorID(env, junctionClazz, "(DD)V");
-
-  return jni::ToJavaArray(env, junctionClazz, junctionPoints,
-                          [](JNIEnv * env, m2::PointD const & point)
-                          {
-                            return env->NewObject(junctionClazz, junctionConstructor, mercator::YToLat(point.y),
-                                                  mercator::XToLon(point.x));
-                          });
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "geometry/point2d.hpp"
-
-#include <vector>
-
-jobjectArray CreateRouteMarkDataArray(JNIEnv * env, std::vector<RouteMarkData> const & points)
-{
-  static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/RouteMarkData");
-  // Java signature : RouteMarkData(String title, String subtitle, int pointType,
-  //                                int intermediateIndex, boolean isVisible, boolean isMyPosition,
-  //                                boolean isPassed, double lat, double lon)
-  static jmethodID const pointConstructor =
-    jni::GetConstructorID(env, pointClazz, "(Ljava/lang/String;Ljava/lang/String;IIZZZDD)V");
-  return jni::ToJavaArray(env, pointClazz, points,
-                          [&](JNIEnv * jEnv, RouteMarkData const & data)
-                          {
-                            jni::TScopedLocalRef const title(env, jni::ToJavaString(env, data.m_title));
-                            jni::TScopedLocalRef const subtitle(env, jni::ToJavaString(env, data.m_subTitle));
-                            return env->NewObject(
-                              pointClazz, pointConstructor, title.get(), subtitle.get(),
-                              static_cast<jint>(data.m_pointType), static_cast<jint>(data.m_intermediateIndex),
-                              static_cast<jboolean>(data.m_isVisible), static_cast<jboolean>(data.m_isMyPosition),
-                              static_cast<jboolean>(data.m_isPassed), mercator::YToLat(data.m_position.y),
-                              mercator::XToLon(data.m_position.x));
-                          });
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkType.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/sdk/routing/RouteMarkType.hpp"
-
-#include "map/routing_mark.hpp"
-
-RouteMarkType GetRouteMarkType(JNIEnv * env, jobject markType)
-{
-  static jmethodID const ordinal = jni::GetMethodID(env, markType, "ordinal", "()I");
-
-  return static_cast<RouteMarkType>(env->CallIntMethod(markType, ordinal));
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "map/place_page_info.hpp"
-
-jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info)
-{
-  static jclass const clazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/RoutePointInfo");
-  static jmethodID const ctorId = jni::GetConstructorID(env, clazz, "(II)V");
-  int const markType = static_cast<int>(info.GetRouteMarkType());
-  return env->NewObject(clazz, ctorId, markType, info.GetIntermediateIndex());
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp

@@ -1,38 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-jobject GetRebuildAfterPointsLoading(JNIEnv * env)
-{
-  static jobject rebuildAfterPointsLoading = nullptr;
-  if (rebuildAfterPointsLoading)
-    return rebuildAfterPointsLoading;
-
-  // Find the RouteRecommendationType class
-  jclass routeRecommendationTypeClass = env->FindClass("app/organicmaps/sdk/routing/RouteRecommendationType");
-  ASSERT(routeRecommendationTypeClass, ());
-
-  // Get the values() method of RouteRecommendationType
-  jmethodID valuesMethod = env->GetStaticMethodID(routeRecommendationTypeClass, "values",
-                                                  "()[Lapp/organicmaps/sdk/routing/RouteRecommendationType;");
-  ASSERT(valuesMethod, ());
-
-  // Call values() to get all enum constants
-  jobjectArray enumConstants = (jobjectArray)env->CallStaticObjectMethod(routeRecommendationTypeClass, valuesMethod);
-  ASSERT(enumConstants, ());
-
-  // Retrieve the first (and only) constant, RebuildAfterPointsLoading
-  rebuildAfterPointsLoading = env->NewGlobalRef(env->GetObjectArrayElement(enumConstants, 0));
-  ASSERT(rebuildAfterPointsLoading, ());
-
-  return rebuildAfterPointsLoading;
-}
-
-jobject GetRouteRecommendationType(JNIEnv * env, RoutingManager::Recommendation recommendation)
-{
-  switch (recommendation)
-  {
-  case RoutingManager::Recommendation::RebuildAfterPointsLoading: return GetRebuildAfterPointsLoading(env);
-  default: ASSERT_FAIL("Unknown recommendation type");
-  }
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp

@@ -1,35 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-#include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp"
-#include "app/organicmaps/util/Distance.hpp"
-
-#include "map/routing_manager.hpp"
-
-jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, RoutingManager & rm)
-{
-  static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/RoutingInfo");
-  // Java signature : RoutingInfo(Distance distToTarget, Distance distToTurn,
-  //                              String currentStreet, String nextStreet, String nextNextStreet,
-  //                              double completionPercent, int vehicleTurnOrdinal, int
-  //                              vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
-  //                              int totalTime, SingleLaneInfo[] lanes)
-  static jmethodID const ctorRouteInfoID =
-    jni::GetConstructorID(env, klass,
-                          "(Lapp/organicmaps/util/Distance;Lapp/organicmaps/util/Distance;"
-                          "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
-                          "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V");
-
-  jobjectArray jLanes = CreateLanesInfo(env, info.m_lanes);
-
-  auto const isSpeedCamLimitExceeded = rm.IsSpeedCamLimitExceeded();
-  auto const shouldPlaySignal = rm.GetSpeedCamManager().ShouldPlayBeepSignal();
-  jobject const result = env->NewObject(
-    klass, ctorRouteInfoID, ToJavaDistance(env, info.m_distToTarget), ToJavaDistance(env, info.m_distToTurn),
-    jni::ToJavaString(env, info.m_currentStreetName), jni::ToJavaString(env, info.m_nextStreetName),
-    jni::ToJavaString(env, info.m_nextNextStreetName), info.m_completionPercent, info.m_turn, info.m_nextTurn,
-    info.m_pedestrianTurn, info.m_exitNum, info.m_time, jLanes, info.m_speedLimitMps,
-    static_cast<jboolean>(isSpeedCamLimitExceeded), static_cast<jboolean>(shouldPlaySignal));
-  ASSERT(result, (jni::DescribeException()));
-  return result;
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp

@@ -1,34 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "routing/following_info.hpp"
-
-#include <vector>
-
-jobjectArray CreateLanesInfo(JNIEnv * env, std::vector<routing::FollowingInfo::SingleLaneInfoClient> const & lanes)
-{
-  if (lanes.empty())
-    return nullptr;
-
-  static jclass const laneClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/SingleLaneInfo");
-  auto const lanesSize = static_cast<jsize>(lanes.size());
-  jobjectArray jLanes = env->NewObjectArray(lanesSize, laneClass, nullptr);
-  ASSERT(jLanes, (jni::DescribeException()));
-  static jmethodID const ctorSingleLaneInfoID = jni::GetConstructorID(env, laneClass, "([BZ)V");
-
-  for (jsize j = 0; j < lanesSize; ++j)
-  {
-    auto const laneSize = static_cast<jsize>(lanes[j].m_lane.size());
-    jni::TScopedLocalByteArrayRef singleLane(env, env->NewByteArray(laneSize));
-    ASSERT(singleLane.get(), (jni::DescribeException()));
-    env->SetByteArrayRegion(singleLane.get(), 0, laneSize, lanes[j].m_lane.data());
-
-    jni::TScopedLocalRef singleLaneInfo(
-      env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(), lanes[j].m_isRecommended));
-    ASSERT(singleLaneInfo.get(), (jni::DescribeException()));
-    env->SetObjectArrayElement(jLanes, j, singleLaneInfo.get());
-  }
-
-  return jLanes;
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp

@@ -1,32 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "app/organicmaps/sdk/routing/TransitStepInfo.hpp"
-
-#include "map/transit/transit_display.hpp"
-
-jobject CreateTransitRouteInfo(JNIEnv * env, TransitRouteInfo const & routeInfo)
-{
-  jobjectArray steps = CreateTransitStepInfoArray(env, routeInfo.m_steps);
-
-  static jclass const transitRouteInfoClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/TransitRouteInfo");
-  // Java signature : TransitRouteInfo(@NonNull String totalDistance, @NonNull String totalDistanceUnits,
-  //                                   int totalTimeInSec, @NonNull String totalPedestrianDistance, @NonNull String
-  //                                   totalPedestrianDistanceUnits, int totalPedestrianTimeInSec, @NonNull
-  //                                   TransitStepInfo[] steps)
-  static jmethodID const transitRouteInfoConstructor =
-    jni::GetConstructorID(env, transitRouteInfoClass,
-                          "(Ljava/lang/String;Ljava/lang/String;I"
-                          "Ljava/lang/String;Ljava/lang/String;I"
-                          "[Lapp/organicmaps/sdk/routing/TransitStepInfo;)V");
-  jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, routeInfo.m_totalDistanceStr));
-  jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, routeInfo.m_totalDistanceUnitsSuffix));
-  jni::TScopedLocalRef const distancePedestrian(env, jni::ToJavaString(env, routeInfo.m_totalPedestrianDistanceStr));
-  jni::TScopedLocalRef const distancePedestrianUnits(env,
-                                                     jni::ToJavaString(env, routeInfo.m_totalPedestrianUnitsSuffix));
-  return env->NewObject(transitRouteInfoClass, transitRouteInfoConstructor, distance.get(), distanceUnits.get(),
-                        static_cast<jint>(routeInfo.m_totalTimeInSec), distancePedestrian.get(),
-                        distancePedestrianUnits.get(), static_cast<jint>(routeInfo.m_totalPedestrianTimeInSec), steps);
-}

android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/core/jni_helper.hpp"
-
-#include "map/transit/transit_display.hpp"
-
-#include <vector>
-
-jobjectArray CreateTransitStepInfoArray(JNIEnv * env, std::vector<TransitStepInfo> const & steps)
-{
-  static jclass const transitStepClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/TransitStepInfo");
-  // Java signature : TransitStepInfo(int type, @Nullable String distance, @Nullable String distanceUnits,
-  //                                  int timeInSec, @Nullable String number, int color, int intermediateIndex)
-  static jmethodID const transitStepConstructor =
-    jni::GetConstructorID(env, transitStepClass, "(ILjava/lang/String;Ljava/lang/String;ILjava/lang/String;II)V");
-
-  return jni::ToJavaArray(
-    env, transitStepClass, steps,
-    [&](JNIEnv * jEnv, TransitStepInfo const & stepInfo)
-    {
-      jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, stepInfo.m_distanceStr));
-      jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, stepInfo.m_distanceUnitsSuffix));
-      jni::TScopedLocalRef const number(env, jni::ToJavaString(env, stepInfo.m_number));
-      return env->NewObject(transitStepClass, transitStepConstructor, static_cast<jint>(stepInfo.m_type),
-                            distance.get(), distanceUnits.get(), static_cast<jint>(stepInfo.m_timeInSec), number.get(),
-                            static_cast<jint>(stepInfo.m_colorARGB), static_cast<jint>(stepInfo.m_intermediateIndex));
-    });
-}

android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java

@@ -8,6 +8,9 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.TextView;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -30,12 +33,8 @@ import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
 
 import java.util.List;
 import java.util.Objects;
@@ -54,10 +53,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   private static final int ERR_NO_MORE_FILES = -5;
   private static final int ERR_FILE_IN_PROGRESS = -6;
 
-  private MaterialTextView mTvMessage;
+  private TextView mTvMessage;
   private LinearProgressIndicator mProgress;
-  private MaterialButton mBtnDownload;
-  private MaterialCheckBox mChbDownloadCountry;
+  private Button mBtnDownload;
+  private CheckBox mChbDownloadCountry;
 
   private String mCurrentCountry;
 
@@ -111,17 +110,17 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
         return;
       }
 
-      CountryItem item = CountryItem.fill(mCurrentCountry);
-      String fileSizeString = StringUtils.getFileSizeString(getApplicationContext(), item.totalSize);
+      int status = MapManager.nativeGetStatus(mCurrentCountry);
 
-      if (item.status != CountryItem.STATUS_DONE)
+      if (status != CountryItem.STATUS_DONE)
       {
+        String name = getFormattedCountryName(mCurrentCountry);
         UiUtils.show(mChbDownloadCountry);
         String checkBoxText;
-        if (item.status == CountryItem.STATUS_UPDATABLE)
-          checkBoxText = String.format(getString(R.string.update_country_ask), item.name, fileSizeString);
+        if (status == CountryItem.STATUS_UPDATABLE)
+          checkBoxText = String.format(getString(R.string.update_country_ask), name);
         else
-          checkBoxText = String.format(getString(R.string.download_country_ask), item.name, fileSizeString);
+          checkBoxText = String.format(getString(R.string.download_country_ask), name);
 
         mChbDownloadCountry.setText(checkBoxText);
       }
@@ -130,6 +129,18 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
     }
   };
 
+  private String getFormattedCountryName(String mCurrentCountry) {
+    String name = MapManager.nativeGetName(mCurrentCountry);
+    CountryItem country = CountryItem.fill(mCurrentCountry);
+    String sizeText = StringUtils.getFileSizeString(DownloadResourcesLegacyActivity.this, country.totalSize);
+
+    if (!TextUtils.isEmpty(sizeText)) {
+      name = name + " (" + sizeText + ")";
+    }
+
+    return name;
+  }
+
   private final Listener mResourcesDownloadListener = new Listener()
   {
     @Override
@@ -384,10 +395,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
       if (mCurrentCountry != null && mChbDownloadCountry.isChecked())
       {
-        UiUtils.hide(mChbDownloadCountry);
         CountryItem item = CountryItem.fill(mCurrentCountry);
-        String fileSizeString = StringUtils.getFileSizeString(this, item.totalSize);
-        mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name, fileSizeString));
+        UiUtils.hide(mChbDownloadCountry);
+        mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name));
         mProgress.setMax((int)item.totalSize);
         mProgress.setProgressCompat(0, true);
 

android/app/src/main/java/app/organicmaps/Framework.java

@@ -2,7 +2,9 @@ package app.organicmaps;
 
 import android.graphics.Bitmap;
 
+import androidx.annotation.IntDef;
 import androidx.annotation.Keep;
+import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
@@ -13,20 +15,19 @@ import app.organicmaps.api.RequestType;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.products.Product;
 import app.organicmaps.products.ProductsConfig;
-import app.organicmaps.sdk.routing.JunctionInfo;
-import app.organicmaps.sdk.routing.RouteMarkData;
-import app.organicmaps.sdk.routing.RouteMarkType;
-import app.organicmaps.sdk.routing.RoutingInfo;
-import app.organicmaps.sdk.routing.TransitRouteInfo;
-import app.organicmaps.sdk.PlacePageActivationListener;
-import app.organicmaps.sdk.routing.RoutingListener;
-import app.organicmaps.sdk.routing.RoutingLoadPointsListener;
-import app.organicmaps.sdk.routing.RoutingProgressListener;
-import app.organicmaps.sdk.routing.RoutingRecommendationListener;
+import app.organicmaps.routing.JunctionInfo;
+import app.organicmaps.routing.RouteMarkData;
+import app.organicmaps.routing.RoutePointInfo;
+import app.organicmaps.routing.RoutingInfo;
+import app.organicmaps.routing.TransitRouteInfo;
 import app.organicmaps.settings.SettingsPrefsFragment;
+import app.organicmaps.widget.placepage.PlacePageData;
 import app.organicmaps.util.Constants;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -38,6 +39,87 @@ import java.util.Locale;
  */
 public class Framework
 {
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({MAP_STYLE_CLEAR, MAP_STYLE_DARK, MAP_STYLE_VEHICLE_CLEAR, MAP_STYLE_VEHICLE_DARK, MAP_STYLE_OUTDOORS_CLEAR, MAP_STYLE_OUTDOORS_DARK})
+
+  public @interface MapStyle {}
+
+  public static final int MAP_STYLE_CLEAR = 0;
+  public static final int MAP_STYLE_DARK = 1;
+  public static final int MAP_STYLE_VEHICLE_CLEAR = 3;
+  public static final int MAP_STYLE_VEHICLE_DARK = 4;
+  public static final int MAP_STYLE_OUTDOORS_CLEAR = 5;
+  public static final int MAP_STYLE_OUTDOORS_DARK = 6;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ ROUTER_TYPE_VEHICLE, ROUTER_TYPE_PEDESTRIAN, ROUTER_TYPE_BICYCLE, ROUTER_TYPE_TRANSIT, ROUTER_TYPE_RULER })
+
+  public @interface RouterType {}
+
+  public static final int ROUTER_TYPE_VEHICLE = 0;
+  public static final int ROUTER_TYPE_PEDESTRIAN = 1;
+  public static final int ROUTER_TYPE_BICYCLE = 2;
+  public static final int ROUTER_TYPE_TRANSIT = 3;
+  public static final int ROUTER_TYPE_RULER = 4;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ROUTE_REBUILD_AFTER_POINTS_LOADING})
+  public @interface RouteRecommendationType {}
+
+  public static final int ROUTE_REBUILD_AFTER_POINTS_LOADING = 0;
+
+  public interface PlacePageActivationListener
+  {
+    // Called from JNI.
+    @Keep
+    @SuppressWarnings("unused")
+    void onPlacePageActivated(@NonNull PlacePageData data);
+
+    // Called from JNI
+    @Keep
+    @SuppressWarnings("unused")
+    void onPlacePageDeactivated();
+
+    // Called from JNI
+    @Keep
+    @SuppressWarnings("unused")
+    void onSwitchFullScreenMode();
+  }
+
+  public interface RoutingListener
+  {
+    // Called from JNI
+    @Keep
+    @SuppressWarnings("unused")
+    @MainThread
+    void onRoutingEvent(int resultCode, String[] missingMaps);
+  }
+
+  public interface RoutingProgressListener
+  {
+    // Called from JNI.
+    @Keep
+    @SuppressWarnings("unused")
+    @MainThread
+    void onRouteBuildingProgress(float progress);
+  }
+
+  public interface RoutingRecommendationListener
+  {
+    // Called from JNI.
+    @Keep
+    @SuppressWarnings("unused")
+    void onRecommend(@RouteRecommendationType int recommendation);
+  }
+
+  public interface RoutingLoadPointsListener
+  {
+    // Called from JNI.
+    @Keep
+    @SuppressWarnings("unused")
+    void onRoutePointsLoaded(boolean success);
+  }
+
   // Used by JNI.
   @Keep
   @SuppressWarnings("unused")
@@ -219,36 +301,54 @@ public class Framework
 
   private static native void nativeSetSpeedCamManagerMode(int mode);
 
-  public static native void nativeSetRoutingListener(@NonNull RoutingListener listener);
+  public static native void nativeSetRoutingListener(RoutingListener listener);
 
-  public static native void nativeSetRouteProgressListener(@NonNull RoutingProgressListener listener);
+  public static native void nativeSetRouteProgressListener(RoutingProgressListener listener);
 
-  public static native void nativeSetRoutingRecommendationListener(@NonNull RoutingRecommendationListener listener);
+  public static native void nativeSetRoutingRecommendationListener(RoutingRecommendationListener listener);
 
-  public static native void nativeSetRoutingLoadPointsListener(@NonNull RoutingLoadPointsListener listener);
+  public static native void nativeSetRoutingLoadPointsListener(
+      @Nullable RoutingLoadPointsListener listener);
 
   public static native void nativeShowCountry(String countryId, boolean zoomToDownloadButton);
 
-  public static void addRoutePoint(RouteMarkData point)
-  {
-    addRoutePoint(point, true);
-  }
+  public static native void nativeSetMapStyle(int mapStyle);
 
-  public static void addRoutePoint(RouteMarkData point, boolean reorderIntermediatePoints)
+  @MapStyle
+  public static native int nativeGetMapStyle();
+
+  /**
+   * This method allows to set new map style without immediate applying. It can be used before
+   * engine recreation instead of nativeSetMapStyle to avoid huge flow of OpenGL invocations.
+   * @param mapStyle style index
+   */
+  public static native void nativeMarkMapStyle(int mapStyle);
+
+  public static native void nativeSetRouter(@RouterType int routerType);
+  @RouterType
+  public static native int nativeGetRouter();
+  @RouterType
+  public static native int nativeGetLastUsedRouter();
+  @RouterType
+  public static native int nativeGetBestRouter(double srcLat, double srcLon,
+                                               double dstLat, double dstLon);
+
+  public static void addRoutePoint(RouteMarkData point)
   {
     Framework.nativeAddRoutePoint(point.mTitle, point.mSubtitle, point.mPointType,
                                   point.mIntermediateIndex, point.mIsMyPosition,
-                                  point.mLat, point.mLon, reorderIntermediatePoints);
+                                  point.mLat, point.mLon);
   }
 
-  public static native void nativeAddRoutePoint(String title, String subtitle, @NonNull RouteMarkType markType,
+  public static native void nativeAddRoutePoint(String title, String subtitle,
+                                                @RoutePointInfo.RouteMarkType int markType,
                                                 int intermediateIndex, boolean isMyPosition,
-                                                double lat, double lon,
-                                                boolean reorderIntermediatePoints);
+                                                double lat, double lon);
 
   public static native void nativeRemoveRoutePoints();
 
-  public static native void nativeRemoveRoutePoint(@NonNull RouteMarkType markType, int intermediateIndex);
+  public static native void nativeRemoveRoutePoint(@RoutePointInfo.RouteMarkType int markType,
+                                                   int intermediateIndex);
 
   public static native void nativeRemoveIntermediateRoutePoints();
 
@@ -304,6 +404,23 @@ public class Framework
 
   public static native void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate);
 
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ChoosePositionMode.NONE, ChoosePositionMode.EDITOR, ChoosePositionMode.API})
+  public @interface ChoosePositionMode
+  {
+    // Keep in sync with `enum ChoosePositionMode` in Framework.hpp.
+    public static final int NONE = 0;
+    public static final int EDITOR = 1;
+    public static final int API = 2;
+  }
+  /**
+   * @param mode - see ChoosePositionMode values.
+   * @param isBusiness selection area will be bounded by building borders, if its true (eg. true for businesses in buildings).
+   * @param applyPosition if true, map'll be animated to currently selected object.
+   */
+  public static native void nativeSetChoosePositionMode(@ChoosePositionMode int mode, boolean isBusiness,
+                                                        boolean applyPosition);
+  public static native @ChoosePositionMode int nativeGetChoosePositionMode();
   public static native boolean nativeIsDownloadedMapAtScreenCenter();
 
   public static native String nativeGetActiveObjectFormattedCuisine();
@@ -329,7 +446,7 @@ public class Framework
 
   public static native void nativeMakeCrash();
 
-  public static native void nativeSetPowerManagerFacility(int facilityType, boolean state);
+    public static native void nativeSetPowerManagerFacility(int facilityType, boolean state);
   public static native int nativeGetPowerManagerScheme();
   public static native void nativeSetPowerManagerScheme(int schemeType);
   public static native void nativeSetViewportCenter(double lat, double lon, int zoom);
@@ -356,6 +473,4 @@ public class Framework
   public static native void nativeDidCloseProductsPopup(String reason);
 
   public static native void nativeDidSelectProduct(String title, String link);
-
-  public static native void nativeSaveRoute();
 }