[generator] Use 56 general threads

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

android/app/build.gradle

@@ -352,6 +352,7 @@ dependencies {
   implementation libs.androidx.work.runtime
   implementation libs.androidx.lifecycle.process
   implementation libs.androidx.documentfile
+  // 1.13 Material library version doesn't render properly alpha properties on map buttons
   implementation libs.android.material
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

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

@@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       default -> throw new AssertionError("Unexpected result code = " + result);
     };
 
-        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        mAlertDialog = new MaterialAlertDialogBuilder(this)
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)

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

@@ -432,7 +432,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
                                .setMessage(R.string.unknown_current_position)
                                .setCancelable(true)
                                .setPositiveButton(R.string.ok, null)
@@ -655,7 +655,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         else
         {
           dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+          mAlertDialog = new MaterialAlertDialogBuilder(this)
                              .setTitle(R.string.message_invalid_feature_position)
                              .setPositiveButton(R.string.ok, null)
                              .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -1155,7 +1155,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (type == IsolinesState.EXPIREDDATA)
     {
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+      mAlertDialog = new MaterialAlertDialogBuilder(this)
                          .setTitle(R.string.downloader_update_maps)
                          .setMessage(R.string.isolines_activation_error_dialog)
                          .setPositiveButton(
@@ -1774,7 +1774,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.unable_to_calc_alert_title)
             .setMessage(R.string.unable_to_calc_alert_subtitle)
             .setPositiveButton(R.string.settings,
@@ -1797,7 +1797,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       builder.append(getString(resId)).append("\n\n");
 
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.dialog_routing_disclaimer_title)
                        .setMessage(builder.toString())
                        .setCancelable(false)
@@ -1846,7 +1846,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return true;
 
     final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
         .setTitle(R.string.p2p_only_from_current)
         .setMessage(R.string.p2p_reroute_from_current)
         .setCancelable(false)
@@ -2040,7 +2040,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         {
           mPreciseLocationDialogShown = true;
           final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+              new MaterialAlertDialogBuilder(this)
                   .setTitle("⚠ " + getString(R.string.limited_accuracy))
                   .setMessage(R.string.precise_location_is_disabled_long_text)
                   .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2074,7 +2074,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(this)
                                .setTitle(R.string.enable_location_services)
                                .setMessage(R.string.location_is_disabled_long_text)
                                .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2167,7 +2167,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
                                                    .setTitle(R.string.enable_location_services)
                                                    .setMessage(R.string.location_is_disabled_long_text)
                                                    .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2253,7 +2253,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     dismissAlertDialog();
     final MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.current_location_unknown_error_title)
             .setCancelable(true)
             .setMessage(R.string.power_save_dialog_summary)
@@ -2278,7 +2278,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.unknown_file_type, uri))
             .setPositiveButton(R.string.ok, null)
@@ -2295,7 +2295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.failed_to_open_file, uri, error))
             .setPositiveButton(R.string.ok, null)
@@ -2317,7 +2317,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onBookmarksFileImportFailed()
   {
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.load_kmz_title)
                        .setMessage(R.string.load_kmz_failed)
                        .setPositiveButton(R.string.ok, null)
@@ -2578,7 +2578,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void reportUnsupported()
   {
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this)
         .setMessage(R.string.unsupported_phone)
         .setCancelable(false)
         .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))

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

