Bump versions

Signed-off-by: pastk <pastk@users.noreply.github.com>

.github/workflows/linux-check.yaml

@@ -61,10 +61,6 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
-              libxrandr-dev \
-              libxinerama-dev \
-              libxcursor-dev \
-              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
@@ -132,10 +128,6 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
-              libxrandr-dev \
-              libxinerama-dev \
-              libxcursor-dev \
-              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \

.github/workflows/stale.yml

@@ -1,22 +0,0 @@
-name: Close stale PRs
-on:
-  schedule:
-    - cron: "0 0 * * *" # Runs every day at midnight
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-pr-stale: 180 # 6 months before warning
-          days-before-pr-close: 365 # Closed after 12 months
-          stale-pr-label: "stale"
-          stale-pr-message: "Hi! This PR has been inactive for 6 months. If it's still relevant, please update it to let us know you’d like to keep it open 😊"
-          close-pr-message: "This PR has been automatically closed after 12 months of inactivity."
-          days-before-issue-stale: -1 # Issues are never stale
-          days-before-issue-close: -1 # Issues are never closed
-          remove-stale-when-updated: true

.github/workflows/strings-check.yaml

@@ -0,0 +1,31 @@
+name: Validate translation strings
+on:
+  workflow_dispatch: # Manual trigger
+  pull_request:
+    paths:
+      - .github/workflows/strings-check.yaml  # Run check on self change
+      - data/strings/strings.txt
+      - data/strings/types_strings.txt
+      - data/strings/sound.txt
+      - data/countries_names.txt
+      - iphone/plist.txt
+      - tools/python/strings_utils.py
+
+jobs:
+  validate-translation-strings:
+    name: Validate translation strings
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3'
+
+      - name: Validate string files
+        shell: bash
+        run: |
+          for f in data/strings/strings.txt data/strings/types_strings.txt data/strings/sound.txt data/countries_names.txt iphone/plist.txt; do
+            ./tools/python/strings_utils.py --validate $f -o
+          done;
+          git diff --exit-code

.gitignore

@@ -20,7 +20,6 @@ data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
-data/edits.xml
 
 # Compiled Python
 *.pyc

.gitmodules

@@ -7,6 +7,9 @@
 [submodule "3party/protobuf/protobuf"]
   path = 3party/protobuf/protobuf
   url = https://github.com/organicmaps/protobuf.git
+[submodule "tools/twine"]
+  path = tools/twine
+  url = https://github.com/organicmaps/twine.git
 [submodule "3party/Vulkan-Headers"]
   path = 3party/Vulkan-Headers
   url = https://github.com/KhronosGroup/Vulkan-Headers.git
@@ -56,12 +59,3 @@
 [submodule "3party/utfcpp"]
 	path = 3party/utfcpp
 	url = https://github.com/nemtrif/utfcpp.git
-[submodule "3party/glfw"]
-	path = 3party/glfw
-	url = https://github.com/glfw/glfw.git
-[submodule "3party/CMake-MetalShaderSupport"]
-	path = 3party/CMake-MetalShaderSupport
-	url = https://github.com/dpogue/CMake-MetalShaderSupport.git
-[submodule "3party/imgui/imgui"]
-	path = 3party/imgui/imgui
-	url = https://github.com/ocornut/imgui

3party/CMake-MetalShaderSupport

@@ -1 +0,0 @@
-Subproject commit 989857d2e5e54869c35ad06fb21a67d12a2dbc67

3party/CMakeLists.txt

@@ -66,19 +66,4 @@ add_subdirectory(vulkan_wrapper)
 
 if (PLATFORM_DESKTOP)
   add_subdirectory(libtess2)
-
-  set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
-  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
-  set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
-  set(GLFW_INSTALL OFF CACHE BOOL "")
-  set(GLFW_VULKAN_STATIC OFF CACHE BOOL "")
-  set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
-  # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
-  set(CMAKE_OBJC_FLAGS "")
-  add_subdirectory(glfw)
-  set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
-  set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
-  set(CMAKE_OBJC_FLAGS -fobjc-arc)
-
-  add_subdirectory(imgui)
 endif()

3party/glfw

@@ -1 +0,0 @@
-Subproject commit 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50

3party/imgui/CMakeLists.txt

@@ -1,16 +0,0 @@
-project(imgui)
-
-set(SRC
-  imgui/imgui_draw.cpp
-  imgui/imgui_tables.cpp
-  imgui/imgui_widgets.cpp
-  imgui/imgui.cpp
-  imgui/backends/imgui_impl_glfw.cpp
-)
-
-add_library(${PROJECT_NAME} ${SRC})
-target_include_directories(${PROJECT_NAME} 
-  PRIVATE ${OMIM_ROOT}/3party/glfw/include
-  PUBLIC ${OMIM_ROOT}/3party/imgui/imgui
-  PUBLIC .
-)

3party/imgui/imgui

