Merge branch 'organicmaps:master' into public-transit

2022-06-04 21:42:46 -06:00 · 2022-06-04 21:42:46 -06:00 · 88510e726e
commit 88510e726e
parent 569559e8f5 45a35d0854
86 changed files with 12639 additions and 7599 deletions
--- a/README.md
+++ b/README.md
@ -133,9 +133,11 @@ and [Google Play](https://play.google.com/store/apps/details?id=app.organicmaps)
 - [Discuss](https://github.com/organicmaps/organicmaps/discussions/categories/ideas) ideas or propose feature requests.
 - Subscribe to our [Telegram Channel](https://t.me/OrganicMapsApp) or to the [[matrix] space](https://matrix.to/#/#organicmaps:matrix.org) for updates.
 - Join our [Telegram Group](https://t.me/OrganicMaps) to discuss with other users.
- Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/OrganicMapsRu) для обратной связи и помощи.
+  - Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/OrganicMapsRu) для обратной связи и помощи.
+  - Diğer kullanıcılarla tartışmak için [Telegram Grubumuza](https://t.me/OrganicMapsTR) katılın.
 - Contact us by [email](mailto:hello@organicmaps.app).
 - Follow our updates in [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp),
 [Instagram](https://instagram.com/organicmaps.app/).
+  - Güncellemelerimizi [Instagram](https://instagram.com/organicmapstr/) üzerinden takip edin.

 The Organic Maps community abides by the CNCF code of conduct.
--- a/android/build.gradle
+++ b/android/build.gradle
@ -26,7 +26,7 @@ buildscript {
  ext.googleFirebaseServicesEnabled = project.hasProperty('firebase') ?: googleFirebaseServicesDefault

  dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.0'
+    classpath 'com.android.tools.build:gradle:7.2.1'

    if (googleMobileServicesEnabled) {
      println("Building with Google Mobile Services")
@ -67,9 +67,6 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'

 dependencies {
-
-  implementation 'androidx.multidex:multidex:' + propMultiDexVersion
-
  // Google Mobile Services
  if (googleMobileServicesEnabled) {
    implementation 'com.google.android.gms:play-services-location:19.0.1'
@ -81,29 +78,25 @@ dependencies {
    implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.6'
  }

-  // 3-party
-  implementation 'com.google.code.gson:gson:2.9.0'
-  // Sticky recycler view headers
-  implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
-  // Glide
-  implementation 'com.github.bumptech.glide:glide:4.13.2'
-  // Java concurrency annotations
-  implementation 'net.jcip:jcip-annotations:1.0'
-
+  implementation 'androidx.appcompat:appcompat:1.4.1'
  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+  implementation 'androidx.fragment:fragment:1.4.1'
+  implementation 'androidx.multidex:multidex:2.0.1'
+  implementation 'androidx.preference:preference:1.2.0'
+  implementation 'androidx.recyclerview:recyclerview:1.2.1'
  implementation 'androidx.work:work-runtime:2.7.1'
+  implementation 'com.github.bumptech.glide:glide:4.13.2'
+  implementation 'com.google.android.material:material:1.7.0-alpha02'
+  implementation 'com.google.code.gson:gson:2.9.0'
+  implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
  implementation 'com.trafi:anchor-bottom-sheet-behavior:0.14-alpha'
  implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
-  implementation 'com.google.android.material:material:1.7.0-alpha01'
-  implementation 'androidx.appcompat:appcompat:1.4.1'
-  implementation 'androidx.preference:preference:1.2.0'
-  implementation 'androidx.fragment:fragment:1.4.1'
-  implementation 'androidx.recyclerview:recyclerview:1.2.1'
+  implementation 'net.jcip:jcip-annotations:1.0'

  // Test Dependencies
-  testImplementation "junit:junit:$jUnitVersion"
-  testImplementation "org.mockito:mockito-core:$mockitoVersion"
-  testImplementation "org.mockito:mockito-inline:$mockitoVersion"
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'org.mockito:mockito-core:4.6.0'
+  testImplementation 'org.mockito:mockito-inline:4.6.0'
 }

 def run(cmd) {
@ -221,10 +214,7 @@ android {
    } else {
      java.srcDirs += 'flavors/firebase-disabled'
    }
-
-    // assets folder is auto-generated by tools/android/update_assets.sh, so we keep all static resources in separate folders.
    assets.srcDirs = ['assets']
-    jniLibs.srcDirs = [android.getNdkDirectory().toString() + '/sources/third_party/vulkan/src/build-android/jniLibs']
  }

  sourceSets.test {
@ -408,14 +398,6 @@ android {
  }
 }

-// Tasks needed to compile NDK part
-apply plugin: 'base'
-
-project.ext.PARAM_PARALLEL_TASK_COUNT = '-j' + (Runtime.runtime.availableProcessors() + 1)
-project.ext.NDK_BUILD = android.getNdkDirectory().toString() + '/ndk-build'
-if (System.properties['os.name'].toLowerCase().contains('windows'))
-  project.ext.NDK_BUILD += ".cmd"
-
 android.buildTypes.all { buildType ->
  def suffix = applicationIdSuffix != null ? applicationIdSuffix : ""
  def authorityValue = android.defaultConfig.applicationId + suffix + ".provider"
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -2,9 +2,6 @@ propMinSdkVersion=21
 propTargetSdkVersion=31
 propCompileSdkVersion=31
 propBuildToolsVersion=32.0.0
-propMultiDexVersion=2.0.1
-jUnitVersion=4.13.2
-mockitoVersion=4.5.1

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1024m -Xms256m
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@ -1036,6 +1036,12 @@ Java_com_mapswithme_maps_Framework_nativeGetSettingsDir(JNIEnv * env, jclass)
  return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str());
 }

+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_Framework_nativeGetDataFileExt(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, DATA_FILE_EXTENSION);
+}
+
 JNIEXPORT jobjectArray JNICALL
 Java_com_mapswithme_maps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass)
 {
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@ -78,8 +78,20 @@
 	<string name="maps_storage_summary">Selecione o local para onde os mapas devem ser baixados</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
 	<string name="maps_storage_downloaded">Mapas</string>
+	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+	<string name="maps_storage_internal">Armazenamento interno privado</string>
+	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+	<string name="maps_storage_shared">Armazenamento interno compartilhado</string>
+	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+	<string name="maps_storage_removable">Cartão SD</string>
+	<!-- Generic external storage type in Maps Storage settings -->
+	<string name="maps_storage_external">Armazenamento externo compartilhado</string>
+	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
+	<string name="maps_storage_free_size">%1$s livre de %2$s</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Mover mapas?</string>
+	<!-- Error moving map files from one storage to another -->
+	<string name="move_maps_error">Erro ao mover arquivos de mapas</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Isto pode demorar alguns minutos.\nPor favor aguarde…</string>
 	<!-- Measurement units title in settings activity -->
@ -352,7 +364,7 @@
 	<string name="editor_time_add">Adicionar horário</string>
 	<string name="editor_time_delete">Apagar horário</string>
 	<!-- Text for allday switch. -->
-	<string name="editor_time_allday">O Dia Todo (24 horas)</string>
+	<string name="editor_time_allday">O dia todo (24 horas)</string>
 	<string name="editor_time_open">Aberto</string>
 	<string name="editor_time_close">Fechado</string>
 	<string name="editor_time_add_closed">Inserir Horas Sem Funcionamento</string>
@ -393,6 +405,8 @@
 	<string name="details">Detalhes</string>
 	<!-- Text field to enter non-existing street name, below list of known streets around -->
 	<string name="add_street">Adicionar uma rua</string>
+	<!-- Error to display when a new street name is not entered in the New street dialog -->
+	<string name="empty_street_name_error">Por favor, digite o nome da rua</string>
 	<string name="choose_language">Escolher um idioma</string>
 	<string name="choose_street">Escolher uma rua</string>
 	<string name="postal_code">CEP</string>
@ -404,7 +418,7 @@
 	<string name="downloader_update_maps">Atualizar mapas</string>
 	<string name="downloader_mwm_migration_dialog">Para criar um itinerário é necessário atualizar todos os mapas e, em seguida, planejá-lo novamente.</string>
 	<string name="downloader_search_field_hint">Encontrar o mapa</string>
-	<string name="common_check_internet_connection_dialog">Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à Internet.</string>
+	<string name="common_check_internet_connection_dialog">Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à internet.</string>
 	<string name="downloader_no_space_title">Não há espaço suficiente</string>
 	<string name="downloader_no_space_message">Por favor, remova os dados desnecessários</string>
 	<string name="editor_login_error_dialog">Erro no login.</string>
@ -464,6 +478,8 @@
 	<string name="editor_remove_place_message">Remover local adicionado?</string>
 	<string name="editor_remove_place_button">Remover</string>
 	<string name="editor_place_doesnt_exist">O lugar não existe</string>
+	<!-- Error message for "Place doesn't exist" dialog when comment is empty -->
+	<string name="delete_place_empty_comment_error">Por favor, explica o motivo pelo qual você está retirando o local</string>
 	<!-- Phone number error message -->
 	<string name="error_enter_correct_phone">Digite um número de telefone correto</string>
 	<string name="error_enter_correct_web">Digite um endereço de site válido</string>
@ -501,7 +517,7 @@
 	<string name="feedback_general">Opinão geral</string>
 	<string name="on">Lig.</string>
 	<string name="off">Deslig.</string>
-	<string name="prefs_languages_information">Utilizamos o TTS (texto-para-voz) do sistema para instruções de voz. Muitos dispositivos do Android usam o TTS do Google, você pode baixá-lo ou atualizá-lo no Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+	<string name="prefs_languages_information">Utilizamos o sistema TTS (texto-para-voz) para instruções de voz. Muitos dispositivos do Android usam o TTS do Google, você pode baixá-lo ou atualizá-lo no Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
 	<string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia.</string>
 	<string name="transliteration_title">Transliteração para alfabeto latino</string>
 	<string name="learn_more">Saber mais</string>
@ -538,7 +554,7 @@
 	  <item quantity="one">%d arquivo foi encontrado. Você vai ver depois da conversão.</item>
 	  <item quantity="other">%d arquivos foram encontrados. Você os verá depois da conversão.</item>
 	</plurals>
-	<string name="common_check_internet_connection_dialog_title">Sem conexão com a Internet</string>
+	<string name="common_check_internet_connection_dialog_title">Sem conexão com a internet</string>
 	<plurals name="objects">
 	  <item quantity="one">%d objeto</item>
 	  <item quantity="other">%d objetos</item>
@ -674,7 +690,7 @@
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Quando ativada, a tela poderá hibernar após um período de inatividade.</string>
 	<!-- A preference title; keep short! -->
-	<string name="enable_show_on_lock_screen">Mostrar na tela de bloqueio ativada</string>
+	<string name="enable_show_on_lock_screen">Mostrar na tela de bloqueio</string>
 	<!-- Description in preferences -->
 	<string name="enable_show_on_lock_screen_description">Quando ativado, você não precisará debloquear seu dispositivo toda vez que o aplicativo estiver funcionando</string>

--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@ -212,6 +212,8 @@ public class Framework

  public static native void nativeDeactivatePopup();

+  public static native String nativeGetDataFileExt();
+
  public static native String[] nativeGetMovableFilesExts();

  public static native String[] nativeGetBookmarksFilesExts();
--- a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java
+++ b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java
@ -28,7 +28,6 @@ public class StoragePathFragment extends BaseSettingsFragment
    implements OnBackPressListener
 {
  private TextView mHeader;
-  private ListView mList;

  private StoragePathAdapter mAdapter;
  private StoragePathManager mPathManager;
@ -47,7 +46,7 @@ public class StoragePathFragment extends BaseSettingsFragment
    mAdapter = new StoragePathAdapter(mPathManager, requireActivity());

    mHeader = root.findViewById(R.id.header);
-    mList = root.findViewById(R.id.list);
+    ListView mList = root.findViewById(R.id.list);
    mList.setOnItemClickListener((parent, view, position, id) -> changeStorage(position));
    mList.setAdapter(mAdapter);

@ -125,7 +124,7 @@ public class StoragePathFragment extends BaseSettingsFragment
    dialog.show();

    ThreadPool.getStorage().execute(() -> {
-      final boolean result = mPathManager.moveStorage(newPath, oldPath);
+      final boolean result = StoragePathManager.moveStorage(newPath, oldPath);

      UiThread.run(() -> {
        if (dialog.isShowing())
--- a/android/src/com/mapswithme/maps/settings/StoragePathManager.java
+++ b/android/src/com/mapswithme/maps/settings/StoragePathManager.java
@ -32,6 +32,7 @@ public class StoragePathManager
 {
  static final String TAG = StoragePathManager.class.getName();
  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.STORAGE);
+  private static final String DATA_FILE_EXT = Framework.nativeGetDataFileExt();
  private static final String[] MOVABLE_EXTS = Framework.nativeGetMovableFilesExts();
  static final FilenameFilter MOVABLE_FILES_FILTER = (dir, filename) -> {
    for (String ext : MOVABLE_EXTS)
@ -48,11 +49,11 @@ public class StoragePathManager

  private OnStorageListChangedListener mStoragesChangedListener;
  private BroadcastReceiver mInternalReceiver;
-  private Context mContext;
+  private final Context mContext;

  public final List<StorageItem> mStorages = new ArrayList<>();
  public int mCurrentStorageIndex = -1;
-  private StorageItem mEmulatedStorage = null;
+  private StorageItem mInternalStorage = null;

  public StoragePathManager(@NonNull Context context)
  {
@ -118,8 +119,6 @@ public class StoragePathManager

  /**
   * Adds a storage into the list if it passes sanity checks.
-   * Internal storage is omitted if it backs an emulated one (unless internal is the current one),
-   * hence internal should be fed to this method last.
   */
  private void addStorageOption(File dir, boolean isInternal, String configPath)
  {
@ -132,127 +131,109 @@ public class StoragePathManager
      return;
    }

-    String commentedPath = null;
+    String path;
    try
    {
-      // Add the trailing separator because the native code assumes that all paths have it.
-      final String path = StorageUtils.addTrailingSeparator(dir.getCanonicalPath());
-      final boolean isCurrent = path.equals(configPath);
-      final long totalSize = dir.getTotalSpace();
-      final long freeSize = dir.getUsableSpace();
+      path = dir.getCanonicalPath();
+    }
+    catch (IOException e)
+    {
+      LOGGER.e(TAG, "IOException at getCanonicalPath for " + dir.getPath(), e);
+      return;
+    }
+    // Add the trailing separator because the native code assumes that all paths have it.
+    path = StorageUtils.addTrailingSeparator(path);
+    final boolean isCurrent = path.equals(configPath);
+    final long totalSize = dir.getTotalSpace();
+    final long freeSize = dir.getUsableSpace();

-      commentedPath = path + (StorageUtils.addTrailingSeparator(dir.getPath()).equals(path)
-                              ? "" : " (" + dir.getPath() + ")") + " - " +
-                      (isCurrent ? "currently configured, " : "") +
-                      (isInternal ? "internal" : "external") + ", " +
-                      freeSize + " available out of " + totalSize + " bytes";
+    String commentedPath = path + (StorageUtils.addTrailingSeparator(dir.getPath()).equals(path)
+                                   ? "" : " (" + dir.getPath() + ")") + " - " +
+                           (isCurrent ? "currently configured, " : "") +
+                           (isInternal ? "internal" : "external") + ", " +
+                           freeSize + " available of " + totalSize + " bytes";

-      // Check if internal and emulated are the same physical device.
-      // Allow for some divergence in freeSize because there could have been file operations inbetween free space checks.
-      if (isInternal && mEmulatedStorage != null && mEmulatedStorage.mTotalSize == totalSize
-          && mEmulatedStorage.mFreeSize > freeSize - 1024 * 1024
-          && mEmulatedStorage.mFreeSize < freeSize + 1024 * 1024)
+    boolean isEmulated = false;
+    boolean isRemovable = false;
+    boolean isReadonly = false;
+    String state = null;
+    String label = null;
+    if (!isInternal)
+    {
+      try
      {
-        final String emulated = ", backs emulated (" + mEmulatedStorage.mPath + ")";
-        // Allow duplicating internal storage if its the current one (for migration purposes).
-        if (!isCurrent)
-        {
-          LOGGER.i(TAG, "Duplicate" + emulated + ": " + commentedPath);
-          return;
-        }
-        commentedPath += emulated;
+        isEmulated = Environment.isExternalStorageEmulated(dir);
+        isRemovable = Environment.isExternalStorageRemovable(dir);
+        state = Environment.getExternalStorageState(dir);
+        commentedPath += (isEmulated ? ", emulated" : "") +
+                         (isRemovable ? ", removable" : "") +
+                         (state != null ? ", state=" + state : "");
+      }
+      catch (IllegalArgumentException e)
+      {
+        // Thrown if the dir is not a valid storage device.
+        // https://github.com/organicmaps/organicmaps/issues/538
+        LOGGER.w(TAG, "External storage checks failed for " + commentedPath);
      }

-      boolean isEmulated = false;
-      boolean isRemovable = false;
-      boolean isReadonly = false;
-      String state = null;
-      String label = null;
-      if (!isInternal)
+      // Get additional storage information for Android 7+.
+      if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
      {
-        try
+        final StorageManager sm = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
+        if (sm != null)
        {
-          isEmulated = Environment.isExternalStorageEmulated(dir);
-          isRemovable = Environment.isExternalStorageRemovable(dir);
-          state = Environment.getExternalStorageState(dir);
-          commentedPath += (isEmulated ? ", emulated" : "") +
-                           (isRemovable ? ", removable" : "") +
-                           (state != null ? ", state=" + state : "");
-        }
-        catch (IllegalArgumentException e)
-        {
-          // Thrown if the dir is not a valid storage device.
-          // https://github.com/organicmaps/organicmaps/issues/538
-          LOGGER.w(TAG, "isExternalStorage checks failed for " + commentedPath);
-        }
-
-        // Get additional storage information for Android 7+.
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
-        {
-          final StorageManager sm = (StorageManager) mContext.getSystemService(mContext.STORAGE_SERVICE);
-          if (sm != null)
+          final StorageVolume sv = sm.getStorageVolume(dir);
+          if (sv != null)
          {
-            final StorageVolume sv = sm.getStorageVolume(dir);
-            if (sv != null)
-            {
-              label = sv.getDescription(mContext);
-              commentedPath += (sv.isPrimary() ? ", primary" : "") +
-                               (!TextUtils.isEmpty(sv.getUuid()) ? ", uuid=" + sv.getUuid() : "") +
-                               (!TextUtils.isEmpty(label) ? ", label='" + label + "'": "");
-            }
-            else
-              LOGGER.w(TAG, "Can't get StorageVolume for " + commentedPath);
+            label = sv.getDescription(mContext);
+            commentedPath += (sv.isPrimary() ? ", primary" : "") +
+                             (!TextUtils.isEmpty(sv.getUuid()) ? ", uuid=" + sv.getUuid() : "") +
+                             (!TextUtils.isEmpty(label) ? ", label='" + label + "'" : "");
          }
          else
-            LOGGER.w(TAG, "Can't get StorageManager for " + commentedPath);
+            LOGGER.w(TAG, "Can't get StorageVolume for " + commentedPath);
        }
-      }
-
-      if (state != null && !Environment.MEDIA_MOUNTED.equals(state)
-          && !Environment.MEDIA_MOUNTED_READ_ONLY.equals(state))
-      {
-        LOGGER.w(TAG, "Not mounted: " + commentedPath);
-        return;
-      }
-      if (!dir.exists())
-      {
-        LOGGER.w(TAG, "Not exists: " + commentedPath);
-        return;
-      }
-      if (!dir.isDirectory())
-      {
-        LOGGER.w(TAG, "Not a directory: " + commentedPath);
-        return;
-      }
-      if (!dir.canWrite() || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state))
-      {
-        isReadonly = true;
-        LOGGER.w(TAG, "Not writable: " + commentedPath);
-        // Keep using currently configured storage even if its read-only.
-        if (isCurrent)
-          commentedPath += ", read-only";
        else
-          return;
+          LOGGER.w(TAG, "Can't get StorageManager for " + commentedPath);
      }
-
-      if (TextUtils.isEmpty(label))
-        label = isInternal ? mContext.getString(R.string.maps_storage_internal)
-                           : (isRemovable ? mContext.getString(R.string.maps_storage_removable)
-                                          : (isEmulated ? mContext.getString(R.string.maps_storage_shared)
-                                                        : mContext.getString(R.string.maps_storage_external)));
-
-      StorageItem storage = new StorageItem(path, freeSize, totalSize, label, isReadonly);
-      mStorages.add(storage);
-      if (isCurrent)
-        mCurrentStorageIndex = mStorages.size() - 1;
-      if (isEmulated)
-        mEmulatedStorage = storage;
-      LOGGER.i(TAG, "Accepted " + commentedPath);
    }
-    catch (SecurityException | IOException ex)
+
+    if (state != null && !Environment.MEDIA_MOUNTED.equals(state)
+        && !Environment.MEDIA_MOUNTED_READ_ONLY.equals(state))
    {
-      LOGGER.e(TAG, "Error: " + (commentedPath != null ? commentedPath : "(" + dir.getPath() + ")"), ex);
+      LOGGER.w(TAG, "Not mounted: " + commentedPath);
+      return;
    }
+
+    if (!dir.exists())
+    {
+      LOGGER.w(TAG, "Not exists: " + commentedPath);
+      return;
+    }
+    if (!dir.isDirectory())
+    {
+      LOGGER.w(TAG, "Not a directory: " + commentedPath);
+      return;
+    }
+    if (!dir.canWrite() || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state))
+    {
+      isReadonly = true;
+      commentedPath = "read-only " + commentedPath;
+    }
+
+    if (TextUtils.isEmpty(label))
+      label = isInternal ? mContext.getString(R.string.maps_storage_internal)
+                         : (isRemovable ? mContext.getString(R.string.maps_storage_removable)
+                                        : (isEmulated ? mContext.getString(R.string.maps_storage_shared)
+                                                      : mContext.getString(R.string.maps_storage_external)));
+
+    StorageItem storage = new StorageItem(path, freeSize, totalSize, label, isReadonly);
+    mStorages.add(storage);
+    if (isCurrent)
+      mCurrentStorageIndex = mStorages.size() - 1;
+    if (isInternal)
+      mInternalStorage = storage;
+    LOGGER.i(TAG, "Accepted " + commentedPath);
  }

  /**
@ -267,7 +248,7 @@ public class StoragePathManager
    LOGGER.i(TAG, "Begin scanning storages");
    mStorages.clear();
    mCurrentStorageIndex = -1;
-    mEmulatedStorage = null;
+    mInternalStorage = null;

    // External storages (SD cards and other).
    for (File externalDir : mContext.getExternalFilesDirs(null))
@ -291,63 +272,40 @@ public class StoragePathManager
  }

  /**
-   * Determine whether the storage contains map files
-   * by checking for non-empty directories with version-like names (e.g. "220415").
+   * Determine whether the storage contains map files.
   */
  private static boolean containsMapData(String storagePath)
  {
-    File path = new File(storagePath);
-    File[] candidates = path.listFiles((pathname) -> {
-      if (!pathname.isDirectory())
-        return false;
-
-      try
-      {
-        String name = pathname.getName();
-        if (name.length() != 6)
-          return false;
-
-        int version = Integer.valueOf(name);
-        return (version > 120000 && version <= 999999);
-      }
-      catch (NumberFormatException ignored)
-      {
-      }
-
-      return false;
-    });
-
-    return (candidates != null && candidates.length > 0 &&
-            candidates[0].list().length > 0);
+    return StorageUtils.getDirSizeRecursively(new File(storagePath), (dir, filename) -> filename.endsWith(DATA_FILE_EXT)) > 0;
  }

  /**
-   * Get storage with the most free space.
+   * Get a writable non-internal storage with the most free space.
+   * Returns an internal storage if no other options are suitable.
   */
-  public StorageItem getBiggestStorage()
+  public StorageItem getDefaultStorage()
  {
    StorageItem res = null;
    for (StorageItem storage : mStorages)
    {
-      if (res == null || res.mFreeSize < storage.mFreeSize)
-      {
+      if ((res == null || res.mFreeSize < storage.mFreeSize)
+          && !storage.mIsReadonly && !storage.equals(mInternalStorage))
        res = storage;
-      }
    }
-    return res;
+
+    return res != null ? res : mInternalStorage;
  }

  /**
   * Returns an available storage with existing maps files.
-   * Checks the currently configured storage first,
-   * then scans other storages. If no maps files found
-   * defaults to the storage with the most free space.
+   * Checks the currently configured storage first, then scans other storages.
+   * If no map files found uses getDefaultStorage().
   */
  public static String findMapsStorage(@NonNull Application application)
  {
    StoragePathManager mgr = new StoragePathManager(application);
    mgr.scanAvailableStorages();
-    String path = null;
+    String path;
    final List<StorageItem> storages = mgr.mStorages;
    final int currentIdx = mgr.mCurrentStorageIndex;

@ -382,8 +340,8 @@ public class StoragePathManager
      }
    }

-    path = mgr.getBiggestStorage().mPath;
-    LOGGER.i(TAG, "Defaulting to a storage with the most free space: " + path);
+    path = mgr.getDefaultStorage().mPath;
+    LOGGER.i(TAG, "Using default storage " + path);
    return path;
  }

--- a/android/src/com/mapswithme/util/StorageUtils.java
+++ b/android/src/com/mapswithme/util/StorageUtils.java
@ -250,27 +250,36 @@ public class StorageUtils
    }
  }

-  public static long getDirSizeRecursively(File file, FilenameFilter fileFilter)
+  /**
+   * Returns 0 in case of the error or if no files have passed the filter.
+   */
+  public static long getDirSizeRecursively(File dir, FilenameFilter fileFilter)
  {
-    if (file.isDirectory())
+    final File[] list = dir.listFiles();
+    if (list == null)
    {
-      long dirSize = 0;
-      for (File child : file.listFiles())
-        dirSize += getDirSizeRecursively(child, fileFilter);
-
-      return dirSize;
+      LOGGER.w(TAG, "getDirSizeRecursively dirFiles returned null");
+      return 0;
    }

-    if (fileFilter.accept(file.getParentFile(), file.getName()))
-      return file.length();
-
-    return 0;
+    long dirSize = 0;
+    for (File child : list)
+    {
+      if (child.isDirectory())
+        dirSize += getDirSizeRecursively(child, fileFilter);
+      else if (fileFilter.accept(dir, child.getName()))
+        dirSize += child.length();
+    }
+    return dirSize;
  }

  @SuppressWarnings("ResultOfMethodCallIgnored")
  public static void removeEmptyDirectories(File dir)
  {
-    for (File file : dir.listFiles())
+    final File[] list = dir.listFiles();
+    if (list == null)
+      return;
+    for (File file : list)
    {
      if (!file.isDirectory())
        continue;
@ -311,8 +320,6 @@ public class StorageUtils
   */
  public static void listContentProviderFilesRecursively(ContentResolver contentResolver, Uri rootUri, UriVisitor filter)
  {
-    ArrayList<Uri> result = new ArrayList<>();
-
    Uri rootDir = DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, DocumentsContract.getTreeDocumentId(rootUri));
    Queue<Uri> directories = new LinkedBlockingQueue<>();
    directories.add(rootDir);
--- a/android/src/fdroid/play/listings/mr-IN/full-description.txt
+++ b/android/src/fdroid/play/listings/mr-IN/full-description.txt
@ -0,0 +1,52 @@
+‣ आमचे हे विनामूल्य ऍप आपली माहिती गोळा करत नाही व जाहिरातीही दाखवत नाही.
+‣ आमची लहान टीम व इतर योगदानकर्ते त्यांच्या मोकळ्या वेळात ह्या ऍप मध्ये सतत सुधार करत असतात
+‣ नकाशावर काही चुका किंवा अपूर्ण माहिती असल्यास, <b>OpenStreetMap</b> वर तुम्ही देखील ते सुधारू शकता व ते सुधार भविष्यातील अद्ययावत ऍप मध्ये बघू शकता.
+
+<b>आपल्या अभिप्रायाने व ५ तारांच्या मानांकनाने आम्हाला प्रेरणा मिळते!</b>
+
+महत्वाची वैशिष्टे:
+• विनामूल्य, मुक्त स्त्रोत, विनाजाहिराती, माहिती मागोवा (ट्रॅकिंग) नाही
+• <b>OpenStreetMap</b> समुदायाच्या कृपेने गुगल नकाशावर अस्तित्वात नसलेल्या ठिकाणांसह तपशीलवार ऑफलाइन नकाशे
+• सायकल मार्ग, पादचारी मार्ग व भटकंतीचे मार्ग
+• उंची, शिखरे, समोच्च रेषा व चढ-उतार
+• चालताना व सायकल/गाडी चालवताना प्रायोगिक ध्वनी सूचनांसह वळणावळणाप्रमाणे मार्गनिर्देशन
+• जलद ऑफलाइन शोध
+• KML/KMZ स्वरूपात खूणपत्रे आयात/निर्यात (GPX पण लवकरच येत आहे)
+• तुमच्या डोळ्यांचे संरक्षण करण्यासाठी "गडद मोड"
+
+ऑरगॅनिक मॅप्समध्ये अँड्रॉइड ऑटो, सार्वजनिक वाहतूक, उपग्रह नकाशे आणि इतर काही वैशिष्ट्ये <i>अद्याप</i> उपलब्ध नाही. पण <i>तुमच्या मदतीने व पाठिंब्याने</i>, आम्ही ह्यात टप्प्याटप्प्याने सुधार करू शकतो.
+
+ऑरगॅनिक मॅप्स हे <b>प्रेमाने निर्मित, शुद्ध व सेंद्रिय असे</b> आहे:
+
+• अतिजलद ऑफलाइन चालणारे
+• तुमच्या गोपनीयतेचा आदर करणारे
+• तुमची बॅटरी वाचवणारे
+• अनपेक्षित मोबाइल डेटा शुल्क नाही
+• महत्त्वाच्या वैशिष्ट्यांसह वापरण्यास सोपे
+
+ऑर्गेनिक मॅप्स हे माहिती मागोवा व इतर वाईट सामग्रीपासून मुक्त आहे:
+
+• जाहिराती नाही
+• माहिती मागोवा नाही
+• कोणतेही डेटा संग्रहण नाही
+• तुम्हाला फोन करत नाही
+• कोणतीही त्रासदायक नोंदणी नाही
+• कोणतीही अनिवार्य शिकवणी नाही
+• कोणताही त्रासदायक ईमेल स्पॅम नाही
+• सूचनापत्रे नाही
+• हेर सॉफ्टवेअर नाही
+• पूर्णपणे सेंद्रिय
+
+गोपनीयता हा मूलभूत मानवी हक्क आहे, असे ऑरगॅनिक मॅप्सचे धोरण आहे:
+
+• ऑरगॅनिक मॅप्स हा एक स्वतंत्र समुदाय-चालित व मुक्त स्त्रोत प्रकल्प आहे
+• आम्‍ही तुमच्‍या गोपनीयतेचे "बिग टेक"च्‍या नजरेपासून संरक्षण करतो
+• जिथे असाल तिथे सुरक्षित रहा
+
+ह्या ऍप मध्ये "एक्सोडस प्रायव्हसी रिपोर्ट"नुसार शून्य ट्रॅकर्स आणि फक्त किमान आवश्यक परवानग्या आढळतात.
+
+कृपया अतिरिक्त तपशील आणि वारंवार विचारलेले प्रश्नांसाठी <b><i>organicmaps.app</i></b> संकेतस्थळावर भेट द्या आणि टेलिग्रामवर @OrganicMapsApp वर थेट आमच्याशी संपर्क साधा.
+
+पाळत ठेवण्यास नकार द्या - तुमचे स्वातंत्र्य स्वीकारा.
+
+<b>ऑरगॅनिक मॅप्स वापरून पहा!</b>
--- a/android/src/fdroid/play/listings/mr-IN/short-description.txt
+++ b/android/src/fdroid/play/listings/mr-IN/short-description.txt
@ -0,0 +1 @@
+प्रवासी, पर्यटक, सायकलस्वार व ट्रेकिंगसाठी समुदाय-चालित व मुक्त स्त्रोत नकाशे
--- a/android/src/fdroid/play/listings/mr-IN/title.txt
+++ b/android/src/fdroid/play/listings/mr-IN/title.txt
@ -0,0 +1 @@
+Organic Maps ऑफलाईन नकाशे
--- a/android/src/fdroid/play/listings/mr-IN/video-url.txt
+++ b/android/src/fdroid/play/listings/mr-IN/video-url.txt
@ -0,0 +1 @@
+https://www.youtube.com/watch?v=dK-CUuy82Uc
--- a/android/src/fdroid/play/listings/pt-BR/full-description.txt
+++ b/android/src/fdroid/play/listings/pt-BR/full-description.txt
@ -0,0 +1,52 @@
+‣ Nosso aplicativo gratuito não rastreia você e não tem anúncios e é apoiado por suas doações.
+‣ Está sendo constantemente aperfeiçoado por nossa pequena equipe, em tempo livre, usando nosso próprio dinheiro e doações/contribuições de nossos usuários.
+‣ Se algo estiver errado ou faltando no mapa, por favor, conserte-o via <b>OpenStreetMap</b> e veja estas mudanças na próxima atualização dos mapas.
+‣ Se a navegação ou a busca não funcionar, por favor, envie-nos um e-mail. Respondemos a <i>CADA</i> email, e vamos consertar tudo o mais rápido possível!
+
+<b>Seu feedback e as avaliações de 5 estrelas são as melhores maneiras de motivar nossa equipe!</b>
+
+Características principais:
+• Gratuito, de software livre, sem anúncios, sem rastreamento
+• Mapas offline detalhados com lugares que não existem no Google maps, gratidão a comunidade do <b>OpenStreetMap</b>
+• Rotas para ciclistas, trilhas e áreas para caminhadas
+• Linhas de contorno, perfis de elevação, picos e declives
+• Caminhada, ciclismo e navegação EXPERIMENTAL de carro com orientação por voz
+• Busca rápida offline
+• Exportação e importação de favoritos em formatos KML/KMZ (GPX está chegando em breve)
+• Modo escuro para proteger sua vista
+
+Organic Maps ainda não tem suporte ao Android Auto, transporte público, mapas de satélite e outras características legais, <i>por enquanto</i>. Mas com a <i>sua ajuda e apoio</i>, podemos tornar este mundo melhor, passo a passo.
+
+Organic Maps é <b>puro e orgânico, feito com amor</b>:
+
+• Desempenho offline incrivelmente rápido
+• Respeita sua privacidade
+• Economiza sua bateria
+• Sem taxas imprevistas de dados móveis
+• Simples de usar, apenas com funcionalidades mais importantes incluídas
+
+Livre de rastreadores e outras coisas ruins:
+
+• Sem anúncios
+• Sem rastreamento
+• Sem coleta de dados
+• Sem conexões para servidores externos
+• Sem registros desnecessários
+• Sem tutoriais obrigatórios
+• Sem spam por e-mail
+• Sem notificações push
+• Sem recursos maliciosos
+• Sem pesticidas, Puramente orgânico
+
+Organic Maps acredita que <b>a privacidade é um direito humano fundamental</b>:
+
+• Organic Maps é um projeto indie de iniciativa comunitária de software livre
+• Protegemos a sua privacidade contra os olhos curiosos da Big Tech
+• Fique protegido, não importa onde você esteja
+
+Zero rastreadores e apenas as permissões absolutamente necessárias são exigidas, testado por Exodus Privacy Report.
+
+Por favor, visite o site <b><i>organicmaps.app</i></b> para mais detalhes e FAQ ou entre em contato diretamente via Telegram @OrganicMapsApp.
+
+Rejeite a vigilância - abrace sua liberdade.
+<b>Experimente o Organic Maps!</b>
--- a/android/src/fdroid/play/listings/pt-BR/short-description.txt
+++ b/android/src/fdroid/play/listings/pt-BR/short-description.txt
@ -0,0 +1 @@
+Mapas colaborativos de software livre para viajantes, turistas e ciclistas
--- a/android/src/fdroid/play/listings/pt-BR/title.txt
+++ b/android/src/fdroid/play/listings/pt-BR/title.txt
@ -0,0 +1 @@
+Organic Maps, mapas offline
--- a/android/src/fdroid/play/listings/pt-BR/video-url.txt
+++ b/android/src/fdroid/play/listings/pt-BR/video-url.txt
@ -0,0 +1 @@
+https://www.youtube.com/watch?v=0qTpVcVjXCU
--- a/android/src/fdroid/play/release-notes/en-US/default.txt
+++ b/android/src/fdroid/play/release-notes/en-US/default.txt
@ -1,11 +1,5 @@
-• New OSM data as of May 15, 2022
-• Improved car and pedestrian directions
-• Improved cross-region routing
-• Fixed some pedestrian/bike/car routing issues
-• Improved SD-card storage setting
-• Fixed GPS search on start
-• Fixed accidental postion jumps near WiFi
-• Some performance optimizations
-• Fixed some translations
-• Added Marathi language
-• Added Devanagari font
+This is a hotfix release. Please see previous release notes on our website for more details.
+
+• Fixed disappearing of downloaded maps files bug introduced in the last release.
+If you were affected, please open "Save maps to" in OM settings and switch to "Internal private storage" (with a /data/data/... path). Then tap OK to move maps, and all your disappeared maps will be back shortly! After that, you can switch to a storage option of your choice.
+• Do not draw place=region.
--- a/android/src/fdroid/play/release-notes/tr-TR
+++ b/android/src/fdroid/play/release-notes/tr-TR
@ -1,10 +0,0 @@
-• Yeni OSM harita verileri (15 Mayıs 2022)
-• İyileştirilmiş araba ve yaya yönlendirmeleri
-• İyileştirilmiş bölgeler arası yönlendirme
-• Bazı yaya/bisiklet/araba yönlendirme sorunları düzeltildi
-• İyileştirilmiş SD kart ayarları
-• Başlangıçta GPS aramasında düzeltmeler
-• WiFi yakınında yanlışlıkla yapılan konum atlamaları düzeltildi
-• Bazı performans optimizasyonları
-• Bazı çeviriler düzeltildi
-• Devanagari yazı tipi eklendi
--- a/android/src/fdroid/play/release-notes/tr-TR/default.txt
+++ b/android/src/fdroid/play/release-notes/tr-TR/default.txt
@ -0,0 +1,4 @@
+Bu bir hata düzeltme sürümüdür
+• Son sürümde indirilen haritaların gözükmemesine sebep olan hata düzeltildi.
+Eğer bu hatadan etkilendiyseniz, uygulama ayarlarından "Haritaları şuraya kaydet:" ayarını açın ve "Internal private storage" (/data/data/... yolu ile gözüken) seçeneğini seçin. Ardından haritaları taşımak için Tamam'a dokunun ve gözükmeyen tüm haritalarınız geri gelecektir! Sonrasında istediğiniz bir depolama seçeneğine geçebilirsiniz.
+• Artık place=region metinleri haritada çizilmiyor.
--- a/android/src/fdroid/play/version.yaml
+++ b/android/src/fdroid/play/version.yaml
@ -1 +1 @@
-version: 2022.05.24-2-FDroid+22052402
+version: 2022.05.31-10-FDroid+22053110
--- a/android/src/google/play/listings/mr-IN/full-description.txt
+++ b/android/src/google/play/listings/mr-IN/full-description.txt
@ -0,0 +1 @@
+../../../../fdroid/play/listings/mr-IN/full-description.txt
--- a/android/src/google/play/listings/mr-IN/short-description.txt
+++ b/android/src/google/play/listings/mr-IN/short-description.txt
@ -0,0 +1 @@
+../../../../fdroid/play/listings/mr-IN/short-description.txt
--- a/android/src/google/play/listings/mr-IN/title.txt
+++ b/android/src/google/play/listings/mr-IN/title.txt
@ -0,0 +1 @@
+../../../../fdroid/play/listings/mr-IN/title.txt
--- a/android/src/google/play/listings/mr-IN/video-url.txt
+++ b/android/src/google/play/listings/mr-IN/video-url.txt
@ -0,0 +1 @@
+../../../../fdroid/play/listings/en-US/video-url.txt
--- a/android/src/google/play/listings/pt-BR
+++ b/android/src/google/play/listings/pt-BR
@ -0,0 +1 @@
+../../../fdroid/play/listings/pt-BR
--- a/android/src/google/play/release-notes
+++ b/android/src/google/play/release-notes
@ -0,0 +1 @@
+../../fdroid/play/release-notes
--- a/android/src/google/play/release-notes/en-US/default.txt
+++ b/android/src/google/play/release-notes/en-US/default.txt
@ -1 +0,0 @@
-../../../../fdroid/play/release-notes/en-US/default.txt
--- a/data/categories.txt
+++ b/data/categories.txt
--- a/data/countries-strings/mr.json/localize.json
+++ b/data/countries-strings/mr.json/localize.json
--- a/data/countries_names.txt
+++ b/data/countries_names.txt
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@ -2555,7 +2555,7 @@ cont {
  element {
    scale: 17
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2571,7 +2571,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2587,7 +2587,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -30177,7 +30177,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
@ -30185,7 +30185,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@ -2555,7 +2555,7 @@ cont {
  element {
    scale: 17
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2571,7 +2571,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2587,7 +2587,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -29839,7 +29839,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
@ -29847,7 +29847,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@ -2555,7 +2555,7 @@ cont {
  element {
    scale: 17
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2571,7 +2571,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -2587,7 +2587,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "bicycle-m"
+      name: "bicycle-rental"
      priority: 16631
    }
    caption {
@ -29987,7 +29987,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
@ -29995,7 +29995,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16844
      min_distance: 12
    }
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@ -17705,7 +17705,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16776
      min_distance: 12
    }
@ -17713,7 +17713,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16776
      min_distance: 12
    }
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@ -18029,7 +18029,7 @@ cont {
  element {
    scale: 18
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16776
      min_distance: 12
    }
@ -18037,7 +18037,7 @@ cont {
  element {
    scale: 19
    symbol {
-      name: "monument-m"
+      name: "plaque"
      priority: 16776
      min_distance: 12
    }
--- a/data/resources-6plus_clear/symbols.png
+++ b/data/resources-6plus_clear/symbols.png
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
--- a/data/resources-6plus_dark/symbols.png
+++ b/data/resources-6plus_dark/symbols.png
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
--- a/data/resources-hdpi_clear/symbols.png
+++ b/data/resources-hdpi_clear/symbols.png
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
--- a/data/resources-hdpi_dark/symbols.png
+++ b/data/resources-hdpi_dark/symbols.png
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
--- a/data/resources-mdpi_clear/symbols.png
+++ b/data/resources-mdpi_clear/symbols.png
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
--- a/data/resources-mdpi_dark/symbols.png
+++ b/data/resources-mdpi_dark/symbols.png
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
--- a/data/resources-xhdpi_clear/symbols.png
+++ b/data/resources-xhdpi_clear/symbols.png
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
--- a/data/resources-xhdpi_dark/symbols.png
+++ b/data/resources-xhdpi_dark/symbols.png
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
--- a/data/resources-xxhdpi_clear/symbols.png
+++ b/data/resources-xxhdpi_clear/symbols.png
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
--- a/data/resources-xxhdpi_dark/symbols.png
+++ b/data/resources-xxhdpi_dark/symbols.png
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
--- a/data/resources-xxxhdpi_clear/symbols.png
+++ b/data/resources-xxxhdpi_clear/symbols.png
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
--- a/data/resources-xxxhdpi_dark/symbols.png
+++ b/data/resources-xxxhdpi_dark/symbols.png
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
--- a/data/sound-strings/mr.json/localize.json
+++ b/data/sound-strings/mr.json/localize.json
@ -0,0 +1,67 @@
+{
+"make_a_slight_right_turn":"उजवीकडे ठेवा.",
+"make_a_right_turn":"उजवीकडे वळा.",
+"make_a_sharp_right_turn":"तीव्र उजवे वळण",
+"enter_the_roundabout":"चौकात प्रवेश करा.",
+"leave_the_roundabout":"चौकातून बाहेर पडा.",
+"make_a_slight_left_turn":"डावीकडे ठेवा.",
+"make_a_left_turn":"डावीकडे वळा.",
+"make_a_sharp_left_turn":"तीव्र डावे वळण",
+"make_a_u_turn":"यू-टर्न घ्या.",
+"go_straight":"सरळ जा.",
+"exit":"बाहेर पडा.",
+"destination":"तुम्ही पोहोचाल.",
+"you_have_reached_the_destination":"तुम्ही पोहोचला आहात.",
+"in_50_meters":"पन्नास मीटर मध्ये",
+"in_100_meters":"शंभर मीटर मध्ये",
+"in_200_meters":"दोनशे मीटर मध्ये",
+"in_250_meters":"अडीचशे मीटर मध्ये",
+"in_300_meters":"तीनशे मीटर मध्ये",
+"in_400_meters":"चारशे मीटर मध्ये",
+"in_500_meters":"पाचशे मीटर मध्ये",
+"in_600_meters":"सहाशे मीटर मध्ये",
+"in_700_meters":"सातशे मीटर मध्ये",
+"in_750_meters":"साडेसातशे मीटर मध्ये",
+"in_800_meters":"आठशे मीटर मध्ये",
+"in_900_meters":"नऊशे मीटर मध्ये",
+"in_1_kilometer":"एक किलोमीटर मध्ये",
+"in_1_5_kilometers":"दीड किलोमीटरमध्ये",
+"in_2_kilometers":"दोन किलोमीटर मध्ये",
+"in_2_5_kilometers":"अडीच किलोमीटरमध्ये",
+"in_3_kilometers":"तीन किलोमीटर मध्ये",
+"then":"मग",
+"take_the_1_exit":"पहिला निर्गमन घ्या",
+"take_the_2_exit":"दुसरा निर्गमन घ्या",
+"take_the_3_exit":"तिसरा निर्गमन घ्या",
+"take_the_4_exit":"चौथा निर्गमन घ्या",
+"take_the_5_exit":"पाचवा निर्गमन घ्या",
+"take_the_6_exit":"सहावा निर्गमन घ्या",
+"take_the_7_exit":"सातवा निर्गमन घ्या",
+"take_the_8_exit":"आठवा निर्गमन घ्या",
+"take_the_9_exit":"नववा निर्गमन घ्या",
+"take_the_10_exit":"दहावा निर्गमन घ्या",
+"take_the_11_exit":"अकरावा निर्गमन घ्या",
+"in_50_feet":"पन्नास फुटांत",
+"in_100_feet":"शंभर फुटात",
+"in_200_feet":"दोनशे फुटांत",
+"in_300_feet":"तीनशे फुटांत",
+"in_400_feet":"चारशे फुटांत",
+"in_500_feet":"पाचशे फुटात",
+"in_600_feet":"सहाशे फुटांत",
+"in_700_feet":"सातशे फुटांत",
+"in_800_feet":"आठशे फुटांत",
+"in_900_feet":"नऊशे फुटांत",
+"in_1000_feet":"एक हजार फुटात",
+"in_1500_feet":"पंधराशे फुटांत",
+"in_2000_feet":"दोन हजार फुटात",
+"in_2500_feet":"पंचवीसशे फुटांत",
+"in_3000_feet":"तीन हजार फुटात",
+"in_3500_feet":"पस्तीसशे फुटांत",
+"in_4000_feet":"चार हजार फुटात",
+"in_4500_feet":"पंचेचाळीसशे फुटांत",
+"in_5000_feet":"पाच हजार फुटात",
+"in_1_mile":"एक मैल मध्ये",
+"in_1_5_miles":"दीड मैल मध्ये",
+"in_2_miles":"दोन मैल मध्ये",
+"unknown_camera":"पुढे कॅमेरा आहे"
+}
--- a/data/strings/sound.txt
+++ b/data/strings/sound.txt
@ -20,6 +20,7 @@
    it = Rimani sulla destra.
    ja = 右を維持してください。
    ko = 오른쪽에 두기.
+    mr = उजवीकडे ठेवा.
    nl = Rechts aanhouden.
    pl = Trzymaj się prawej strony.
    pt = Mantenha-se à direita.
@ -55,6 +56,7 @@
    it = Gira a destra.
    ja = 右に曲がります。
    ko = 우회전하십시오.
+    mr = उजवीकडे वळा.
    nl = Sla rechtsaf.
    pl = Skręć w prawo.
    pt = Vire à direita.
@ -90,6 +92,7 @@
    it = Svoltare a destra.
    ja = 急に右折。
    ko = 급우회전.
+    mr = तीव्र उजवे वळण
    nl = Scherp rechtsaf.
    pl = Ostro w prawo.
    pt = Curva acentuada à direita.
@ -125,6 +128,7 @@
    it = Entra nella rotonda.
    ja = ロータリー入口です。
    ko = 로터리 진입입니다.
+    mr = चौकात प्रवेश करा.
    nl = Rij de rotonde op.
    pl = Wjedź na rondo.
    pt = Entre na rotunda.
@ -160,6 +164,7 @@
    it = Esci dalla rotonda.
    ja = ロータリーから抜けてください。
    ko = 원형 교차로에서 나갑니다.
+    mr = चौकातून बाहेर पडा.
    nl = Verlaat de rotonde.
    pl = Zjazd z ronda.
    pt = Saia da rotunda.
@ -195,6 +200,7 @@
    it = Rimani sulla sinistra.
    ja = 左を維持してください。
    ko = 왼쪽에 두기.
+    mr = डावीकडे ठेवा.
    nl = Links aanhouden.
    pl = Trzymaj się lewej strony.
    pt = Mantenha-se à esquerda.
@ -230,6 +236,7 @@
    it = Gira a sinistra.
    ja = 左に曲がります。
    ko = 좌회전하십시오.
+    mr = डावीकडे वळा.
    nl = Sla linksaf.
    pl = Skręć w lewo.
    pt = Vire à esquerda.
@ -265,6 +272,7 @@
    it = Svoltare a sinistra.
    ja = 急に左折。
    ko = 급좌회전.
+    mr = तीव्र डावे वळण
    nl = Scherp linksaf.
    pl = Ostro w lewo.
    pt = Curva acentuada à esquerda.
@ -300,6 +308,7 @@
    it = Effettua un'inversione a U.
    ja = Uターンです。
    ko = 유턴입니다.
+    mr = यू-टर्न घ्या.
    nl = Keer om.
    pl = Zawróć.
    pt = Faça inversão de marcha.
@ -335,6 +344,7 @@
    it = Sempre dritto.
    ja = 直進です。
    ko = 직진입니다.
+    mr = सरळ जा.
    nl = Rij rechtdoor.
    pl = Jedź prosto.
    pt = Siga em frente.
@ -370,6 +380,7 @@
    it = Uscita.
    ja = 出口.
    ko = 출구.
+    mr = बाहेर पडा.
    nl = Verlaat.
    pl = Zjazd.
    pt = Saída.
@ -405,6 +416,7 @@
    it = Arriverai.
    ja = 到着します。
    ko = 도착할 예정입니다.
+    mr = तुम्ही पोहोचाल.
    nl = Arriveert u.
    pl = Dojedziesz.
    pt = Você vai chegar.
@ -440,6 +452,7 @@
    it = Sei arrivato.
    ja = 到着。
    ko = 도착했습니다.
+    mr = तुम्ही पोहोचला आहात.
    nl = Bestemming bereikt.
    pl = Jesteś u celu.
    pt = Chegou.
@ -475,6 +488,7 @@
    it = Tra cinquanta metri
    ja = 五十メートル先
    ko = 오십 미터 앞
+    mr = पन्नास मीटर मध्ये
    nl = Over vijftig meter
    pl = Za pięćdziesiąt metrów
    pt = A cinquenta metros
@ -510,6 +524,7 @@
    it = Tra cento metri
    ja = 百メートル先
    ko = 백 미터 앞
+    mr = शंभर मीटर मध्ये
    nl = Over honderd meter
    pl = Za sto metrów
    pt = A cem metros
@ -545,6 +560,7 @@
    it = Tra duecento metri
    ja = 二百メートル先
    ko = 이백 미터 앞
+    mr = दोनशे मीटर मध्ये
    nl = Over tweehonderd meter
    pl = Za dwieście metrów
    pt = A duzentos metros
@ -580,6 +596,7 @@
    it = Tra duecento cinquanta metri
    ja = 二百五十メートル先
    ko = 이백오십 미터 앞
+    mr = अडीचशे मीटर मध्ये
    nl = Over tweehonderdvijftig meter
    pl = Za dwieście pięćdziesiąt metrów
    pt = A duzentos e cinquenta metros
@ -615,6 +632,7 @@
    it = Tra trecento metri
    ja = 三百メートル先
    ko = 삼백 미터 앞
+    mr = तीनशे मीटर मध्ये
    nl = Over driehonderd meter
    pl = Za trzysta metrów
    pt = A trezentos metros
@ -650,6 +668,7 @@
    it = Tra quattrocento metri
    ja = 四百メートル先
    ko = 사백 미터 앞
+    mr = चारशे मीटर मध्ये
    nl = Over vierhonderd meter
    pl = Za czterysta metrów
    pt = A quatrocentos metros
@ -685,6 +704,7 @@
    it = Tra cinquecento metri
    ja = 五百メートル先
    ko = 오백 미터 앞
+    mr = पाचशे मीटर मध्ये
    nl = Over vijfhonderd meter
    pl = Za pięćset metrów
    pt = A quinhentos metros
@ -720,6 +740,7 @@
    it = Tra seicento metri
    ja = 六百メートル先
    ko = 육백 미터 앞
+    mr = सहाशे मीटर मध्ये
    nl = Over zeshonderd meter
    pl = Za sześćset metrów
    pt = A seiscentos metros
@ -755,6 +776,7 @@
    it = Tra settecento metri
    ja = 七百メートル先
    ko = 칠백 미터 앞
+    mr = सातशे मीटर मध्ये
    nl = Over zevenhonderd meter
    pl = Za siedemset metrów
    pt = A setecentos metros
@ -790,6 +812,7 @@
    it = Tra settecento cinquanta metri
    ja = 七百五十メートル先
    ko = 칠백오십 미터 앞
+    mr = साडेसातशे मीटर मध्ये
    nl = Over zevenhonderdvijftig meter
    pl = Za siedemset pięćdziesiąt metrów
    pt = A setecentos e cinquenta metros
@ -825,6 +848,7 @@
    it = Tra ottocento metri
    ja = 八百メートル先
    ko = 팔백 미터 앞
+    mr = आठशे मीटर मध्ये
    nl = Over achthonderd meter
    pl = Za osiemset metrów
    pt = A oitocentos metros
@ -860,6 +884,7 @@
    it = Tra novecento metri
    ja = 九百メートル先
    ko = 구백 미터 앞
+    mr = नऊशे मीटर मध्ये
    nl = Over negenhonderd meter
    pl = Za dziewięćset metrów
    pt = A novecentos metros
@ -895,6 +920,7 @@
    it = Tra un chilometro
    ja = 一キロ先
    ko = 일 킬로미터 앞
+    mr = एक किलोमीटर मध्ये
    nl = Over één kilometer
    pl = Za kilometr
    pt = A um quilómetro
@ -930,6 +956,7 @@
    it = Tra un chilometro e mezzo
    ja = 一.五キロ先
    ko = 일점오 킬로미터 앞
+    mr = दीड किलोमीटरमध्ये
    nl = Over anderhalve kilometer
    pl = Za półtora kilometra
    pt = A um quilómetro e meio
@ -965,6 +992,7 @@
    it = Tra due chilometri
    ja = 二キロ先
    ko = 이 킬로미터 앞
+    mr = दोन किलोमीटर मध्ये
    nl = Over twee kilometer
    pl = Za dwa kilometry
    pt = A dois quilómetros
@ -1000,6 +1028,7 @@
    it = Tra due chilometri e mezzo
    ja = 二.五キロ先
    ko = 이점오 킬로미터 앞
+    mr = अडीच किलोमीटरमध्ये
    nl = Over tweeëneenhalve kilometer
    pl = Za dwa i pół kilometra
    pt = A dois quilómetros e meio
@ -1035,6 +1064,7 @@
    it = Tra tre chilometri
    ja = 三キロ先
    ko = 삼 킬로미터 앞
+    mr = तीन किलोमीटर मध्ये
    nl = Over drie kilometer
    pl = Za trzy kilometry
    pt = A três quilômetros
@ -1070,6 +1100,7 @@
    it = Poi
    ja = その先
    ko = 그 다음
+    mr = मग
    nl = Daarna
    pl = Następnie
    pt = Depois
@ -1105,6 +1136,7 @@
    it = Prendi la prima uscita.
    ja = 一番目の出口です。
    ko = 첫 번째 출구입니다.
+    mr = पहिला निर्गमन घ्या
    nl = Neem de eerste afslag.
    pl = Zjedź pierwszym zjazdem.
    pt = Saia na primeira saída.
@ -1140,6 +1172,7 @@
    it = Prendi la seconda uscita.
    ja = 二番目の出口です。
    ko = 두 번째 출구입니다.
+    mr = दुसरा निर्गमन घ्या
    nl = Neem de tweede afslag.
    pl = Zjedź drugim zjazdem.
    pt = Saia na segunda saída.
@ -1175,6 +1208,7 @@
    it = Prendi la terza uscita.
    ja = 三番目の出口です。
    ko = 세 번째 출구입니다.
+    mr = तिसरा निर्गमन घ्या
    nl = Neem de derde afslag.
    pl = Zjedź trzecim zjazdem.
    pt = Saia na terceira saída.
@ -1210,6 +1244,7 @@
    it = Prendi la quarta uscita.
    ja = 四番目の出口です。
    ko = 네 번째 출구입니다.
+    mr = चौथा निर्गमन घ्या
    nl = Neem de vierde afslag.
    pl = Zjedź czwartym zjazdem.
    pt = Saia na quarta saída.
@ -1245,6 +1280,7 @@
    it = Prendi la quinta uscita.
    ja = 五番目の出口です。
    ko = 다섯 번째 출구입니다.
+    mr = पाचवा निर्गमन घ्या
    nl = Neem de vijfde afslag.
    pl = Zjedź piątym zjazdem.
    pt = Saia na quinta saída.
@ -1280,6 +1316,7 @@
    it = Prendi la sesta uscita.
    ja = 六番目の出口です。
    ko = 여섯 번째 출구입니다.
+    mr = सहावा निर्गमन घ्या
    nl = Neem de zesde afslag.
    pl = Zjedź szóstym zjazdem.
    pt = Saia na sexta saída.
@ -1315,6 +1352,7 @@
    it = Prendi la settima uscita.
    ja = 七番目の出口です。
    ko = 일곱 번째 출구입니다.
+    mr = सातवा निर्गमन घ्या
    nl = Neem de zevende afslag.
    pl = Zjedź siódmym zjazdem.
    pt = Saia na sétima saída.
@ -1350,6 +1388,7 @@
    it = Prendi l'ottava uscita.
    ja = 八番目の出口です。
    ko = 여덟 번째 출구입니다.
+    mr = आठवा निर्गमन घ्या
    nl = Neem de achtste afslag.
    pl = Zjedź ósmym zjazdem.
    pt = Saia na oitava saída.
@ -1385,6 +1424,7 @@
    it = Prendi la nona uscita.
    ja = 九番目の出口です。
    ko = 아홉 번째 출구입니다.
+    mr = नववा निर्गमन घ्या
    nl = Neem de negende afslag.
    pl = Zjedź dziewiątym zjazdem.
    pt = Saia na nona saída.
@ -1420,6 +1460,7 @@
    it = Prendi la decima uscita.
    ja = 十番目の出口です。
    ko = 열 번째 출구입니다.
+    mr = दहावा निर्गमन घ्या
    nl = Neem de tiende afslag.
    pl = Zjedź dziesiątym zjazdem.
    pt = Saia na décima saída.
@ -1455,6 +1496,7 @@
    it = Prendi l'undicesima uscita.
    ja = 十一番目の出口です。
    ko = 열한 번째 출구입니다.
+    mr = अकरावा निर्गमन घ्या
    nl = Neem de elfde afslag.
    pl = Zjedź jedenastym zjazdem.
    pt = Saia na décima primeira saída.
@ -1490,6 +1532,7 @@
    it = Tra cinquanta piedi
    ja = 五十フィート先
    ko = 오십 피트 앞
+    mr = पन्नास फुटांत
    nl = Over vijftig voet
    pl = Za pięćdziesiąt stóp
    pt = A cinquenta pés
@ -1525,6 +1568,7 @@
    it = Tra cento piedi
    ja = 百フィート先
    ko = 백 피트 앞
+    mr = शंभर फुटात
    nl = Over honderd voet
    pl = Za sto stóp
    pt = A cem pés
@ -1560,6 +1604,7 @@
    it = Tra duecento piedi
    ja = 二百フィート先
    ko = 이백 피트 앞
+    mr = दोनशे फुटांत
    nl = Over tweehonderd voet
    pl = Za dwieście stóp
    pt = A duzentos pés
@ -1595,6 +1640,7 @@
    it = Tra trecento piedi
    ja = 三百フィート先
    ko = 삼백 피트 앞
+    mr = तीनशे फुटांत
    nl = Over driehonderd voet
    pl = Za trzysta stóp
    pt = A trezentos pés
@ -1630,6 +1676,7 @@
    it = Tra quattrocento piedi
    ja = 四百フィート先
    ko = 사백 피트 앞
+    mr = चारशे फुटांत
    nl = Over vierhonderd voet
    pl = Za czterysta stóp
    pt = A quatrocentos pés
@ -1665,6 +1712,7 @@
    it = Tra cinquecento piedi
    ja = 五百フィート先
    ko = 오백 피트 앞
+    mr = पाचशे फुटात
    nl = Over vijfhonderd voet
    pl = Za pięćset stóp
    pt = A quinhentos pés
@ -1700,6 +1748,7 @@
    it = Tra seicento piedi
    ja = 六百フィート先
    ko = 육백 피트 앞
+    mr = सहाशे फुटांत
    nl = Over zeshonderd voet
    pl = Za sześćset stóp
    pt = A seiscentos pés
@ -1735,6 +1784,7 @@
    it = Tra settecento piedi
    ja = 七百フィート先
    ko = 칠백 피트 앞
+    mr = सातशे फुटांत
    nl = Over zevenhonderd voet
    pl = Za siedemset stóp
    pt = A setecentos pés
@ -1770,6 +1820,7 @@
    it = Tra ottocento piedi
    ja = 八百フィート先
    ko = 팔백 피트 앞
+    mr = आठशे फुटांत
    nl = Over achthonderd voet
    pl = Za osiemset stóp
    pt = A oitocentos pés
@ -1805,6 +1856,7 @@
    it = Tra novecento piedi
    ja = 九百フィート先
    ko = 구백 피트 앞
+    mr = नऊशे फुटांत
    nl = Over negenhonderd voet
    pl = Za dziewięćset stóp
    pt = A novecentos pés
@ -1840,6 +1892,7 @@
    it = Tra mille piedi
    ja = 千フィート先
    ko = 천 피트 앞
+    mr = एक हजार फुटात
    nl = Over duizend voet
    pl = Za tysiąc stóp
    pt = A mil pés
@ -1875,6 +1928,7 @@
    it = Tra mille cinquecento piedi
    ja = 千五百フィート先
    ko = 천오백 피트 앞
+    mr = पंधराशे फुटांत
    nl = Over vijftienhonderd voet
    pl = Za tysiąc pięćset stóp
    pt = A mil e quinhentos pés
@ -1910,6 +1964,7 @@
    it = Tra duemila piedi
    ja = 二千フィート先
    ko = 이천 피트 앞
+    mr = दोन हजार फुटात
    nl = Over tweeduizend voet
    pl = Za dwa tysiące stóp
    pt = A dois mil pés
@ -1945,6 +2000,7 @@
    it = Tra duemila cinquecento piedi
    ja = 二千五百フィート先
    ko = 이천오백 피트 앞
+    mr = पंचवीसशे फुटांत
    nl = Over vijfentwintighonderd voet
    pl = Za dwa i pół tysiąca stóp
    pt = A dois mil e quinhentos pés
@ -1980,6 +2036,7 @@
    it = Tra tremila piedi
    ja = 三千フィート先
    ko = 삼천 피트 앞
+    mr = तीन हजार फुटात
    nl = Over drieduizend voet
    pl = Za trzy tysiące stóp
    pt = A três mil pés
@ -2015,6 +2072,7 @@
    it = Tra tremila cinquecento piedi
    ja = 三千五百フィート先
    ko = 삼천오백 피트 앞
+    mr = पस्तीसशे फुटांत
    nl = Over vijfendertighonderd voet
    pl = Za trzy i pół tysiąca stóp
    pt = A três mil e quinhentos pés
@ -2050,6 +2108,7 @@
    it = Tra quattromila piedi
    ja = 四千フィート先
    ko = 사천 피트 앞
+    mr = चार हजार फुटात
    nl = Over vierduizend voet
    pl = Za cztery tysiące stóp
    pt = A quatro mil pés
@ -2085,6 +2144,7 @@
    it = Tra quattromila cinquecento piedi
    ja = 四千五百フィート先
    ko = 사천오백 피트 앞
+    mr = पंचेचाळीसशे फुटांत
    nl = Over vijfenveertighonderd voet
    pl = Za cztery i pół tysiąca stóp
    pt = A quatro mil e quinhentos pés
@ -2120,6 +2180,7 @@
    it = Tra cinquemila piedi
    ja = 五千フィート先
    ko = 오천 피트 앞
+    mr = पाच हजार फुटात
    nl = Over vijfduizend voet
    pl = Za pięć tysięcy stóp
    pt = A cinco mil pés
@ -2155,6 +2216,7 @@
    it = Tra un miglio
    ja = 一マイル先
    ko = 일 마일 앞
+    mr = एक मैल मध्ये
    nl = Over één mijl
    pl = Za jedną milę
    pt = A uma milha
@ -2190,6 +2252,7 @@
    it = Tra un miglio e mezzo
    ja = 一.五マイル先
    ko = 일점오 마일 앞
+    mr = दीड मैल मध्ये
    nl = Over anderhalve mijl
    pl = Za półtorej mili
    pt = A uma milha e meia
@ -2225,6 +2288,7 @@
    it = Tra due miglia
    ja = 二マイル先
    ko = 이 마일 앞
+    mr = दोन मैल मध्ये
    nl = Over twee mijl
    pl = Za dwie mile
    pt = A duas milhas
@ -2259,6 +2323,7 @@
    it = Autovelox in prossimità
    ja = この先にある自動速度違反取締装置
    ko = 전방에 카메라
+    mr = पुढे कॅमेरा आहे
    nb = Kommer til kamera
    nl = Camera in zicht
    pl = Kamera z przodu
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@ -1039,7 +1039,7 @@ area|z15-[historic=memorial][memorial=plaque],
 {icon-image: zero-icon.svg;text: none;}
 node|z18-[historic=memorial][memorial=plaque],
 area|z18-[historic=memorial][memorial=plaque]
-{icon-image: monument-m.svg;icon-min-distance: 12;}
+{icon-image: plaque.svg;icon-min-distance: 12;}

 node|z13-14[tourism=museum],
 area|z13-14[tourism=museum]
@ -1937,7 +1937,7 @@ area|z18-[office=diplomatic]

 node|z17-[amenity=bicycle_rental],
 area|z17-[amenity=bicycle_rental]
-{icon-image: bicycle-m.svg;text-optional: true;}
+{icon-image: bicycle-rental.svg;text-optional: true;}
 node|z18-[amenity=bicycle_rental],
 area|z18-[amenity=bicycle_rental]
 {font-size: 11;text-optional: true;}
--- a/data/styles/clear/style-clear/symbols/bicycle-rental.svg
+++ b/data/styles/clear/style-clear/symbols/bicycle-rental.svg
@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="20"
+   height="20"
+   viewBox="0 0 20 20"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="bicycle-rental.svg"
+   xml:space="preserve"
+   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs14" /><sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="51.35"
+     inkscape:cx="6.24148"
+     inkscape:cy="10.038948"
+     inkscape:window-width="1281"
+     inkscape:window-height="1373"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" /><title
+     id="title2">bike-parking-m</title><g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     inkscape:label="Page-1"><g
+       id="bike-parking-m"
+       fill-rule="nonzero"
+       inkscape:label="bicycle-rental"><rect
+         id="Rectangle"
+         fill="#ffffff"
+         opacity="0.6"
+         x="0"
+         y="0"
+         width="20"
+         height="20"
+         rx="2.5" /><rect
+         id="rect5"
+         fill="#2e89b0"
+         x="1"
+         y="1"
+         width="18"
+         height="18"
+         rx="2" /><path
+         d="M 13.605,11.3 12.613333,8.57 C 12.444167,8.1091667 12.006667,7.8 11.516667,7.8 H 10 v 1.166667 h 1.516667 L 12.368333,11.3 H 9.5625 l -0.21,-0.583333 H 10 V 9.55 H 7.0833333 v 1.166667 h 1.0208334 l 1.0616666,2.916666 H 8.775 C 8.5183333,12.3325 7.4275,11.37 6.0625,11.305833 4.4291667,11.224167 3,12.583333 3,14.216667 3,15.85 4.2833333,17.133333 5.9166667,17.133333 7.3516667,17.133333 8.5125,16.1475 8.775,14.8 h 2.45 c 0.256667,1.300833 1.3475,2.263333 2.7125,2.3275 C 15.570833,17.203333 17,15.85 17,14.210833 17,12.5775 15.716667,11.294167 14.083333,11.294167 H 13.605 Z m -6.0433333,3.5 c -0.2333334,0.6825 -0.8691667,1.166667 -1.645,1.166667 -0.98,0 -1.75,-0.77 -1.75,-1.75 0,-0.98 0.77,-1.75 1.75,-1.75 0.7758333,0 1.4116666,0.484166 1.645,1.166666 h -1.645 V 14.8 Z M 11.225,13.633333 H 10.408333 L 9.9825,12.466667 H 11.75 c -0.256667,0.338333 -0.443333,0.729166 -0.525,1.166666 z m 2.858333,2.333334 c -0.98,0 -1.75,-0.77 -1.75,-1.75 0,-0.5425 0.239167,-1.009167 0.6125,-1.33 l 0.56,1.54 L 14.6025,14.03 14.036667,12.4725 c 0.0175,0 0.035,-0.0058 0.0525,-0.0058 0.98,0 1.75,0.77 1.75,1.75 0,0.98 -0.775834,1.75 -1.755834,1.75 z"
+         id="Shape"
+         fill="#ffffff" /><path
+         d="M 9.0974292,3.7508575 C 8.7734292,2.8482856 7.9171425,2.208 6.9142859,2.208 5.6337145,2.208 4.6,3.2417146 4.6,4.5222859 c 0,1.2728567 1.0337145,2.3142866 2.3142859,2.3142866 1.0028566,0 1.8591432,-0.648 2.1831433,-1.5428577 h 3.9882938 v 1.5428577 h 1.542852 V 5.2937148 H 15.4 V 3.7508575 Z M 6.9142859,5.2937148 c -0.4242856,0 -0.7714284,-0.3471425 -0.7714284,-0.7714289 0,-0.4242856 0.3471428,-0.7714284 0.7714284,-0.7714284 0.4242864,0 0.7714289,0.3471428 0.7714289,0.7714284 0,0.4242864 -0.3471425,0.7714289 -0.7714289,0.7714289 z"
+         id="path306"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.771425" /></g></g></svg>
--- a/data/styles/clear/style-clear/symbols/plaque.svg
+++ b/data/styles/clear/style-clear/symbols/plaque.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="12"
+   height="10"
+   viewBox="0 0 12 10"
+   version="1.1"
+   id="svg34808"
+   sodipodi:docname="plaque.svg"
+   xml:space="preserve"
+   inkscape:export-filename="../plaque.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs34812" /><sodipodi:namedview
+     id="namedview34810"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="102.7"
+     inkscape:cx="5.7108082"
+     inkscape:cy="5.0097371"
+     inkscape:window-width="2560"
+     inkscape:window-height="1371"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg34808" /><title
+     id="title34800">cinema-m</title><g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     inkscape:label="Page-1"
+     style="opacity:1"
+     transform="translate(-6,-7.0000005)"><g
+       id="cinema-m"
+       fill-rule="nonzero"
+       inkscape:label="plaque"><path
+         d="m 7.5000003,7.0000004 a 1.5,1.5 0 0 0 -1.5000001,1.5 V 15.5 A 1.5,1.5 0 0 0 7.5000003,17 H 16.5 A 1.5,1.5 0 0 0 18,15.5 V 8.5000004 a 1.5,1.5 0 0 0 -1.5,-1.5 z m 0,1 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z M 16.5,15 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,-6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m -6.5,1 h 1 V 10 h -1 z m 2,0 h 2 V 10 H 12 Z M 8.0000003,11 H 16 v 1 H 8.0000003 Z M 10,13 h 4 v 1 h -4 z"
+         id="path37004"
+         style="fill:#717065;fill-opacity:1" /></g></g></svg>
--- a/data/styles/clear/style-night/symbols/bicycle-rental.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-rental.svg
@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="20"
+   height="20"
+   viewBox="0 0 20 20"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="bicycle-rental.svg"
+   xml:space="preserve"
+   inkscape:export-filename="../../../../../../../Bilder/bicycle_rental/bike-rental.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs14" /><sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="51.35"
+     inkscape:cx="9.4352483"
+     inkscape:cy="10.019474"
+     inkscape:window-width="2560"
+     inkscape:window-height="1371"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" /><title
+     id="title2">bike-parking-m</title><g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="opacity:0.6"
+     inkscape:label="Page-2:-Night"><g
+       id="bike-parking-m"
+       fill-rule="nonzero"
+       inkscape:label="bicycle-rental"><rect
+         id="Rectangle"
+         fill="#ffffff"
+         opacity="0.6"
+         x="0"
+         y="0"
+         width="20"
+         height="20"
+         rx="2.5" /><rect
+         id="rect5"
+         fill="#2e89b0"
+         x="1"
+         y="1"
+         width="18"
+         height="18"
+         rx="2" /><path
+         d="M 13.605,11.3 12.613333,8.57 C 12.444167,8.1091667 12.006667,7.8 11.516667,7.8 H 10 v 1.166667 h 1.516667 L 12.368333,11.3 H 9.5625 l -0.21,-0.583333 H 10 V 9.55 H 7.0833333 v 1.166667 h 1.0208334 l 1.0616666,2.916666 H 8.775 C 8.5183333,12.3325 7.4275,11.37 6.0625,11.305833 4.4291667,11.224167 3,12.583333 3,14.216667 3,15.85 4.2833333,17.133333 5.9166667,17.133333 7.3516667,17.133333 8.5125,16.1475 8.775,14.8 h 2.45 c 0.256667,1.300833 1.3475,2.263333 2.7125,2.3275 C 15.570833,17.203333 17,15.85 17,14.210833 17,12.5775 15.716667,11.294167 14.083333,11.294167 H 13.605 Z m -6.0433333,3.5 c -0.2333334,0.6825 -0.8691667,1.166667 -1.645,1.166667 -0.98,0 -1.75,-0.77 -1.75,-1.75 0,-0.98 0.77,-1.75 1.75,-1.75 0.7758333,0 1.4116666,0.484166 1.645,1.166666 h -1.645 V 14.8 Z M 11.225,13.633333 H 10.408333 L 9.9825,12.466667 H 11.75 c -0.256667,0.338333 -0.443333,0.729166 -0.525,1.166666 z m 2.858333,2.333334 c -0.98,0 -1.75,-0.77 -1.75,-1.75 0,-0.5425 0.239167,-1.009167 0.6125,-1.33 l 0.56,1.54 L 14.6025,14.03 14.036667,12.4725 c 0.0175,0 0.035,-0.0058 0.0525,-0.0058 0.98,0 1.75,0.77 1.75,1.75 0,0.98 -0.775834,1.75 -1.755834,1.75 z"
+         id="Shape"
+         fill="#ffffff" /><path
+         d="M 9.0974292,3.7508575 C 8.7734292,2.8482856 7.9171425,2.208 6.9142859,2.208 5.6337145,2.208 4.6,3.2417146 4.6,4.5222859 c 0,1.2728567 1.0337145,2.3142866 2.3142859,2.3142866 1.0028566,0 1.8591432,-0.648 2.1831433,-1.5428577 h 3.9882938 v 1.5428577 h 1.542852 V 5.2937148 H 15.4 V 3.7508575 Z M 6.9142859,5.2937148 c -0.4242856,0 -0.7714284,-0.3471425 -0.7714284,-0.7714289 0,-0.4242856 0.3471428,-0.7714284 0.7714284,-0.7714284 0.4242864,0 0.7714289,0.3471428 0.7714289,0.7714284 0,0.4242864 -0.3471425,0.7714289 -0.7714289,0.7714289 z"
+         id="path306"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.771425" /></g></g></svg>
--- a/data/styles/clear/style-night/symbols/plaque.svg
+++ b/data/styles/clear/style-night/symbols/plaque.svg
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="12"
+   height="10"
+   viewBox="0 0 12 10"
+   version="1.1"
+   id="svg34808"
+   sodipodi:docname="plaque.svg"
+   xml:space="preserve"
+   inkscape:export-filename="plaque.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs34812" /><sodipodi:namedview
+     id="namedview34810"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" /><title
+     id="title34800">cinema-m</title><g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     inkscape:label="Page-2:-Night"
+     style="opacity:0.6"
+     transform="translate(-6,-7.0000005)"><g
+       id="cinema-m"
+       fill-rule="nonzero"
+       inkscape:label="plaque"><path
+         d="m 7.5000003,7.0000004 a 1.5,1.5 0 0 0 -1.5000001,1.5 V 15.5 A 1.5,1.5 0 0 0 7.5000003,17 H 16.5 A 1.5,1.5 0 0 0 18,15.5 V 8.5000004 a 1.5,1.5 0 0 0 -1.5,-1.5 z m 0,1 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z M 16.5,15 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,-6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m -6.5,1 h 1 V 10 h -1 z m 2,0 h 2 V 10 H 12 Z M 8.0000003,11 H 16 v 1 H 8.0000003 Z M 10,13 h 4 v 1 h -4 z"
+         id="path37004"
+         style="fill:#ffffff;fill-opacity:1" /></g></g></svg>
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@ -496,7 +496,7 @@ area|z17[historic=memorial][memorial=plaque]
 {icon-image: zero-icon.svg;text: none;}
 node|z18-[historic=memorial][memorial=plaque],
 area|z18-[historic=memorial][memorial=plaque]
-{icon-image: monument-m.svg;icon-min-distance: 12;}
+{icon-image: plaque.svg;icon-min-distance: 12;}

 node|z15[tourism=museum],
 area|z15[tourism=museum]
--- a/generator/generator_tests/CMakeLists.txt
+++ b/generator/generator_tests/CMakeLists.txt
@ -38,6 +38,7 @@ set(SRC
  osm_o5m_source_test.cpp
  osm_type_test.cpp
  place_processor_tests.cpp
+  relation_tags_tests.cpp
  restriction_collector_test.cpp
  restriction_test.cpp
  road_access_test.cpp
--- a/generator/generator_tests/collector_building_parts_tests.cpp
+++ b/generator/generator_tests/collector_building_parts_tests.cpp
@ -30,7 +30,9 @@ public:
  }

  // OSMElementCacheReaderInterface overrides:
-  bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { UNREACHABLE(); }
+  bool Read(generator::cache::Key /* id */, WayElement & /* value */) override {
+    CHECK(false, ("Should not be called"));
+  }

  bool Read(generator::cache::Key id, RelationElement & value) override
  {
--- a/generator/generator_tests/relation_tags_tests.cpp
+++ b/generator/generator_tests/relation_tags_tests.cpp
@ -0,0 +1,245 @@
+#include "testing/testing.hpp"
+
+#include "generator/generator_tests/common.hpp"
+#include "generator/relation_tags.hpp"
+#include "generator/intermediate_data.hpp"
+
+// TODO: Rewrite these tests using RelationTagsEnricher with some test mock of IntermediateDataReaderInterface.
+namespace relation_tags_tests
+{
+using namespace feature;
+using namespace generator;
+using namespace generator::cache;
+using namespace generator_tests;
+
+// In memory relations storage (copy-n-paste from collector_building_parts_tests.cpp).
+class TestOSMElementCacheReader : public OSMElementCacheReaderInterface
+{
+public:
+  TestOSMElementCacheReader(std::unordered_map<Key, RelationElement> & m)
+    : m_mapping(m)
+  {
+  }
+
+  // OSMElementCacheReaderInterface overrides:
+  bool Read(Key /* id */, WayElement & /* value */) override {
+    CHECK(false, ("Should not be called"));
+  }
+
+  bool Read(Key id, RelationElement & value) override
+  {
+    auto const it = m_mapping.find(id);
+    if (it == std::cend(m_mapping))
+      return false;
+
+    value = it->second;
+    return true;
+  }
+
+private:
+  std::unordered_map<Key, RelationElement> & m_mapping;
+};
+
+UNIT_TEST(Process_route_with_ref)
+{
+  /* Prepare relations data:
+   * Relation 1:
+   *   - type = route
+   *   - route = road
+   *   - ref = E-99
+   *   - members: [
+   *       Way 10:
+   *         - highway = motorway
+   *       Way 11:
+   *         - highway = motorway
+   *         - ref = F-16
+   *     ]
+   */
+
+  // Create relation.
+  std::vector<RelationElement::Member> testMembers = {{10, ""}, {11, ""}};
+
+  RelationElement e1;
+  e1.m_ways = testMembers;
+  e1.m_tags.emplace("type", "route");
+  e1.m_tags.emplace("route", "road");
+  e1.m_tags.emplace("ref", "E-99");
+
+  std::unordered_map<Key, RelationElement> m_IdToRelation = {{1, e1}};
+  TestOSMElementCacheReader reader(m_IdToRelation);
+
+  // Create roads.
+  auto road10 = MakeOsmElement(10, {{"highway", "motorway"}}, OsmElement::EntityType::Way);
+  auto road11 = MakeOsmElement(11, {{"highway", "motorway"}, {"ref", "F-16"}}, OsmElement::EntityType::Way);
+
+  // Process roads tags using relation tags.
+  RelationTagsWay rtw;
+
+  rtw.Reset(10, &road10);
+  rtw(1, reader);
+
+  rtw.Reset(11, &road11);
+  rtw(1, reader);
+
+  // Verify roads tags.
+  TEST_EQUAL(road10.GetTag("ref"), "E-99", ());
+  TEST_EQUAL(road11.GetTag("ref"), "F-16", ());
+}
+
+UNIT_TEST(Process_route_with_ref_network)
+{
+  /* Prepare relations data:
+   * Relation 1:
+   *   - type = route
+   *   - route = road
+   *   - ref = SP60
+   *   - network = IT:RA
+   *   - members: [
+   *       Way 10:
+   *         - highway = motorway
+   *         - name = Via Corleto
+   *       Way 11:
+   *         - highway = motorway
+   *         - ref = SP62
+   *     ]
+   */
+
+  // Create relation.
+  std::vector<RelationElement::Member> testMembers = {{10, ""}, {11, ""}};
+
+  RelationElement e1;
+  e1.m_ways = testMembers;
+  e1.m_tags.emplace("type", "route");
+  e1.m_tags.emplace("route", "road");
+  e1.m_tags.emplace("ref", "SP60");
+  e1.m_tags.emplace("network", "IT:RA");
+
+  std::unordered_map<Key, RelationElement> m_IdToRelation = {{1, e1}};
+  TestOSMElementCacheReader reader(m_IdToRelation);
+
+  // Create roads.
+  auto road10 = MakeOsmElement(10, {{"highway", "motorway"}, {"name", "Via Corleto"}}, OsmElement::EntityType::Way);
+  auto road11 = MakeOsmElement(11, {{"highway", "motorway"}, {"ref", "SP62"}}, OsmElement::EntityType::Way);
+
+  // Process roads tags using relation tags.
+  RelationTagsWay rtw;
+
+  rtw.Reset(10, &road10);
+  rtw(1, reader);
+
+  rtw.Reset(11, &road11);
+  rtw(1, reader);
+
+  // Verify roads tags.
+  TEST_EQUAL(road10.GetTag("ref"), "IT:RA/SP60", ());
+  TEST_EQUAL(road11.GetTag("ref"), "SP62", ()); // TODO: Check refs inheritance (expected "IT:RA/SP60;SP62")
+}
+
+UNIT_TEST(Process_associatedStreet)
+{
+  /* Prepare relations data:
+   * Relation 1:
+   *   - type = associatedStreet
+   *   - name = Main street
+   *   - wikipedia = en:Main Street
+   *   - place =
+   *   - members: [
+   *       Way 2:
+   *         - building = yes
+   *         - addr:housenumber = 121
+   *       Way 3:
+   *         - building = house
+   *         - addr:housenumber = 123
+   *         - addr:street = The Main Street
+   *     ]
+   */
+
+  // Create relation.
+  std::vector<RelationElement::Member> testMembers = {{2, "house"}, {3, "house"}};
+
+  RelationElement e1;
+  e1.m_ways = testMembers;
+  e1.m_tags.emplace("type", "associatedStreet");
+  e1.m_tags.emplace("name", "Main Street");
+  e1.m_tags.emplace("wikipedia", "en:Main Street");
+
+  std::unordered_map<Key, RelationElement> m_IdToRelation = {{1, e1}};
+  TestOSMElementCacheReader reader(m_IdToRelation);
+
+  // Create buildings polygons.
+  auto buildingWay2 = MakeOsmElement(2, {{"building", "yes"}, {"addr:housenumber", "121"}}, OsmElement::EntityType::Way);
+  auto buildingWay3 = MakeOsmElement(3, {{"auto const", "yes"}, {"addr:housenumber", "123"}, {"addr:street", "The Main Street"}, {"wikipedia", "en:Mega Theater"}}, OsmElement::EntityType::Way);
+
+  // Process buildings tags using relation tags.
+  RelationTagsWay rtw;
+
+  rtw.Reset(2, &buildingWay2);
+  rtw(1, reader);
+
+  rtw.Reset(3, &buildingWay3);
+  rtw(1, reader);
+
+  // Verify ways tags.
+  TEST_EQUAL(buildingWay2.GetTag("addr:street"), "Main Street", ());
+  TEST_EQUAL(buildingWay2.HasTag("wikipedia"), false, ());
+
+  TEST_EQUAL(buildingWay3.GetTag("addr:street"), "The Main Street", ());
+  TEST_EQUAL(buildingWay3.HasTag("wikipedia"), true, ());
+}
+
+UNIT_TEST(Process_boundary)
+{
+  /* Prepare relations data:
+   * Relation 1:
+   *   - type = boundary
+   *   - place = peninsula
+   *   - name = Penisola italiana
+   *   - members: [
+   *       Way 5:
+   *         - natural = coastline
+   *       Way 6:
+   *         - natural = coastline
+   *         - name = Cala Rossa
+   *     ]
+   */
+
+  // Create relation.
+  std::vector<RelationElement::Member> testMembers = {{5, "outer"}, {6, "outer"}};
+
+  RelationElement e1;
+  e1.m_ways = testMembers;
+  e1.m_tags.emplace("type", "boundary");
+  e1.m_tags.emplace("place", "peninsula");
+  e1.m_tags.emplace("name", "Penisola italiana");
+  e1.m_tags.emplace("name:en", "Italian Peninsula");
+  e1.m_tags.emplace("wikidata", "Q145694");
+
+  std::unordered_map<Key, RelationElement> m_IdToRelation = {{1, e1}};
+  TestOSMElementCacheReader reader(m_IdToRelation);
+
+  // Create ways.
+  auto outerWay5 = MakeOsmElement(5, {{"natural", "coastline"}}, OsmElement::EntityType::Way);
+  auto outerWay6 = MakeOsmElement(6, {{"natural", "coastline"}, {"name", "Cala Rossa"}}, OsmElement::EntityType::Way);
+
+  // Process ways tags using relation tags.
+  RelationTagsWay rtw;
+
+  rtw.Reset(5, &outerWay5);
+  rtw(1, reader);
+
+  rtw.Reset(6, &outerWay6);
+  rtw(1, reader);
+
+  // Verify ways tags.
+  TEST_EQUAL(outerWay5.HasTag("place"), false, ());
+  TEST_EQUAL(outerWay5.HasTag("name"), false, ());
+  TEST_EQUAL(outerWay5.HasTag("name:en"), false, ());
+  TEST_EQUAL(outerWay5.GetTag("wikidata"), "Q145694", ());
+
+  TEST_EQUAL(outerWay6.HasTag("place"), false, ());
+  TEST_EQUAL(outerWay6.HasTag("name"), true, ());
+  TEST_EQUAL(outerWay6.HasTag("name:en"), false, ());
+  TEST_EQUAL(outerWay6.GetTag("wikidata"), "Q145694", ());
+}
+
+}
--- a/generator/relation_tags.cpp
+++ b/generator/relation_tags.cpp
@ -100,7 +100,8 @@ void RelationTagsWay::Process(RelationElement const & e)
    return;

  bool const isBoundary = (type == "boundary") && IsAcceptBoundary(e);
-  bool const processAssociatedStreet = type == "associatedStreet" &&
+  bool const isAssociatedStreet = type == "associatedStreet";
+  bool const processAssociatedStreet = isAssociatedStreet &&
                                       Base::IsKeyTagExists("addr:housenumber") &&
                                       !Base::IsKeyTagExists("addr:street");
  bool const isHighway = Base::IsKeyTagExists("highway");
@ -122,6 +123,9 @@ void RelationTagsWay::Process(RelationElement const & e)
      continue;
    }

+    if (isAssociatedStreet && p.first == "wikipedia")
+      continue;
+
    if (!isBoundary && p.first == "boundary")
      continue;

--- a/indexer/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
@ -66,15 +66,15 @@ public:
  // Should match codes in the array below.
  static int8_t constexpr kEnglishCode = 1;
  static int8_t constexpr kUnsupportedLocaleCode = -1;
-  static int8_t constexpr kSimplifiedChineseCode = 38;
-  static int8_t constexpr kTraditionalChineseCode = 39;
+  static int8_t constexpr kSimplifiedChineseCode = 39;
+  static int8_t constexpr kTraditionalChineseCode = 40;
  // *NOTE* These constants should be updated when adding new
  // translation to categories.txt. When editing, keep in mind to check
  // CategoriesHolder::MapLocaleToInteger() and
  // CategoriesHolder::MapIntegerToLocale() as their implementations
  // strongly depend on the contents of the variable.
  // TODO: Refactor for more flexibility and to avoid breaking rules in two methods mentioned above.
-  static std::array<CategoriesHolder::Mapping, 39> constexpr kLocaleMapping = {{
+  static std::array<CategoriesHolder::Mapping, 40> constexpr kLocaleMapping = {{
      {"en", kEnglishCode},
      {"en-AU", 2},
      {"en-GB", 3},
@ -98,20 +98,21 @@ public:
      {"it", 21},
      {"ja", 22},
      {"ko", 23},
-      {"nb", 24},
-      {"nl", 25},
-      {"pl", 26},
-      {"pt", 27},
-      {"pt-BR", 28},
-      {"ro", 29},
-      {"ru", 30},
-      {"sk", 31},
-      {"sv", 32},
-      {"sw", 33},
-      {"th", 34},
-      {"tr", 35},
-      {"uk", 36},
-      {"vi", 37},
+      {"mr", 24},
+      {"nb", 25},
+      {"nl", 26},
+      {"pl", 27},
+      {"pt", 28},
+      {"pt-BR", 29},
+      {"ro", 30},
+      {"ru", 31},
+      {"sk", 32},
+      {"sv", 33},
+      {"sw", 34},
+      {"th", 35},
+      {"tr", 36},
+      {"uk", 37},
+      {"vi", 38},
      {"zh-Hans", kSimplifiedChineseCode},
      {"zh-Hant", kTraditionalChineseCode},
  }};
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@ -315,7 +315,7 @@ UNIT_TEST(CategoriesIndex_AllCategories)
  index.AddAllCategoriesInAllLangs();
  // Consider deprecating this method if this bound rises as high as a million.
  LOG(LINFO, ("Number of nodes in the CategoriesIndex trie:", index.GetNumTrieNodes()));
-  TEST_LESS(index.GetNumTrieNodes(), 450000, ());
+  TEST_LESS(index.GetNumTrieNodes(), 600000, ());
 }
 #endif

--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@ -532,7 +532,7 @@
 "editor_time_delete" = "Apagar horário";

 /* Text for allday switch. */
-"editor_time_allday" = "O Dia Todo (24 horas)";
+"editor_time_allday" = "O dia todo (24 horas)";

 "editor_time_open" = "Aberto";

@ -636,7 +636,7 @@

 "migration_download_error_dialog" = "Erro no download";

-"common_check_internet_connection_dialog" = "Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à Internet.";
+"common_check_internet_connection_dialog" = "Por favor, verifique as suas configurações e certifique-se de que o dispositivo está conectado à internet.";

 "downloader_no_space_title" = "Não há espaço suficiente";

@ -731,7 +731,7 @@
 "location_services_disabled_2" = "2. Toque em \"Localização\"";

 /* iOS Dialog for the case when the location permission is not granted */
-"location_services_disabled_3" = "3. Selecione Durante Uso do Aplicativo";
+"location_services_disabled_3" = "3. Selecione \"Durante uso do aplicativo\"";

 "meter" = "m";

--- a/iphone/plist.txt
+++ b/iphone/plist.txt
@ -17,6 +17,7 @@
    it = Cerca
    ja = 検索
    ko = 검색하기
+    mr = शोधा
    nb = Søk
    nl = Zoeken
    pl = Szukaj
@ -54,6 +55,7 @@
    it = Segnalibri
    ja = ブックマーク
    ko = 북마크
+    mr = खूणपत्रे
    nb = Bokmerker
    nl = Bladwijzers
    pl = Zakładki
@ -93,6 +95,7 @@
    it = Linea
    ja = 経路
    ko = 경로
+    mr = मार्ग
    lt = Maršrutas
    lv = Maršruts
    ms = Laluan
@ -137,6 +140,7 @@
    it = Il rilevamento della posizione corrente in background è necessario per godere appieno delle funzionalità dell'app. Viene utilizzato per la navigazione e il salvataggio della traccia percorsa di recente.
    ja = バックグラウンドでの現在位置の定義は、アプリの機能を完全にご利用いただくために必要です。にルート追跡と最近の道のりの保存に使用されます。
    ko = 백그라운드에서 현재 위치를 정의하는 것은 완전히 앱의 기능을 즐길 수 있도록 해줍니다. 이는 로 경로를 따르고 최근 여행 경로를 저장하는 옵션에 사용됩니다.
+    mr = ऍपच्या कार्यक्षमतेचा पूर्णपणे आनंद घेण्यासाठी पार्श्वभूमीतील स्थान जाणणे आवश्यक आहे. मार्गनिर्देशनासाठी व अलीकडे प्रवास केलेला मार्ग जतन करण्यासाठी ह्याचा उपयोग होतो.
    nb = Det er nødvendig å fastslå den gjeldende posisjonen i bakgrunnen for å utnytte appens funksjonalitet til fulle. Dette brukes når en rute skal følges og når den siste reiseruten din skal lagres.
    nl = Het op de achtergrond vaststellen van de huidige locatie is noodzakelijk om volledig gebruik te maken van de functionaliteit van de app. Dit wordt gebruikt bij de opties voor het volgen van de route en het opslaan van je recent afgelegde pad.
    pl = Określanie w tle bieżącej lokalizacji jest konieczne, aby w pełni korzystać z funkcjonalności aplikacji. Funkcji tej używa się w ramach opcji podążania zgodnie z trasą i zapisywania niedawno przebytej trasy.
@ -174,6 +178,7 @@
    it = La definizione della posizione corrente viene utilizzata nelle opzioni di tracciamento del percorso e salvataggio del percorso effettuato di recente.
    ja = 現在位置の定義はルート追跡オプションと最近使用したルートの保存に使用されます。
    ko = 현재 위치를 정의하는 것은 경로를 따르고 최근 여행한 경로를 저장하는 옵션에서 사용됩니다.
+    mr = मार्गनिर्देशनासाठी व अलीकडे प्रवास केलेला मार्ग जतन करण्यासाठी तुमचे स्थान जाणणे आवश्यक आहे.
    nb = Definerer nåværende plassering brukes i alternativene hvor man følger ruten og lagrer din nylige reiseretning.
    nl = Bepaling van de huidige locatie wordt gebruikt in de opties voor het volgen van de route en het opslaan van uw onlangs afgelegde weg.
    pl = Określanie bieżącej lokalizacji używane jest w przypadku opcji podążania trasą i zapisywania ostatnio przebytej trasy.
--- a/qt/res/app.organicmaps.desktop.metainfo.xml
+++ b/qt/res/app.organicmaps.desktop.metainfo.xml
@ -107,6 +107,14 @@
  </screenshots>

  <releases>
+   <release version="2022.05.31-10" date="2022-05-31">
+     <description>
+       <ul>
+         <li>Do not draw place=region.</li>
+         <li>Fix crash on routing.</li>
+       </ul>
+     </description>
+   </release>
   <release version="2022.05.24-2" date="2022-05-24">
     <description>
       <ul>
--- a/routing/base/astar_algorithm.hpp
+++ b/routing/base/astar_algorithm.hpp
@ -207,6 +207,7 @@ public:
  template <typename P>
  Result FindPath(P & params, RoutingResult<Vertex, Weight> & result) const;

+  /// Fetch routes until \a emitter returns false.
  template <class P, class Emitter>
  Result FindPathBidirectionalEx(P & params, Emitter && emitter) const;

@ -215,6 +216,7 @@ public:
  {
    return FindPathBidirectionalEx(params, [&result](RoutingResult<Vertex, Weight> && res)
    {
+      // Fetch first (best) route and stop.
      result = std::move(res);
      return true;
    });
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@ -834,6 +834,7 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
    AlgoT algorithm;
    auto const result = algorithm.FindPathBidirectionalEx(params, [&routes, &edges, &keys](RoutingResultT && route)
    {
+      // Routes fetching is not necessary ordered by m_distance, so continue search.
      if (routes.size() > kMaxNumRoutes && routes.top().m_distance <= route.m_distance)
        return false;

@ -858,7 +859,7 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
      return keys[0].size() >= maxVertices && keys[1].size() >= maxVertices;
    });

-    if (result != AlgoT::Result::OK)
+    if (routes.empty() || result == AlgoT::Result::Cancelled)
      return ConvertResult<Vertex, Edge, Weight>(result);

    candidates = routes.move();
				`@ -0,0 +1 @@`
				`प्रवासी, पर्यटक, सायकलस्वार व ट्रेकिंगसाठी समुदाय-चालित व मुक्त स्त्रोत नकाशे`
				`@ -0,0 +1 @@`
				`Organic Maps ऑफलाईन नकाशे`
				`@ -0,0 +1 @@`
				`Mapas colaborativos de software livre para viajantes, turistas e ciclistas`
				`@ -0,0 +1 @@`
				`../../../../fdroid/play/listings/mr-IN/full-description.txt`
				`@ -0,0 +1 @@`
				`../../../../fdroid/play/listings/en-US/video-url.txt`
				`@ -1 +0,0 @@`
				`../../../../fdroid/play/release-notes/en-US/default.txt`