@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
   private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
   {
     mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
         .setTitle(titleId)
         .setMessage(messageId)
         .setPositiveButton(

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

@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
     case BookmarkSharingResult.SUCCESS ->
       SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
     case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.bookmarks_error_title_share_empty)
           .setMessage(R.string.bookmarks_error_message_share_empty)
           .setPositiveButton(R.string.ok, null)
           .show();
     case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
     {
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.dialog_routing_system_error)
           .setMessage(R.string.bookmarks_error_message_share_general)
           .setPositiveButton(R.string.ok, null)

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

@@ -42,6 +42,7 @@ public class ChooseBookmarkCategoryFragment
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
   {
     View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
     mRecycler = root.findViewById(R.id.recycler);
     mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
     return root;

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

@@ -77,6 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
     final Bundle args = getArguments();
     if (args == null)

android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java

@@ -42,7 +42,7 @@ public final class CustomMapServerDialog
     edit.setText(current);
 
     MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(context)
             .setTitle(R.string.download_resources_custom_url_title)
             .setMessage(R.string.download_resources_custom_url_message)
             .setView(dialogView)

android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java

@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
       negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
     }
 
-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
                                      .setView(buildView())
                                      .setNegativeButton(negativeButtonText, null)
                                      .setPositiveButton(positiveButtonText, null)

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

@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   {
     if (RoutingController.get().isNavigating())
     {
-      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(adapter.mActivity)
           .setTitle(R.string.downloader_delete_map)
           .setMessage(R.string.downloader_delete_map_while_routing_dialog)
           .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       return;
     }
 
-    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(adapter.mActivity)
         .setTitle(R.string.downloader_delete_map)
         .setMessage(R.string.downloader_delete_map_dialog)
         .setNegativeButton(R.string.cancel, null)

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

@@ -49,7 +49,7 @@ public class MapManagerHelper
         return;
     }
 
-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
                                 .setTitle(R.string.country_status_download_failed)
                                 .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                 .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper
 
   private static void notifyNoSpaceInternal(Activity activity)
   {
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.downloader_no_space_title)
         .setMessage(R.string.downloader_no_space_message)
         .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
       return false;
     }
 
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.download_over_mobile_header)
         .setMessage(R.string.download_over_mobile_message)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -493,7 +493,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       }
     });
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_socket)
         .setView(dialogView)
         .setPositiveButton(R.string.save,
@@ -997,7 +997,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       message = R.string.editor_reset_edits_message;
     }
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(message)
         .setPositiveButton(title,
                            (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void placeDisused()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
       .setTitle(R.string.editor_mark_business_vacant_title)
       .setMessage(R.string.editor_mark_business_vacant_description)
       .setPositiveButton(R.string.editor_submit, (dlg, which) -> {

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -352,7 +352,7 @@ public class EditorHostFragment
 
   private void processNoFeatures()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.downloader_no_space_title)
         .setPositiveButton(R.string.ok, null)
         .show();
@@ -386,7 +386,7 @@ public class EditorHostFragment
 
   private void showNoobDialog()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java

@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
   // Duplicate of showNoobDialog()
   private void showNoteConfirmationDialog(double lat, double lon, String noteText)
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java

@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
 
   private void onAuthFail()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_login_error_dialog)
         .setPositiveButton(R.string.ok, null)
         .show();

android/app/src/main/java/app/organicmaps/help/FaqFragment.java

@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
     FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
     feedbackFab.setOnClickListener(
         v
-        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        -> new MaterialAlertDialogBuilder(requireActivity())
                .setTitle(R.string.feedback)
                .setNegativeButton(R.string.cancel, null)
                .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},

android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java

@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
     if (mDialog != null && mDialog.isShowing())
       return;
 
-    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
+    mDialog = new MaterialAlertDialogBuilder(mActivity)
                   .setMessage(R.string.common_check_internet_connection_dialog)
                   .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                   .setCancelable(true)

android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java

@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
   public Dialog onCreateDialog(Bundle savedInstanceState)
   {
     parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
                                              .setCancelable(true)
                                              .setNegativeButton(android.R.string.cancel, null);
     beforeDialogCreated(builder);

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -494,7 +494,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     pref.setOnPreferenceClickListener(preference -> {
       if (MapManager.nativeIsDownloading())
       {
-        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.downloading_is_active)
             .setMessage(R.string.cant_change_this_setting)
             .setPositiveButton(R.string.ok, null)

android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java

@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
     final String oldPath = storages.get(currentIndex).mPath;
     final String newPath = storages.get(newIndex).mPath;
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setCancelable(false)
         .setTitle(R.string.move_maps)
         .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment
 
         if (!result)
         {
-          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+          new MaterialAlertDialogBuilder(requireActivity())
               .setTitle(R.string.move_maps_error)
               .setPositiveButton(
                   R.string.report_a_bug,

android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java

@@ -61,6 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
     setCancelable(mCancelable);
     setOnCancelListener(mCancelListener);
     setContentView(R.layout.dialog_stacked_buttons);
+    getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
     TextView title = findViewById(R.id.tv__title);
     UiUtils.setTextAndHideIfEmpty(title, mTitle);

android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java

@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
         mIconResId = getArguments().getInt(ICON_RES);
     }
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setView(buildView())
         .setTitle(R.string.choose_color)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java

@@ -464,7 +464,7 @@ public class PlacePageController
       mAlertDialog.show();
       return;
     }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
                        .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                        .setCancelable(true)
                        .setNegativeButton(R.string.cancel, null)

android/app/src/main/res/drawable/bg_clickable_card.xml

@@ -4,7 +4,7 @@
   android:color="?colorControlHighlight">
   <item>
     <shape>
-      <solid android:color="?cardBackground" />
+      <solid android:color="?appBackground" />
     </shape>
   </item>
   <item android:id="@android:id/mask">

android/app/src/main/res/layout-land/dialog_stacked_buttons.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -49,3 +55,4 @@
       tools:text="Do not Use Today"/>
   </LinearLayout>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout-land/fragment_osm_login.xml

@@ -22,12 +22,9 @@
       android:layout_height="match_parent"
       android:clipChildren="false"
       android:clipToPadding="false"
-      android:orientation="vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal"
       tools:ignore="ScrollViewSize">
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
         <LinearLayout
           android:layout_width="0dp"
           android:layout_height="match_parent"
@@ -111,6 +108,5 @@
             android:text="@string/register_at_openstreetmap" />
         </LinearLayout>
       </LinearLayout>
-    </LinearLayout>
   </ScrollView>
 </LinearLayout>

android/app/src/main/res/layout-land/layout_nav_top.xml

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"

android/app/src/main/res/layout-land/onmap_downloader.xml

@@ -11,8 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:backgroundTint="?menuBackground"
-    android:background="@drawable/onmap_downloader_background"
+    android:background="?menuBackground"
     android:padding="@dimen/margin_base"
     android:clipToPadding="false"
     android:clipChildren="false"

android/app/src/main/res/layout/choose_bookmark_category_fragment.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  style="@style/Widget.Material3.CardView.Filled"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
   android:orientation="vertical"
-  android:background="?cardBackground"
   android:minWidth="@dimen/bookmark_purchase_img_width"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
@@ -21,9 +27,11 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginStart="@dimen/margin_base_plus"
     tools:text="Select list"/>
-  <include
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
     android:layout_marginTop="@dimen/margin_base"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    layout="@layout/recycler_default"/>
+    android:scrollbars="vertical"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/dialog_sorting_types.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
-  android:background="?cardBackground"
   android:minWidth="@dimen/dialog_min_width"
   android:minHeight="@dimen/dialog_min_height"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
   android:orientation="vertical"
   android:padding="@dimen/margin_base_plus">
 
@@ -77,3 +82,4 @@
       app:buttonTint="@null"/>
   </RadioGroup>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/dialog_stacked_buttons.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -41,3 +47,4 @@
     style="@style/MwmWidget.Button.StackedButtonsDialog"
     tools:text="Do not Use Today"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/downloader_item_header.xml

@@ -13,7 +13,6 @@
     android:paddingTop="@dimen/margin_half"
     android:paddingBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
-    android:background="?cardBackground"
     android:textAppearance="@style/MwmTextAppearance.Caption"
     tools:text="Downloaded"
     tools:background="#80FF0000"/>

android/app/src/main/res/layout/edit_bookmark_common.xml

@@ -6,7 +6,7 @@
   android:id="@+id/rl__bookmark_details"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_half">
   <LinearLayout
     android:id="@+id/ll__bookmark_name"

android/app/src/main/res/layout/fragment_bookmark_category_settings.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <com.google.android.material.appbar.MaterialToolbar
@@ -69,7 +69,6 @@
       android:inputType="textMultiLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <View
-      android:background="?cardBackground"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
   </LinearLayout>

android/app/src/main/res/layout/fragment_categories.xml

@@ -11,5 +11,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
-    android:fadeScrollbars="false" />
+    android:fadeScrollbars="false"
+    android:background="?appBackground"/>
 </LinearLayout>

android/app/src/main/res/layout/fragment_downloader.xml

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Floating"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <include layout="@layout/toolbar_with_search"/>
@@ -17,10 +17,12 @@
     style="@style/MwmWidget.Button.Primary"
     tools:text="@string/downloader_update_all_button"/>
 
-  <include
-    layout="@layout/recycler_default"
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?appBackground"
+    android:scrollbars="vertical"
     android:layout_below="@id/toolbar"
     android:layout_above="@id/action"/>
 

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/fragment_editor_host.xml

@@ -5,6 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar

android/app/src/main/res/layout/fragment_phone.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?cardBackground">
+        android:background="?windowBackgroundForced">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"

android/app/src/main/res/layout/fragment_search.xml

@@ -61,12 +61,12 @@
         android:layout_height="match_parent"
         android:clickable="true"
         android:focusable="true"
-        android:background="?cardBackground">
+        android:background="?appBackground">
 
         <androidx.recyclerview.widget.RecyclerView
           android:id="@+id/recycler"
           android:clipToPadding="false"
-          android:background="?cardBackground"
+          android:background="?appBackground"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           />

android/app/src/main/res/layout/fragment_search_categories.xml

@@ -4,6 +4,10 @@
   style="@style/MwmWidget.FrameLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include
-    layout="@layout/recycler_default"/>
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?appBackground"
+    android:scrollbars="vertical"/>
 </FrameLayout>

android/app/src/main/res/layout/fragment_timetable_advanced.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -13,36 +13,12 @@
     android:orientation="vertical"
     android:padding="@dimen/margin_half">
 
-    <com.google.android.material.card.MaterialCardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/et__timetable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@null"
-        android:gravity="top|start"
-        android:inputType="textMultiLine"
-        android:padding="@dimen/margin_base"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:hint="hint"
-        tools:text="trololo \ntrololo \ntrololo"/>
-
-    </com.google.android.material.card.MaterialCardView>
-
     <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">
 
       <LinearLayout
         android:id="@+id/examples"
@@ -50,6 +26,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:animateLayoutChanges="true">
+          <com.google.android.material.textfield.TextInputLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:padding="@dimen/margin_half"
+              android:layout_marginBottom="@dimen/margin_half"
+              app:hintEnabled="false">
+
+          <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/et__timetable"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignParentBottom="true"
+              android:background="@null"
+              android:gravity="top|start"
+              android:inputType="textMultiLine"
+              android:padding="@dimen/margin_base"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              tools:hint="hint"
+              tools:text="trololo \ntrololo \ntrololo"/>
+          </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__examples_title"

android/app/src/main/res/layout/item_category_description.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base">
 
   <LinearLayout

android/app/src/main/res/layout/item_category_title.xml

@@ -5,7 +5,7 @@
   style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?appBackground"
   android:gravity="start|center_vertical"
   android:paddingStart="@dimen/margin_base"
   android:paddingTop="@dimen/margin_base_plus"

android/app/src/main/res/layout/item_feature_category_footer.xml

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"

android/app/src/main/res/layout/item_missed_map.xml

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_missed_map_group.xml

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_phone.xml

@@ -1,11 +1,14 @@
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/MwmWidget.M3.Editor.CardView"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_oneline"
-    android:background="?clickableBackground"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_margin="@dimen/margin_eighth"
+    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_half"
     android:paddingStart="@dimen/margin_half_plus"
     android:paddingEnd="@dimen/margin_half_plus">
 
@@ -25,7 +28,6 @@
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
         android:layout_toStartOf="@id/delete_icon"
-        android:textColorHint="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/delete_icon"
         app:layout_constraintStart_toEndOf="@+id/phone_icon"
@@ -41,7 +43,6 @@
     <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/delete_icon"
       style="@style/MwmWidget.Editor.MetadataIcon"
-      android:layout_marginStart="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -49,3 +50,4 @@
       app:srcCompat="@drawable/ic_delete" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/layout_nav_top.xml

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"

android/app/src/main/res/layout/menu.xml

@@ -4,7 +4,7 @@
   android:id="@+id/menu_frame"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:clickable="true"
   android:visibility="gone"
   tools:visibility="visible">

android/app/src/main/res/layout/menu_route_plan_line.xml

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="horizontal"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 

android/app/src/main/res/layout/position_chooser.xml

@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

android/app/src/main/res/layout/routing_action_panel.xml

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/height_block_base"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:baselineAligned="false">
   <LinearLayout
     android:id="@+id/btn__search_point"

android/app/src/main/res/layout/routing_plan.xml

@@ -146,16 +146,13 @@
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
-    <RelativeLayout
+    <LinearLayout
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
-      <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
         <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/driving_options_btn_img"
           android:layout_width="@dimen/margin_base_plus"
@@ -174,8 +171,7 @@
           android:textAppearance="?android:attr/textAppearanceSmall"
           android:textColor="@color/text_light"
           tools:text="test" />
-      </LinearLayout>
-    </RelativeLayout>
+    </LinearLayout>
   </FrameLayout>
   <FrameLayout
     style="@style/MwmWidget.FrameLayout.Elevation"

android/app/src/main/res/values-night/themes.xml

@@ -11,7 +11,7 @@
     <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorPrimaryInverse">@color/text_dark</item>
     <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -21,7 +21,7 @@
     <item name="android:statusBarColor">?colorPrimary</item>
     <item name="android:windowTranslucentNavigation">false</item>
 
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/white_primary</item>

android/app/src/main/res/values/dimens.xml

@@ -120,7 +120,7 @@
 
   <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
   <dimen name="zoom_buttons_margin">58dp</dimen>
-  <dimen name="map_buttons_bottom_margin">184dp</dimen>
+  <dimen name="map_buttons_bottom_margin">136dp</dimen>
   <dimen name="map_buttons_bottom_max_width">300dp</dimen>
 
   <dimen name="appbar_elevation">4dp</dimen>

android/app/src/main/res/values/themes.xml

@@ -12,7 +12,7 @@
     <item name="android:textColorPrimary">@color/text_dark</item>
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -20,7 +20,7 @@
     <item name="android:windowActionBarOverlay">true</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/black_primary</item>
@@ -185,11 +185,11 @@
   </style>
 
   <style name="MwmTheme.CardBg">
-    <item name="android:windowBackground">@color/bg_cards</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.WindowBg">
-    <item name="android:windowBackground">@color/bg_window</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -243,7 +243,7 @@
 
   <style name="MwmTheme.FullScreenDialog">
     <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
@@ -281,4 +281,11 @@
   <style name="PopupMenu" parent="ThemeOverlay.Material3">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
+    <!-- Theme required to apply M3 dialog style on preference screen -->
+    <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="cornerFamily">rounded</item>
+        <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
+        <item name="android:layout">@layout/m3_alert_dialog</item>
+    </style>
 </resources>

android/sdk/src/main/res/values/types_strings.xml

@@ -947,6 +947,9 @@
     <string name="type.railway.monorail">Monorail</string>
     <string name="type.railway.monorail.bridge">Monorail Bridge</string>
     <string name="type.railway.monorail.tunnel">Monorail Tunnel</string>
+    <string name="type.railway.miniature">Miniature Railway</string>
+    <string name="type.railway.miniature.bridge">Miniature Railway Bridge</string>
+    <string name="type.railway.miniature.tunnel">Miniature Railway Tunnel</string>
     <string name="type.railway.narrow_gauge">Narrow Gauge Rail</string>
     <string name="type.railway.narrow_gauge.bridge">Narrow Gauge Rail Bridge</string>
     <string name="type.railway.narrow_gauge.tunnel">Narrow Gauge Rail Tunnel</string>

data/faq.html

@@ -1674,57 +1674,57 @@ CoMaps 的地理位置数据共享应该是启用的。</p>
     <dd lang="en">
       <p>Default battery optimization settings on Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC and other devices may stop or kill CoMaps app in the background.</p>
 <p>This is especially true for versions Android 11 and higher</p>
-<p>The exact steps on how to make CoMaps (and other apps) work in the background are listed here: https://dontkillmyapp.com/</p>
+<p>The exact steps on how to make CoMaps (and other apps) work in the background are listed here: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 </dd>
     <dd lang="ru">
       <p>Настройки оптимизации батареи по умолчанию на устройствах Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC и других могут остановить или закрыть приложение CoMaps в фоновом режиме.</p>
 <p>Это особенно актуально для версий Android 11 и выше.</p>
-<p>На этом сайте описано, как настроить работу в фоновом режиме для CoMaps и других приложений: https://dontkillmyapp.com/</p>
+<p>На этом сайте описано, как настроить работу в фоновом режиме для CoMaps и других приложений: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="de">
       <p>Die Standardeinstellungen zur Akkuoptimierung auf Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC und anderen Geräten können die CoMaps-App im Hintergrund stoppen oder beenden.</p>
 <p>Dies gilt insbesondere für Versionen Android 11 und höher</p>
-<p>Die genauen Schritte, wie man CoMaps (und andere Apps) im Hintergrund zum Laufen bringt, sind hier aufgeführt: https://dontkillmyapp.com/</p>
+<p>Die genauen Schritte, wie man CoMaps (und andere Apps) im Hintergrund zum Laufen bringt, sind hier aufgeführt: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="es">
       <p>La configuración predeterminada de optimización de la batería en Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC y otros dispositivos puede detener o cerrar la aplicación CoMaps en segundo plano.</p>
 <p>Esto es especialmente cierto para las versiones de Android 11 y superior</p>
-<p>Los pasos exactos sobre cómo hacer que CoMaps (y otras aplicaciones) funcionen en segundo plano se enumeran aquí (en inglés): https://dontkillmyapp.com/</p>
+<p>Los pasos exactos sobre cómo hacer que CoMaps (y otras aplicaciones) funcionen en segundo plano se enumeran aquí (en inglés): <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="fr">
       <p>Les paramètres d'optimisation de la batterie par défaut sur Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC et d'autres appareils peuvent arrêter ou tuer l'application CoMaps en arrière-plan.</p>
 <p>Cela est particulièrement vrai pour les versions Android 11 et supérieures</p>
-<p>Les étapes exactes pour faire fonctionner CoMaps (et d'autres applications) en arrière-plan sont listées ici : https://dontkillmyapp.com/</p>
+<p>Les étapes exactes pour faire fonctionner CoMaps (et d'autres applications) en arrière-plan sont listées ici : <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="pl">
       <p>Domyślne ustawienia optymalizacji baterii na urządzeniach Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC i innych, mogą zatrzymać aplikację CoMaps działającą w tle.</p>
 <p>Dotyczy to szczególnie wersji Android 11 i wyższych</p>
-<p>Dokładne kroki, jak sprawić, by CoMaps (i inne aplikacje) działały w tle, są wymienione tutaj: https://dontkillmyapp.com/</p>
+<p>Dokładne kroki, jak sprawić, by CoMaps (i inne aplikacje) działały w tle, są wymienione tutaj: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="pt">
       <p>As definições predefinidas de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem parar ou encerrar a aplicação CoMaps em segundo plano.</p>
 <p>Isso é especialmente verdadeiro para as versões Android 11 e superior</p>
-<p>Os passos exatos sobre como fazer com que o CoMaps (e outras aplicações) funcionem em segundo plano estão listados aqui: https://dontkillmyapp.com/</p>
+<p>Os passos exatos sobre como fazer com que o CoMaps (e outras aplicações) funcionem em segundo plano estão listados aqui: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="pt-BR">
       <p>As configurações padrão de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem interromper ou fechar o aplicativo CoMaps em segundo plano.</p>
 <p>Isso é especialmente verdadeiro para as versões Android 11 e superiores</p>
-<p>O passo-a-passo sobre como fazer o CoMaps (e outros aplicativos) funcionar em segundo plano pode ser encontrado aqui: https://dontkillmyapp.com/</p>
+<p>O passo-a-passo sobre como fazer o CoMaps (e outros aplicativos) funcionar em segundo plano pode ser encontrado aqui: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="tr">
       <p>Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC ve diğer cihazlardaki varsayılan pil optimizasyon ayarları arka planda CoMaps uygulamasını durdurabilir veya öldürebilir.</p>
 <p>Bu özellikle Android 11 ve üstü sürümler için geçerlidir</p>
-<p>CoMaps'ın (ve diğer uygulamaların) arka planda nasıl çalışacağına ilişkin tam adımlar burada listelenmiştir: https://dontkillmyapp.com/</p>
+<p>CoMaps'ın (ve diğer uygulamaların) arka planda nasıl çalışacağına ilişkin tam adımlar burada listelenmiştir: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="uk">
       <p>Стандартні налаштування оптимізації роботи акумулятора на пристроях Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC та інших пристроях можуть зупиняти або закривати додаток CoMaps у фоновому режимі.</p>
 <p>Особливо це стосується версій Android 11 і вище</p>
-<p>На цьому сайті описано, як налаштувати роботу у фоновому режимі для CoMaps та інших додатків: https://dontkillmyapp.com/</p>
+<p>На цьому сайті описано, як налаштувати роботу у фоновому режимі для CoMaps та інших додатків: <a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd><dd lang="zh">
       <p>三星、华为、谷歌、小米、OnePlus、美图、华硕、Wiko、联想、Oppo、Vivo、Realme、索尼、摩托罗拉、HTC 和其他设备上的默认电池优化设置可能会在后台停止或杀死CoMaps应用程序。</p>
 <p>对于 Android 11 及更高版本来说尤其如此</p>
-<p>如何让CoMaps（和其他应用程序）在后台工作的具体步骤在此列出：https://dontkillmyapp.com/</p>
+<p>如何让CoMaps（和其他应用程序）在后台工作的具体步骤在此列出：<a href="https://dontkillmyapp.com/">https://dontkillmyapp.com/</a></p>
 
     </dd>
   </dl>

data/mapcss-mapping.csv

@@ -757,9 +757,9 @@ highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permiss
 lateral|port;[seamark:buoy_lateral:category=port],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;632;
 lateral|starboard;[seamark:buoy_lateral:category=starboard],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;633;
 highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;
-deprecated|deprecated;635;x
-deprecated|deprecated;636;x
-deprecated|deprecated;637;x
+railway|miniature;635;
+railway|miniature|bridge;[railway=miniature][bridge?];;name;int_name;636;
+railway|miniature|tunnel;[railway=miniature][tunnel?];;name;int_name;637;
 deprecated|deprecated;638;x
 deprecated|deprecated;639;x
 deprecated|deprecated;640;x

data/sound-strings/ta.json/localize.json

@@ -0,0 +1,108 @@
+{
+"make_a_slight_right_turn":"லேசாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_slight_right_turn_street":"NULL",
+"make_a_slight_right_turn_street_verb":"NULL",
+"make_a_right_turn":"வலதுபுறமாக திரும்புங்கள்.",
+"make_a_right_turn_street":"NULL",
+"make_a_sharp_right_turn":"கூர்மையாக வலதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_right_turn_street":"NULL",
+"enter_the_roundabout":"ரவுண்டபௌட்டை நுழையுங்கள்.",
+"enter_the_roundabout_street":"NULL",
+"enter_the_roundabout_street_verb":"NULL",
+"leave_the_roundabout":"ரவுண்டபௌட்டை வெளியேறுங்கள்.",
+"leave_the_roundabout_street":"NULL",
+"leave_the_roundabout_street_verb":"NULL",
+"make_a_slight_left_turn":"லேசாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_slight_left_turn_street":"NULL",
+"make_a_slight_left_turn_street_verb":"NULL",
+"make_a_left_turn":"இடதுபுறமாக திரும்புங்கள்.",
+"make_a_left_turn_street":"NULL",
+"make_a_sharp_left_turn":"கூர்மையாக இடதுபுறம் திரும்புங்கள்.",
+"make_a_sharp_left_turn_street":"NULL",
+"make_a_u_turn":"U-வழியில் திரும்புங்கள்.",
+"make_a_u_turn_street":"NULL",
+"make_a_u_turn_street_verb":"NULL",
+"go_straight":"நேரா போங்க.",
+"exit":"வெளியேறுங்கள்.",
+"onto":"நோக்கி",
+"take_exit_number":"வெளியேறும் வழி எடுங்கள்",
+"take_exit_number_street_verb":"NULL",
+"route_recalculating":"வழி மறுபடி கணிக்கிறது",
+"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":"அடுத்தது",
+"dist_direction_onto_street":"%1$s %4$s %3$s %5$s %2$s",
+"take_the_1_exit":"ஒன்றாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_1_exit_street":"NULL",
+"take_the_1_exit_street_verb":"NULL",
+"take_the_2_exit":"இரண்டாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_2_exit_street":"NULL",
+"take_the_2_exit_street_verb":"NULL",
+"take_the_3_exit":"மூன்றாம் வெளியேறும் வழி எடுங்கள்.",
+"take_the_3_exit_street":"NULL",
+"take_the_3_exit_street_verb":"NULL",
+"take_the_4_exit":"நான்காவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_4_exit_street":"NULL",
+"take_the_4_exit_street_verb":"NULL",
+"take_the_5_exit":"ஐந்தாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_5_exit_street":"NULL",
+"take_the_5_exit_street_verb":"NULL",
+"take_the_6_exit":"ஆறாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_6_exit_street":"NULL",
+"take_the_6_exit_street_verb":"NULL",
+"take_the_7_exit":"ஏழாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_7_exit_street":"NULL",
+"take_the_7_exit_street_verb":"NULL",
+"take_the_8_exit":"எட்டாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_8_exit_street":"NULL",
+"take_the_8_exit_street_verb":"NULL",
+"take_the_9_exit":"ஒன்பதாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_9_exit_street":"NULL",
+"take_the_9_exit_street_verb":"NULL",
+"take_the_10_exit":"பத்தாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_10_exit_street":"NULL",
+"take_the_10_exit_street_verb":"NULL",
+"take_the_11_exit":"பதினொன்றாவது வெளியேறும் வழி எடுங்கள்.",
+"take_the_11_exit_street":"NULL",
+"take_the_11_exit_street_verb":"NULL",
+"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":"கேமரா முன்னால் இருக்கிறது"
+}

data/styles/default/include/Basemap.mapcss

@@ -449,6 +449,7 @@ area|z13-[landuse=quarry],
 area|z13-[power=plant],
 area|z13-[power=substation],
 area|z13-[power=generator],
+area|z13-[man_made=wastewater_plant]
 {fill-opacity: 1; fill-color: @industrial;}
 
 area|z13-[landuse=construction],

data/styles/default/include/Basemap_label.mapcss

@@ -592,6 +592,7 @@ area|z15-[landuse=industrial],
 area|z15-[landuse=construction],
 area|z15-[landuse=railway],
 area|z15-[landuse=quarry],
+area|z15-[man_made=wastewater_plant],
 node|z15-[landuse=industrial],
 node|z15-[landuse=construction],
 node|z15-[landuse=landfill],

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -70,8 +70,16 @@ node[amenity=arts_centre],
 node[amenity=community_centre],
 node[amenity=conference_centre],
 node[amenity=exhibition_centre],
-node[amenity=place_of_worship]
+node[amenity=place_of_worship],
 node[amenity=social_facility],
+node[historic=castle][castle_type=castrum],
+node[historic=castle][castle_type=defensive],
+node[historic=castle][castle_type=fortified_church],
+node[historic=castle][castle_type=fortress],
+node[historic=castle][castle_type=hillfort],
+node[historic=castle][castle_type=kremlin],
+node[historic=castle][castle_type=shiro],
+node[historic=fortress],
 node[historic=ship],
 node[leisure=hackerspace],
 node[social_facility],

data/styles/default/include/Roads.mapcss

@@ -1195,6 +1195,7 @@ line|z14-[railway=monorail],
 line|z15-[railway=narrow_gauge],
 line|z15-[railway=construction],
 line|z15-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=disused],
 line|z16-[railway=abandoned],
 {color: @railway; opacity: 0.7;}
@@ -1214,12 +1215,14 @@ line|z13-[railway=rail][bridge?]::bridgewhite,
 line|z13-[railway=subway][bridge?]::bridgewhite,
 line|z13-[railway=light_rail][bridge?]::bridgewhite,
 line|z15-[railway=preserved][bridge?]::bridgewhite,
+line|z16-[railway=miniature][bridge?]::bridgewhite,
 line|z16-[railway=abandoned][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z16-[railway=rail][bridge?]::bridgeblack,
 line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
+line|z16-[railway=miniature][bridge?]::bridgeblack,
 line|z16-[railway=abandoned][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 
@@ -1370,6 +1373,7 @@ line|z18-[railway=light_rail][!tunnel]::dash,
 
 
 line|z15-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned],
 {width: 1.6;dashes: 6.3,6.3;}
 
@@ -1419,23 +1423,27 @@ line|z13-15[railway=rail][bridge?]::bridgewhite,
 line|z13-15[railway=subway][bridge?]::bridgewhite,
 line|z13-15[railway=light_rail][bridge?]::bridgewhite,
 line|z15[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 {casing-width-add: 1.2;}
 line|z16[railway=rail][bridge?]::bridgewhite,
 line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
+line|z17[railway=miniature][bridge?]::bridgewhite,
 line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
+line|z18-[railway=miniature][bridge?]::bridgewhite,
 line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}
 
@@ -1443,18 +1451,21 @@ line|z16[railway=rail][bridge?]::bridgeblack,
 line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
+line|z16[railway=miniature][bridge?]::bridgeblack,
 line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
+line|z17[railway=miniature][bridge?]::bridgeblack,
 line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
+line|z18-[railway=miniature][bridge?]::bridgeblack,
 line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}
 

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -208,6 +208,7 @@ landuse-industrial                                  # area z13- (also has captio
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
 man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
 power-generator                                     # area z13- (also has icon z17-)
 power-generator-gas                                 # area z13- (also has icon z17-)

data/styles/default/include/priorities_3_FG.prio.txt

@@ -299,6 +299,9 @@ railway-abandoned-bridge                            # line z16- (also has line::
 railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z15-
 railway-disused                                     # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z16-
 railway-preserved                                   # line z15-
 railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z15-
@@ -352,6 +355,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@@ -388,6 +392,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -1374,6 +1374,7 @@ leisure-slipway                                     # icon z17- (also has captio
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
+man_made-wastewater_plant                           # caption z15- (also has area z13-)
 power-generator                                     # icon z17- (also has area z13-)
 power-generator-gas                                 # icon z17- (also has area z13-)
 power-generator-hydro                               # icon z17- (also has area z13-)

data/styles/outdoors/include/Roads.mapcss

@@ -552,14 +552,17 @@ line|z18-[railway=rail][service=service]::dash,
 
 line|z13-[railway=construction],
 line|z13-[railway=preserved],
+line|z13-[railway=miniature],
 line|z13-[railway=disused],
 line|z13-[railway=abandoned],
 {color: @railway; opacity:1;}
 
 line|z13-[railway=preserved],
+line|z13-[railway=miniature],
 line|z13-[railway=abandoned]
 {width: 1.6; dashes: 6.3,6.3;}
 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned]
 {width: 2.2; dashes: 8,8;}
 

data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt

@@ -208,6 +208,7 @@ landuse-industrial                                  # area z13- (also has captio
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
 man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
 power-generator                                     # area z13- (also has icon z17-)
 power-generator-gas                                 # area z13- (also has icon z17-)

data/styles/outdoors/include/priorities_3_FG.prio.txt

@@ -301,6 +301,9 @@ railway-abandoned-bridge                            # line z13- (also has line::
 railway-abandoned-tunnel                            # line z13-
 railway-construction                                # line z13-
 railway-disused                                     # line z13-
+railway-miniature                                   # line z13-
+railway-miniature-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z13-
 railway-preserved                                   # line z13-
 railway-preserved-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z13-
@@ -354,6 +357,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
@@ -390,6 +394,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -1377,6 +1377,7 @@ leisure-slipway                                     # icon z17- (also has captio
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
+man_made-wastewater_plant                           # caption z15- (also has area z13-)
 power-generator                                     # icon z17- (also has area z13-)
 power-generator-gas                                 # icon z17- (also has area z13-)
 power-generator-hydro                               # icon z17- (also has area z13-)

data/styles/vehicle/include/Basemap.mapcss

@@ -310,6 +310,7 @@ area|z15-[landuse=quarry],
 area|z15-[power=plant],
 area|z15-[power=substation],
 area|z15-[power=generator],
+area|z15-[man_made=wastewater_plant],
 {fill-opacity: 1; fill-color: @industrial;}
 
 area|z15-[landuse=construction],

data/styles/vehicle/include/Roads.mapcss

@@ -720,6 +720,7 @@ line|z15-[railway=narrow_gauge],
 line|z16-[railway=construction],
 line|z16-[railway=disused],
 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned],
 {color: @railway; opacity: 0.6;}
 
@@ -740,6 +741,7 @@ line|z14-[railway=rail][bridge?]::bridgewhite,
 line|z14-[railway=subway][bridge?]::bridgewhite,
 line|z14-[railway=light_rail][bridge?]::bridgewhite,
 line|z16-[railway=preserved][bridge?]::bridgewhite,
+line|z16-[railway=miniature][bridge?]::bridgewhite,
 line|z16-[railway=abandoned][bridge?]::bridgewhite,
 line|z16-[railway=tram][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;}
@@ -747,6 +749,7 @@ line|z16-[railway=rail][bridge?]::bridgeblack,
 line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
+line|z16-[railway=miniature][bridge?]::bridgeblack,
 line|z16-[railway=abandoned][bridge?]::bridgeblack,
 line|z16-[railway=tram][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;}
@@ -910,6 +913,7 @@ line|z19-[railway=light_rail][!tunnel]::dash,
 
 
 line|z16-[railway=preserved],
+line|z16-[railway=miniature],
 line|z16-[railway=abandoned]
 {width: 1.6;dashes: 6.3,6.3;}
 
@@ -945,18 +949,21 @@ line|z16[railway=rail][bridge?]::bridgewhite,
 line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
+line|z16[railway=miniature][bridge?]::bridgewhite,
 line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
+line|z17[railway=miniature][bridge?]::bridgewhite,
 line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
+line|z18-[railway=miniature][bridge?]::bridgewhite,
 line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}
 
@@ -964,18 +971,21 @@ line|z16[railway=rail][bridge?]::bridgeblack,
 line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
+line|z16[railway=miniature][bridge?]::bridgeblack,
 line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
+line|z17[railway=miniature][bridge?]::bridgeblack,
 line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
+line|z18-[railway=miniature][bridge?]::bridgeblack,
 line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}
 

data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt

@@ -110,6 +110,7 @@ landuse-industrial-mine                             # area z15-
 landuse-landfill                                    # area z15- (also has caption z15-)
 landuse-quarry                                      # area z15- (also has caption z15-)
 landuse-railway                                     # area z15- (also has caption z15-)
+man_made-wastewater_plant                           # area z15-
 man_made-works                                      # area z15-
 power-generator                                     # area z15-
 power-generator-gas                                 # area z15-

data/styles/vehicle/include/priorities_3_FG.prio.txt

@@ -276,6 +276,9 @@ railway-abandoned-bridge                            # line z16- (also has line::
 railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z16-
 railway-disused                                     # line z16-
+railway-miniature                                   # line z16-
+railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-miniature-tunnel                            # line z16-
 railway-preserved                                   # line z16-
 railway-preserved-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-preserved-tunnel                            # line z16-
@@ -295,6 +298,7 @@ highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (al
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
+railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
 railway-rail-bridge::bridgewhite                    # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@@ -321,6 +325,7 @@ highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (al
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-)
+railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)
 railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)