@@ -1 +0,0 @@
-Subproject commit 6982ce43f5b143c5dce5fab0ce07dd4867b705ae

CMakeLists.txt

@@ -90,19 +90,6 @@ 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(MetalShaderSupport)
-  check_language(Metal)
-  if(CMAKE_Metal_COMPILER)
-    enable_language(Metal)
-  endif()
-endif()
-
 # Sanitizer
 if (PLATFORM_DESKTOP)
   # https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
@@ -397,7 +384,6 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(qt)
     omim_add_tool_subdirectory(skin_generator)
   endif()
-  add_subdirectory(dev_sandbox)
 endif()
 
 omim_add_test_subdirectory(qt_tstfrm)

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="qt/res/logo.png" height="100"/>
+  <img src="/qt/res/logo.png" height="100"/>
 </div>
 <h1 align="center"">Organic Maps</h1>
 

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/az-AZ/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Новыя дадзеныя OpenStreetMap ад 21 студзеня
-• Адлюстраванне абмежавання хуткасці ў рэжыме навігацыі
-• Android Auto: сартаванне метак, палепшаны запыты на дазвол месцазнаходжання
-• На карту дададзены вежы
-• Дададзена настройка для адключэння спасылак на гатэлі з Kayak.com і магчымасць адмовы пры першым выкарыстанні
-• Дададзены сербская (кірыліца) і латышская мовы
+• Новыя дадзеныя OpenStreetMap ад 27 лютага
+• Магчымасць уручную расстаўляць прамежкавыя кропкі маршруту
+• Экспарт аднаго абранага трэка са спісу
+• Палепшаная маршрутызацыя для веласіпедыстаў
+• Дададзена сістэмнае апавяшчэнне пры загрузцы карт, фонавыя загрузкі больш не перарываюцца
+• Дададзены мігатлівы віджэт запісу трэка
 
 …і шматлікае іншае на omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Neue OpenStreetMap-Daten vom 21. Januar
-• Anzeige eines Geschwindigkeitsbegrenzungsschildes im Navigationsmodus
-• Serbische (Kyrillisch) und Lettische Sprachen hinzugefügt
-• Android Auto: Lesezeichen sortieren, verbessertes Erlebnis bei der Anforderung von Standortberechtigungen
-• Turm-POIs hinzugefügt
-• Eine Einstellung für Kayak.com-Hotellinks und eine Opt-out-Option bei der ersten Nutzung hinzugefügt.
+• Neue OpenStreetMap-Daten vom 27. Februar
+• Möglichkeit, Zwischenroutenpunkte manuell zu arrangieren
+• Einen einzelnen ausgewählten Track aus der Liste teilen
+• Verbesserte Routenführung für Fahrräder
+• Beim Herunterladen von Karten eine Systembenachrichtigung anzeigen und Hintergrunddownloads nicht unterbrechen
+• Ein blinkendes Trackaufzeichnungs-Widget hinzugefügt
 
 …weitere Details unter omaps.org/news

android/app/src/fdroid/play/listings/el-GR/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a Track Recording indicator on the main screen
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Nuevos datos de OpenStreetMap del 21 de enero
-• Límite de velocidad en el modo de navegación
-• Añadidos idiomas serbio (cirílico) y letón
-• Android Auto: opción de ordenar marcadores, mejorada la experiencia al solicitar ubicación
-• Añadidos PDI de torres
-• Añadidas opciones para enlaces de hotel de Kayak.com y de exclusión al primer uso
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
-…más detalles en omaps.org/news
+…more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Urtarrilaren 21ko OpenStreetMap-eko datu berriak
-• Abiadura muga erakusten da nabigazio moduan
-• Serbiera (zirilikoa) eta letoniera hizkuntzak gehitu dira
-• Android Auto: gogokoak ordena daitezke, kokapen permisuaren eskaeraren esperientzia hobetu da
-• Dorreen interes puntuak gehitu dira
-• Kayak.com-eko hotelen estekak eta lehenengo erabileran ez erakusteko aukera gehitu dira
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
-…zehaztasun gehiago omaps.org/news webgunean
+…more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Nouvelles données OpenStreetMap du 21 janvier
-• Afficher un panneau de limitation de vitesse en mode navigation
-• Ajout des langues serbe (cyrillique) et lettone
-• Android Auto : trier les signets, expérience de demande d'autorisation de localisation améliorée
-• Ajout de POI de tour
-• Ajout d'un paramètre pour les liens d'hôtel Kayak.com et d'une option de désinscription lors de la première utilisation
+• Nouvelles données OpenStreetMap du 27 février
+• Possibilité d'organiser manuellement les points d'itinéraire intermédiaires
+• Partager une seule piste sélectionnée dans la liste
+• Amélioration du routage pour les vélos
+• Afficher une notification système lors du téléchargement de cartes et ne pas interrompre les téléchargements en arrière-plan
+• Ajout d'un widget d'enregistrement de piste clignotant
 
 …plus de détails sur omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/hi-IN/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/iw-IL/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ja-JP/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ka-GE/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/km-KH/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/kn-IN/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ko-KR/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/lo-LA/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/mk-MK/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ml-IN/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/mr-IN/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ne-NP/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Nowe dane OpenStreetMap z 21 stycznia
-• Wyświetlanie znaku ograniczenia prędkości w trybie nawigacji
-• Dodano języki serbski (cyrylica) i łotewski
-• Android Auto: sortowanie zakładek, ulepszono prośbę o pozwolenie na lokalizację
-• Dodano POI dla wieży
-• Dodano ustawienie dla linków do hoteli na Kayak.com oraz możliwość wyłączenia ich przy pierwszym uruchomieniu
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
-…więcej szczegółów na omaps.org/news
+…more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Novos dados do OpenStreetMap de 21 de janeiro
-• Exibe um sinal de limite de velocidade no modo de navegação
-• Adicionados os idiomas sérvio (cirílico) e letão
-• Android Auto: classificar favoritos, experiência aprimorada de solicitação de permissão de localização
-• Adicionados POIs de torre
-• Adicionada uma configuração para links de hotéis Kayak.com e uma opção de cancelamento de primeiro uso
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
-…mais detalhes em omaps.org/news
+…more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Novos dados do OpenStreetMap a 21 de janeiro
-• Exibir um sinal de limite de velocidade no modo de navegação
-• Adicionados os idiomas sérvio (cirílico) e letão
-• Android Auto: classificar favoritos, experiência melhorada de pedido de permissão de localização
-• Adicionados POIs de torre
-• Foi adicionada uma configuração para o Kayak.com Hotel Links e uma opção de cancelamento de primeira utilização
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
-…mais detalhes em omaps.org/news
+…more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Новые данные OpenStreetMap от 21 января
-• Отображение ограничения скорости в режиме навигации
-• Android Auto: сортировка меток, улучшены запросы на разрешение местоположения
-• На карту добавлены башни
-• Добавлена ​​настройка для отключения ссылок на отели с Kayak.com и возможность отказа при первом использовании
-• Добавлены сербский (кириллица) и латышский языки
+• Новые данные OpenStreetMap от 27 февраля
+• Возможность вручную расставлять промежуточные точки маршрута
+• Экспорт одного выбранного трека из списка
+• Улучшенная маршрутизация для велосипедистов
+• Добавлено системное уведомление при загрузке карт, фоновые загрузки больше не прерываются
+• Добавлен мигающий виджет записи трека
 
 …и многое другое на omaps.org/news

android/app/src/fdroid/play/listings/si-LK/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/sv-SE/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• Нові дані OpenStreetMap від 21 січня
-• Знак перевищення швидкості підчас навігації
-• Додано перклади сербською (кирилиця) та латиською мовами
-• Android Auto: сортування міток, покращено процес запиту на отримання дозволу на розміщення
-• Вежі відображаються на мапі
-• Додано налаштування для посилань до Kayak.com для готелів та демонструється запит при першому використанні
+• Нові дані OpenStreetMap від 27 лютого
+• Можливість вручну розставляти проміжні точки маршруту
+• Експорт одного вибраного треку зі списку
+• Покращена маршрутизація для велосипедистів
+• Додано системне повідомлення під час завантаження карт, фонові завантаження більше не перериваються
+• Додано миготливий віджет запису треку
 
 …більше подробиць на omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-CN/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-HK/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-TW/release-notes.txt

@@ -1,8 +1,8 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OpenStreetMap data as of February 27
+• Ability to manually arrange intermediate route points
+• Share a single selected track from the list
+• Improved routing for bicycles
+• Display a system notification when downloading maps and don't interrupt background downloads
+• Added a flashing Track Recording widget
 
 …more details at omaps.org/news

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

@@ -1 +1 @@
-version: 2025.01.26-9-FDroid+25012609
+version: 2025.03.02-7-FDroid+25030207

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