docs/INSTALL_DESKTOP.md

@@ -111,6 +111,21 @@ sudo apk add \
     sqlite-dev
 ```
 
+#### Void
+
+```bash
+xbps-install -S \
+    wget \
+    optipng \
+    cmake \
+    ninja \
+    qt6-base-devel \
+    qt6-svg-devel \
+    qt6-position-devel \
+    python3-pip
+pip3 install "protobuf<3.21" --break-system-packages
+```
+
 #### macOS
 
 ```bash

docs/TEAMS.md

@@ -18,7 +18,13 @@ Owners of the CoMaps team and repositories on Codeberg
 
 - [@comaps/admins](https://codeberg.org/org/comaps/teams/admins)
 
-- Administrators of different repositories on Codeberg
+Administrators of different repositories on Codeberg
+
+## Mergers
+
+- [compaps/mergers](https://codeberg.org/org/comaps/teams/mergers)
+
+Contributors who have merge permissions on CoMaps repositories, can do "official reviews" (those that count towards PR approvals), and can create branches/tags.
 
 ## Android
 

generator/maxspeeds_builder.cpp

@@ -151,7 +151,7 @@ public:
       // Set speed as-is from parent link.
       if (parentHwType == hwType)
         return {{s.GetForward(), s.GetUnits()}};
-
+      /* Commenting this part out as an attempt to solve displayed (and inexistent) max speed in highway links (https://codeberg.org/comaps/comaps/issues/1000)
       using routing::HighwayType;
       if ((*parentHwType == HighwayType::HighwayMotorway && hwType == HighwayType::HighwayMotorwayLink) ||
           (*parentHwType == HighwayType::HighwayTrunk && hwType == HighwayType::HighwayTrunkLink) ||
@@ -163,6 +163,7 @@ public:
         return converter.ClosestValidMacro(
             {base::asserted_cast<MaxspeedType>(std::lround(s.GetForward() * kLinkToMainSpeedFactor)), s.GetUnits()});
       }
+      */
 
       return {};
     };

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -1040,6 +1040,9 @@
 "type.railway.monorail" = "Monorail";
 "type.railway.monorail.bridge" = "Monorail Bridge";
 "type.railway.monorail.tunnel" = "Monorail Tunnel";
+"type.railway.miniature" = "Miniature Railway";
+"type.railway.miniature.bridge" = "Miniature Railway Bridge";
+"type.railway.miniature.tunnel" = "Miniature Railway Tunnel";
 "type.railway.narrow_gauge" = "Narrow Gauge Rail";
 "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail Bridge";
 "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel";

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -790,7 +790,7 @@
 		27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = "<group>"; };
 		27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = "<group>"; };
-		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
+		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "../../data/mapcss-mapping.csv"; sourceTree = SOURCE_ROOT; };
 		28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = "<group>"; tabWidth = 2; };
 		30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = "<group>"; };

libs/indexer/categories_holder.hpp

@@ -58,15 +58,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 = 44;
-  static int8_t constexpr kTraditionalChineseCode = 45;
+  static int8_t constexpr kSimplifiedChineseCode = 45;
+  static int8_t constexpr kTraditionalChineseCode = 46;
   // *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, 45> constexpr kLocaleMapping = {{
+  static std::array<CategoriesHolder::Mapping, 46> constexpr kLocaleMapping = {{
       {"en", kEnglishCode},
       {"en-AU", 2},
       {"en-GB", 3},
@@ -93,23 +93,24 @@ public:
       {"it", 24},
       {"ja", 25},
       {"ko", 26},
-      {"lv", 27},
-      {"mr", 28},
-      {"nb", 29},
-      {"nl", 30},
-      {"pl", 31},
-      {"pt", 32},
-      {"pt-BR", 33},
-      {"ro", 34},
-      {"ru", 35},
-      {"sk", 36},
-      {"sr", 37},
-      {"sv", 38},
-      {"sw", 39},
-      {"th", 40},
-      {"tr", 41},
-      {"uk", 42},
-      {"vi", 43},
+      {"lt", 27},
+      {"lv", 28},
+      {"mr", 29},
+      {"nb", 30},
+      {"nl", 31},
+      {"pl", 32},
+      {"pt", 33},
+      {"pt-BR", 34},
+      {"ro", 35},
+      {"ru", 36},
+      {"sk", 37},
+      {"sr", 38},
+      {"sv", 39},
+      {"sw", 40},
+      {"th", 41},
+      {"tr", 42},
+      {"uk", 43},
+      {"vi", 44},
       {"zh-Hans", kSimplifiedChineseCode},
       {"zh-Hant", kTraditionalChineseCode},
   }};

libs/platform/languages.hpp

@@ -27,7 +27,7 @@ namespace routing::turns::sound
  * - All other variants default to `zh-Hans` (Simplified Chinese).
  *
  */
-std::array<std::pair<std::string_view, std::string_view>, 42> constexpr kLanguageList = {{
+std::array<std::pair<std::string_view, std::string_view>, 43> constexpr kLanguageList = {{
     {"en", "English"},
     {"id", "Bahasa Indonesia"},
     {"ca", "Català"},
@@ -82,5 +82,6 @@ std::array<std::pair<std::string_view, std::string_view>, 42> constexpr kLanguag
 #endif
     {"ja", "日本語"},
     {"ko", "한국어"},
+    {"ta", "தமிழ்"},
 }};
 }  // namespace routing::turns::sound

tools/python/maps_generator/var/etc/map_generator.ini.prod

@@ -99,7 +99,7 @@ DIFF_VERSION_DEPTH: 2
 
 [Common]
 # Default parallelism level for the most of jobs. Set to 0 for auto detection.
-THREADS_COUNT: 0
+THREADS_COUNT: 56
 
 
 [Stats]