@@ -22,13 +22,11 @@ set(SRC
   app/organicmaps/vulkan/android_vulkan_context_factory.hpp
 
   # JNI sources
-  app/organicmaps/sdk/search/DisplayedCategories.cpp
-  app/organicmaps/sdk/search/SearchEngine.cpp
-  app/organicmaps/sdk/search/SearchRecents.cpp
   app/organicmaps/core/jni_helper.cpp
   app/organicmaps/core/jni_java_methods.cpp
   app/organicmaps/core/logging.cpp
   app/organicmaps/bookmarks/data/BookmarkManager.cpp
+  app/organicmaps/DisplayedCategories.cpp
   app/organicmaps/DownloadResourcesLegacyActivity.cpp
   app/organicmaps/editor/Editor.cpp
   app/organicmaps/editor/OpeningHours.cpp
@@ -40,6 +38,8 @@ set(SRC
   app/organicmaps/MapManager.cpp
   app/organicmaps/MwmApplication.cpp
   app/organicmaps/routing/RoutingOptions.cpp
+  app/organicmaps/SearchEngine.cpp
+  app/organicmaps/SearchRecents.cpp
   app/organicmaps/settings/UnitLocale.cpp
   app/organicmaps/settings/MapLanguageCode.cpp
   app/organicmaps/sound/tts.cpp

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

@@ -5,7 +5,8 @@
 
 extern "C"
 {
-JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_search_DisplayedCategories_nativeGetKeys(JNIEnv * env, jclass)
+JNIEXPORT jobjectArray JNICALL
+Java_app_organicmaps_search_DisplayedCategories_nativeGetKeys(JNIEnv * env, jclass clazz)
 {
   ::Framework * fr = g_framework->NativeFramework();
   ASSERT(fr, ());

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

@@ -39,7 +39,7 @@ Results g_results;
 
 // Timestamp of last search query. Results with older stamps are ignored.
 jlong g_queryTimestamp;
-// Implements 'SearchListener' java interface.
+// Implements 'NativeSearchListener' java interface.
 jobject g_javaListener;
 jmethodID g_updateResultsId;
 jmethodID g_endResultsId;
@@ -52,7 +52,7 @@ jmethodID g_descriptionConstructor;
 jclass g_popularityClass;
 jmethodID g_popularityConstructor;
 
-// Implements 'MapSearchListener' java interface.
+// Implements 'NativeMapSearchListener' java interface.
 jmethodID g_mapResultsMethod;
 jclass g_mapResultClass;
 jmethodID g_mapResultCtor;
@@ -232,21 +232,21 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results,
 extern "C"
 {
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
+  Java_app_organicmaps_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
   {
     g_javaListener = env->NewGlobalRef(thiz);
     // public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp)
     g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate",
-                                         "([Lapp/organicmaps/sdk/search/SearchResult;J)V");
+                                         "([Lapp/organicmaps/search/SearchResult;J)V");
     // public void onResultsEnd(long timestamp)
     g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V");
-    g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult");
+    g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult");
     g_resultConstructor = jni::GetConstructorID(
         env, g_resultClass,
-        "(Ljava/lang/String;Lapp/organicmaps/sdk/search/SearchResult$Description;DD[I[I"
-        "Lapp/organicmaps/sdk/search/Popularity;)V");
+        "(Ljava/lang/String;Lapp/organicmaps/search/SearchResult$Description;DD[I[I"
+          "Lapp/organicmaps/search/Popularity;)V");
     g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I[I)V");
-    g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult$Description");
+    g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult$Description");
     /*
         Description(FeatureId featureId, String featureType, String region, Distance distance,
                     String description, int openNow, int minutesUntilOpen, int minutesUntilClosed,
@@ -257,12 +257,12 @@ extern "C"
                                                      "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/util/Distance;"
                                                      "Ljava/lang/String;IIIZ)V");
 
-    g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
+    g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/Popularity");
     g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");
 
     g_mapResultsMethod = jni::GetMethodID(env, g_javaListener, "onMapSearchResults",
-                                          "([Lapp/organicmaps/sdk/search/MapSearchListener$Result;JZ)V");
-    g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/MapSearchListener$Result");
+                                          "([Lapp/organicmaps/search/NativeMapSearchListener$Result;JZ)V");
+    g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/NativeMapSearchListener$Result");
     g_mapResultCtor = jni::GetConstructorID(env, g_mapResultClass, "(Ljava/lang/String;Ljava/lang/String;)V");
 
     g_updateBookmarksResultsId =
@@ -271,7 +271,7 @@ extern "C"
       jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsEnd", "([JJ)V");
   }
 
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearch(
+  JNIEXPORT jboolean JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearch(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
       jstring lang, jlong timestamp, jboolean hasPosition, jdouble lat, jdouble lon)
   {
@@ -288,7 +288,7 @@ extern "C"
     return searchStarted;
   }
 
-  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunInteractiveSearch(
+  JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunInteractiveSearch(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
       jstring lang, jlong timestamp, jboolean isMapAndTable, jboolean hasPosition, jdouble lat, jdouble lon)
   {
@@ -321,7 +321,7 @@ extern "C"
     }
   }
 
-  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchMaps(
+  JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearchMaps(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp)
   {
     storage::DownloaderSearchParams params{
@@ -334,7 +334,7 @@ extern "C"
       g_queryTimestamp = timestamp;
   }
 
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchInBookmarks(
+  JNIEXPORT jboolean JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearchInBookmarks(
       JNIEnv * env, jclass clazz, jbyteArray query, jlong catId, jlong timestamp)
   {
     search::BookmarksSearchParams params{
@@ -350,25 +350,25 @@ extern "C"
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz, jint index)
+  Java_app_organicmaps_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz, jint index)
   {
     g_framework->NativeFramework()->ShowSearchResult(g_results[index]);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Viewport);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Everywhere);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches();
   }

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

@@ -0,0 +1,40 @@
+#include "Framework.hpp"
+
+#include "search/result.hpp"
+
+#include "app/organicmaps/core/jni_helper.hpp"
+#include "app/organicmaps/core/jni_java_methods.hpp"
+
+using SearchRequest = search::QuerySaver::SearchRequest;
+
+extern "C"
+{
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_search_SearchRecents_nativeGetList(JNIEnv * env, jclass thiz, jobject result)
+  {
+    auto const & items = g_framework->NativeFramework()->GetSearchAPI().GetLastSearchQueries();
+    if (items.empty())
+      return;
+
+    auto const listAddMethod = jni::ListBuilder::Instance(env).m_add;
+
+    for (SearchRequest const & item : items)
+    {
+      jni::TScopedLocalRef str(env, jni::ToJavaString(env, item.second));
+      env->CallBooleanMethod(result, listAddMethod, str.get());
+    }
+  }
+
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_search_SearchRecents_nativeAdd(JNIEnv * env, jclass thiz, jstring locale, jstring query)
+  {
+    SearchRequest const sr(jni::ToNativeString(env, locale), jni::ToNativeString(env, query));
+    g_framework->NativeFramework()->GetSearchAPI().SaveSearchQuery(sr);
+  }
+
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_search_SearchRecents_nativeClear(JNIEnv * env, jclass thiz)
+  {
+    g_framework->NativeFramework()->GetSearchAPI().ClearSearchHistory();
+  }
+}

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

@@ -28,7 +28,7 @@ void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, o
 //jobject CreatePopularity(JNIEnv * env, place_page::Info const & info)
 //{
 //  static jclass const popularityClass =
-//    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
+//    jni::GetGlobalClassRef(env, "app/organicmaps/search/Popularity");
 //  static jmethodID const popularityConstructor =
 //    jni::GetConstructorID(env, popularityClass, "(I)V");
 //  auto const popularityValue = info.GetPopularity();
@@ -57,7 +57,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje
       "Ljava/lang/String;"                              // appId
       "Lapp/organicmaps/routing/RoutePointInfo;"   // routePointInfo
       "I"                                               // openingMode
-      "Lapp/organicmaps/sdk/search/Popularity;"         // popularity
+      "Lapp/organicmaps/search/Popularity;"        // popularity
       "Ljava/lang/String;"                              // description
       "I"                                               // roadWarnType
       "[Ljava/lang/String;"                             // rawTypes
@@ -105,7 +105,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info,
                                 "(Lapp/organicmaps/bookmarks/data/FeatureId;JJLjava/lang/String;"
                                 "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
                                 "Lapp/organicmaps/routing/RoutePointInfo;"
-                                "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
+                                "ILapp/organicmaps/search/Popularity;Ljava/lang/String;"
                                 "[Ljava/lang/String;)V");
   static jmethodID const featureCtorId =
           jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");

android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp

@@ -1,37 +0,0 @@
-#include "app/organicmaps/Framework.hpp"
-#include "app/organicmaps/core/jni_helper.hpp"
-#include "app/organicmaps/core/jni_java_methods.hpp"
-
-#include "search/result.hpp"
-
-using SearchRequest = search::QuerySaver::SearchRequest;
-
-extern "C"
-{
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeGetList(JNIEnv * env, jclass, jobject result)
-{
-  auto const & items = g_framework->NativeFramework()->GetSearchAPI().GetLastSearchQueries();
-  if (items.empty())
-    return;
-
-  auto const listAddMethod = jni::ListBuilder::Instance(env).m_add;
-
-  for (SearchRequest const & item : items)
-  {
-    jni::TScopedLocalRef str(env, jni::ToJavaString(env, item.second));
-    env->CallBooleanMethod(result, listAddMethod, str.get());
-  }
-}
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeAdd(JNIEnv * env, jclass, jstring locale,
-                                                                               jstring query)
-{
-  SearchRequest const sr(jni::ToNativeString(env, locale), jni::ToNativeString(env, query));
-  g_framework->NativeFramework()->GetSearchAPI().SaveSearchQuery(sr);
-}
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeClear(JNIEnv * env, jclass)
-{
-  g_framework->NativeFramework()->GetSearchAPI().ClearSearchHistory();
-}
-}

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

@@ -89,7 +89,7 @@ import app.organicmaps.routing.RoutingPlanFragment;
 import app.organicmaps.routing.RoutingPlanInplaceController;
 import app.organicmaps.search.FloatingSearchToolbarController;
 import app.organicmaps.search.SearchActivity;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.search.SearchFragment;
 import app.organicmaps.settings.DrivingOptionsActivity;
 import app.organicmaps.settings.RoadType;

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

@@ -34,7 +34,7 @@ import app.organicmaps.maplayer.subway.SubwayManager;
 import app.organicmaps.maplayer.traffic.TrafficManager;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.settings.StoragePathManager;
 import app.organicmaps.sound.TtsPlayer;
 import app.organicmaps.util.Config;

android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java

@@ -39,8 +39,8 @@ import app.organicmaps.bookmarks.data.KmlFileType;
 import app.organicmaps.bookmarks.data.SortedBlock;
 import app.organicmaps.bookmarks.data.Track;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.sdk.search.BookmarkSearchListener;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.NativeBookmarkSearchListener;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.UiUtils;
@@ -62,7 +62,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     implements BookmarkManager.BookmarksSharingListener,
                BookmarkManager.BookmarksSortingListener,
                BookmarkManager.BookmarksLoadingListener,
-               BookmarkSearchListener,
+               NativeBookmarkSearchListener,
                ChooseBookmarksSortingTypeFragment.ChooseSortingTypeListener,
                MenuBottomSheetFragment.MenuBottomSheetInterface
 {

android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java

@@ -11,7 +11,7 @@ import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
 import app.organicmaps.routing.RoutePointInfo;
-import app.organicmaps.sdk.search.Popularity;
+import app.organicmaps.search.Popularity;
 import app.organicmaps.util.Constants;
 
 // TODO consider refactoring to remove hack with MapObject unmarshalling itself and Bookmark at the same time.

android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java

@@ -12,7 +12,7 @@ import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
 import app.organicmaps.routing.RoutePointInfo;
-import app.organicmaps.sdk.search.Popularity;
+import app.organicmaps.search.Popularity;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlacePageData;
 

android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java

@@ -23,13 +23,13 @@ import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.sdk.search.SearchListener;
-import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.search.SearchRecents;
-import app.organicmaps.sdk.search.SearchResult;
+import app.organicmaps.search.NativeSearchListener;
+import app.organicmaps.search.SearchEngine;
+import app.organicmaps.search.SearchRecents;
+import app.organicmaps.search.SearchResult;
 import app.organicmaps.util.Language;
 
-public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
+public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchListener
 {
   private final int MAX_RESULTS_SIZE;
 

android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java

@@ -21,13 +21,13 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.sdk.search.SearchListener;
-import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.search.SearchRecents;
-import app.organicmaps.sdk.search.SearchResult;
+import app.organicmaps.search.NativeSearchListener;
+import app.organicmaps.search.SearchEngine;
+import app.organicmaps.search.SearchRecents;
+import app.organicmaps.search.SearchResult;
 import app.organicmaps.util.Language;
 
-public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, SearchListener
+public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, NativeSearchListener
 {
   private final int MAX_RESULTS_SIZE;
 

android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java

@@ -13,7 +13,7 @@ import androidx.car.app.model.ForegroundCarColorSpan;
 import app.organicmaps.R;
 import app.organicmaps.car.util.Colors;
 import app.organicmaps.car.util.RoutingHelpers;
-import app.organicmaps.sdk.search.SearchResult;
+import app.organicmaps.search.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;

android/app/src/main/java/app/organicmaps/car/util/SuggestionsHelpers.java

@@ -8,7 +8,7 @@ import androidx.car.app.suggestion.model.Suggestion;
 import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
-import app.organicmaps.sdk.search.SearchRecents;
+import app.organicmaps.search.SearchRecents;
 
 import java.util.ArrayList;
 import java.util.List;

android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java

@@ -17,8 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.base.OnBackPressListener;
-import app.organicmaps.sdk.search.MapSearchListener;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.NativeMapSearchListener;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
@@ -52,13 +52,13 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
     }
   };
 
-  private final MapSearchListener mSearchListener = new MapSearchListener()
+  private final NativeMapSearchListener mSearchListener = new NativeMapSearchListener()
   {
     // Called from JNI.
     @Keep
     @SuppressWarnings("unused")
     @Override
-    public void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast)
+    public void onMapSearchResults(Result[] results, long timestamp, boolean isLast)
     {
       if (!mSearchRunning || timestamp != mCurrentSearch)
         return;
@@ -66,8 +66,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
       List<CountryItem> rs = new ArrayList<>();
       for (Result result : results)
       {
-        CountryItem item = CountryItem.fill(result.countryId());
-        item.searchResultName = result.matchedString();
+        CountryItem item = CountryItem.fill(result.countryId);
+        item.searchResultName = result.matchedString;
         rs.add(item);
       }
 

android/app/src/main/java/app/organicmaps/intent/Factory.java

@@ -3,6 +3,7 @@ package app.organicmaps.intent;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.IntentCompat;
@@ -21,7 +22,7 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.editor.OsmLoginActivity;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.search.SearchActivity;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.util.StorageUtils;
 import app.organicmaps.util.concurrency.ThreadPool;
 

android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.search.SearchEngine;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.concurrency.UiThread;

android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java

@@ -1,19 +0,0 @@
-package app.organicmaps.sdk.search;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-
-public interface MapSearchListener
-{
-  // Called from JNI.
-  @Keep
-  @SuppressWarnings("unused")
-  record Result(String countryId, String matchedString)
-  {
-  }
-
-  // Called from JNI.
-  @Keep
-  @SuppressWarnings("unused")
-  void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast);
-}

android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java

@@ -18,7 +18,6 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
-import app.organicmaps.sdk.search.DisplayedCategories;
 import app.organicmaps.util.ThemeUtils;
 
 import java.lang.annotation.Retention;
@@ -27,10 +26,9 @@ import java.lang.annotation.RetentionPolicy;
 class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolder>
 {
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({ ViewType.CATEGORY })
-  @interface ViewType {
-    int CATEGORY = 0;
-  }
+  @IntDef({ TYPE_CATEGORY })
+  @interface ViewType {}
+  private static final int TYPE_CATEGORY = 0;
 
   @StringRes
   private int[] mCategoryResIds;
@@ -123,16 +121,15 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   @ViewType
   public int getItemViewType(int position)
   {
-    return ViewType.CATEGORY;
+    return TYPE_CATEGORY;
   }
 
-  @NonNull
   @Override
-  public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, @ViewType int viewType)
+  public ViewHolder onCreateViewHolder(ViewGroup parent, @ViewType int viewType)
   {
     View view;
     ViewHolder viewHolder;
-    if (viewType == ViewType.CATEGORY)
+    if (viewType == TYPE_CATEGORY)
     {
       view = mInflater.inflate(R.layout.item_search_category, parent, false);
       viewHolder = new ViewHolder(view, (TextView) view);

android/app/src/main/java/app/organicmaps/search/DisplayedCategories.java

@@ -1,8 +1,8 @@
-package app.organicmaps.sdk.search;
+package app.organicmaps.search;
 
 import androidx.annotation.NonNull;
 
-public class DisplayedCategories
+class DisplayedCategories
 {
   @NonNull
   public static String[] getKeys()

android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java

@@ -6,8 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import androidx.core.view.ViewCompat;
-
-import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.util.UiUtils;

android/app/src/main/java/app/organicmaps/search/NativeBookmarkSearchListener.java

@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.search;
+package app.organicmaps.search;
 
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
@@ -6,11 +6,11 @@ import androidx.annotation.Nullable;
 /**
  * Native search will return results via this interface.
  */
-public interface BookmarkSearchListener
+public interface NativeBookmarkSearchListener
 {
   /**
    * @param bookmarkIds Founded bookmark ids.
-   * @param timestamp   Timestamp of search request.
+   * @param timestamp Timestamp of search request.
    */
   // Used by JNI.
   @Keep
@@ -19,7 +19,7 @@ public interface BookmarkSearchListener
 
   /**
    * @param bookmarkIds Founded bookmark ids.
-   * @param timestamp   Timestamp of search request.
+   * @param timestamp Timestamp of search request.
    */
   // Used by JNI.
   @Keep

android/app/src/main/java/app/organicmaps/search/NativeMapSearchListener.java

@@ -0,0 +1,26 @@
+package app.organicmaps.search;
+
+import androidx.annotation.Keep;
+
+public interface NativeMapSearchListener
+{
+  // Called from JNI.
+  @Keep
+  @SuppressWarnings("unused")
+  class Result
+  {
+    public final String countryId;
+    public final String matchedString;
+
+    public Result(String countryId, String matchedString)
+    {
+      this.countryId = countryId;
+      this.matchedString = matchedString;
+    }
+  }
+
+  // Called from JNI.
+  @Keep
+  @SuppressWarnings("unused")
+  void onMapSearchResults(Result[] results, long timestamp, boolean isLast);
+}

android/app/src/main/java/app/organicmaps/search/NativeSearchListener.java

@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.search;
+package app.organicmaps.search;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -6,10 +6,10 @@ import androidx.annotation.NonNull;
 /**
  * Native search will return results via this interface.
  */
-public interface SearchListener
+public interface NativeSearchListener
 {
   /**
-   * @param results   Search results.
+   * @param results Search results.
    * @param timestamp Timestamp of search request.
    */
   // Called by JNI.

android/app/src/main/java/app/organicmaps/search/Popularity.java

@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.search;
+package app.organicmaps.search;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -38,12 +38,12 @@ public class Popularity implements Parcelable
   }
 
   @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags)
+  public void writeToParcel(Parcel dest, int flags)
   {
     dest.writeInt(this.mType.ordinal());
   }
 
-  protected Popularity(@NonNull Parcel in)
+  protected Popularity(Parcel in)
   {
     int tmpMPopularity = in.readInt();
     this.mType = Type.values()[tmpMPopularity];

android/app/src/main/java/app/organicmaps/search/SearchAdapter.java

@@ -2,6 +2,10 @@ package app.organicmaps.search;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +17,6 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
-import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;

android/app/src/main/java/app/organicmaps/search/SearchEngine.java

@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.search;
+package app.organicmaps.search;
 
 import android.content.Context;
 
@@ -14,9 +14,9 @@ import app.organicmaps.util.concurrency.UiThread;
 
 import java.nio.charset.StandardCharsets;
 
-public enum SearchEngine implements SearchListener,
-    MapSearchListener,
-    BookmarkSearchListener
+public enum SearchEngine implements NativeSearchListener,
+                                    NativeMapSearchListener,
+                                    NativeBookmarkSearchListener
 {
   INSTANCE;
 
@@ -30,7 +30,7 @@ public enum SearchEngine implements SearchListener,
     UiThread.run(
         () ->
         {
-          for (SearchListener listener : mListeners)
+          for (NativeSearchListener listener : mListeners)
             listener.onResultsUpdate(results, timestamp);
         });
   }
@@ -41,18 +41,18 @@ public enum SearchEngine implements SearchListener,
     UiThread.run(
         () ->
         {
-          for (SearchListener listener : mListeners)
+          for (NativeSearchListener listener : mListeners)
             listener.onResultsEnd(timestamp);
         });
   }
 
   @Override
-  public void onMapSearchResults(@NonNull final MapSearchListener.Result[] results, final long timestamp, final boolean isLast)
+  public void onMapSearchResults(final NativeMapSearchListener.Result[] results, final long timestamp, final boolean isLast)
   {
     UiThread.run(
         () ->
         {
-          for (MapSearchListener listener : mMapListeners)
+          for (NativeMapSearchListener listener : mMapListeners)
             listener.onMapSearchResults(results, timestamp, isLast);
         });
   }
@@ -60,53 +60,55 @@ public enum SearchEngine implements SearchListener,
   @Override
   public void onBookmarkSearchResultsUpdate(@Nullable long[] bookmarkIds, long timestamp)
   {
-    for (BookmarkSearchListener listener : mBookmarkListeners)
+    for (NativeBookmarkSearchListener listener : mBookmarkListeners)
       listener.onBookmarkSearchResultsUpdate(bookmarkIds, timestamp);
   }
 
   @Override
   public void onBookmarkSearchResultsEnd(@Nullable long[] bookmarkIds, long timestamp)
   {
-    for (BookmarkSearchListener listener : mBookmarkListeners)
+    for (NativeBookmarkSearchListener listener : mBookmarkListeners)
       listener.onBookmarkSearchResultsEnd(bookmarkIds, timestamp);
   }
 
-  private final ObserverList<SearchListener> mListeners = new ObserverList<>();
+  private final ObserverList<NativeSearchListener> mListeners = new ObserverList<>();
 
-  private final ObserverList<MapSearchListener> mMapListeners = new ObserverList<>();
+  private final ObserverList<NativeMapSearchListener> mMapListeners = new ObserverList<>();
 
-  private final ObserverList<BookmarkSearchListener> mBookmarkListeners = new ObserverList<>();
+  private final ObserverList<NativeBookmarkSearchListener> mBookmarkListeners = new ObserverList<>();
 
-  public void addListener(SearchListener listener)
+  public void addListener(NativeSearchListener listener)
   {
     mListeners.addObserver(listener);
   }
 
-  public void removeListener(SearchListener listener)
+  public void removeListener(NativeSearchListener listener)
   {
     mListeners.removeObserver(listener);
   }
 
-  public void addMapListener(MapSearchListener listener)
+  public void addMapListener(NativeMapSearchListener listener)
   {
     mMapListeners.addObserver(listener);
   }
 
-  public void removeMapListener(MapSearchListener listener)
+  public void removeMapListener(NativeMapSearchListener listener)
   {
     mMapListeners.removeObserver(listener);
   }
 
-  public void addBookmarkListener(BookmarkSearchListener listener)
+  public void addBookmarkListener(NativeBookmarkSearchListener listener)
   {
     mBookmarkListeners.addObserver(listener);
   }
 
-  public void removeBookmarkListener(BookmarkSearchListener listener)
+  public void removeBookmarkListener(NativeBookmarkSearchListener listener)
   {
     mBookmarkListeners.removeObserver(listener);
   }
 
+  private native void nativeInit();
+
   /**
    *
    * @param context
@@ -114,7 +116,7 @@ public enum SearchEngine implements SearchListener,
    * @return whether search was actually started.
    */
   @MainThread
-  public boolean search(@NonNull Context context, @NonNull String query, boolean isCategory,
+  public boolean search(@NonNull Context context, String query, boolean isCategory,
                         long timestamp, boolean hasLocation, double lat, double lon)
   {
     return nativeRunSearch(query.getBytes(StandardCharsets.UTF_8), isCategory,
@@ -144,7 +146,7 @@ public enum SearchEngine implements SearchListener,
   }
 
   @MainThread
-  public static void searchMaps(@NonNull Context context, @NonNull String query, long timestamp)
+  public static void searchMaps(@NonNull Context context, String query, long timestamp)
   {
     nativeRunSearchMaps(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
                         timestamp);
@@ -206,8 +208,6 @@ public enum SearchEngine implements SearchListener,
     nativeInit();
   }
 
-  private native void nativeInit();
-
   /**
    * @param bytes utf-8 formatted bytes of query.
    */