[android] Add setting to hide speed limit during navigation

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

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

@@ -1196,7 +1196,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (mOnmapDownloader != null)
       mOnmapDownloader.onResume();
 
-    mNavigationController.refresh();
+    mNavigationController.refresh(getApplicationContext(), Framework.nativeGetRouteFollowingInfo());
     refreshLightStatusBar();
 
     MwmApplication.from(this).getSensorHelper().addListener(this);

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

@@ -1,7 +1,10 @@
 package app.organicmaps.routing;
 
+import static androidx.core.content.ContextCompat.getString;
 import static app.organicmaps.sdk.util.Utils.dimen;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -13,6 +16,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
@@ -58,6 +62,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
   private final NavMenu mNavMenu;
   View.OnClickListener mOnSettingsClickListener;
+  private final SharedPreferences sharedPreferences;
+  private final boolean speedLimitEnabled;
 
   private void addWindowsInsets(@NonNull View topFrame)
   {
@@ -72,6 +78,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
   public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
                               NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
   {
+    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+    speedLimitEnabled = sharedPreferences.getBoolean(getString(activity, R.string.pref_speedlimit),true);
     mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);
 
     mFrame = activity.findViewById(R.id.navigation_frame);
@@ -97,6 +105,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
     mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
+    if (speedLimitEnabled)
+    {
+        UiUtils.show(mSpeedLimit);
+        UiUtils.show(mCurrentSpeed);
+    }
+    else
+    {
+        UiUtils.hide(mSpeedLimit);
+        UiUtils.hide(mCurrentSpeed);
+    }
 
     View mTopbar = topFrame.findViewById(R.id.statutbar);
     ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
@@ -136,7 +154,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -144,7 +163,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -205,9 +225,22 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNavMenu.collapseNavBottomSheet();
   }
 
-  public void refresh()
+  public void refresh(Context context, RoutingInfo info)
   {
-    mNavMenu.refreshTts();
+      mNavMenu.refreshTts();
+      if (speedLimitEnabled != sharedPreferences.getBoolean(getString(context, R.string.pref_speedlimit),true)) {
+          if (speedLimitEnabled)
+          {
+              UiUtils.show(mSpeedLimit);
+              UiUtils.show(mCurrentSpeed);
+              updateSpeedWidgets(info);
+          }
+          else
+          {
+              UiUtils.hide(mSpeedLimit);
+              UiUtils.hide(mCurrentSpeed);
+          }
+      }
   }
 
   @Override

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?iconTint">
+  <path
+      android:pathData="M418,620q24,24 62,23.5t56,-27.5l224,-336 -336,224q-27,18 -28.5,55t22.5,61ZM480,160q59,0 113.5,16.5T696,226l-76,48q-33,-17 -68.5,-25.5T480,240q-133,0 -226.5,93.5T160,560q0,42 11.5,83t32.5,77h552q23,-38 33.5,-79t10.5,-85q0,-36 -8.5,-70T766,420l48,-76q30,47 47.5,100T880,554q1,57 -13,109t-41,99q-11,18 -30,28t-40,10L204,800q-21,0 -40,-10t-30,-28q-26,-45 -40,-95.5T80,560q0,-83 31.5,-155.5t86,-127Q252,223 325,191.5T480,160ZM487,473Z"
+      android:fillColor="#FFFFFF"/>
+</vector>

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

@@ -8,7 +8,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp"
     tools:showIn="@layout/item_charging_sockets">

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

@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
+    android:background="@color/bg_editor"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
@@ -430,7 +431,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         android:text="@string/editor_business_vacant_button"/>
@@ -441,7 +441,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_base"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         tools:text="Reset my changes"/>

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

@@ -2,10 +2,9 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   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,13 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="@color/bg_editor"
+        android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?cardBackground"
             android:scrollbars="vertical" />
 
     </FrameLayout>

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

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?windowBackgroundForced"
+    android:background="@color/bg_editor"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,14 +19,13 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="?cardBackground"/>
+    android:background="@color/bg_editor"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="?clickableBackground"
     android:gravity="center_vertical"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_time_advanced"
@@ -35,7 +34,7 @@
     android:textColor="?colorSecondary" />
 
   <include
-    layout="@layout/shadow_bottom"
+    layout="@layout/item_divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_above="@id/tv__mode_switch"/>

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

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced">
+  android:background="@color/bg_editor">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -17,8 +17,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      style="@style/MwmWidget.M3.Editor.CardView">
 
       <LinearLayout
         android:id="@+id/examples"

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

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
+  android:background="@color/bg_editor"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

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

@@ -6,7 +6,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp">
 

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

@@ -21,5 +21,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/edit_socket_info_tooltip"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_marginBottom="@dimen/margin_quarter"/>
 </LinearLayout>

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

@@ -7,6 +7,7 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
+  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -20,7 +21,12 @@
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:drawableEnd="@drawable/ic_expand_more" />
 
-  <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="@color/fg_editor"
+    android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/more_names"

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

@@ -4,5 +4,5 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:scrollbars="vertical"/>

android/app/src/main/res/values-fr/strings.xml

@@ -927,4 +927,6 @@
     <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
     <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
     <string name="pref_maplanguage_local">Langue locale</string>
+    <string name="pref_speedlimit_title">Compteur de vitesse</string>
+    <string name="pref_speedlimit_summary">Affichage de la vitesse durant la navigation</string>
 </resources>

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

@@ -16,6 +16,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
+  <color name="bg_editor">#161b14</color>
+  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

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

@@ -65,6 +65,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
+  <color name="bg_editor">#ebefe4</color>
+  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

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

@@ -45,6 +45,7 @@
   <string name="pref_power" translatable="false">pref_power</string>
   <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
   <string name="pref_advanced" translatable="false">pref_advanced</string>
+  <string name="pref_speedlimit" translatable="false">pref_speedlimit</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

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

@@ -975,4 +975,6 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <string name="pref_speedlimit_title">Speed limit</string>
+    <string name="pref_speedlimit_summary">Show speed limit during navigation</string>
 </resources>

android/app/src/main/res/values/styles-editor.xml

@@ -89,8 +89,16 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="cardBackgroundColor">@color/fg_editor</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>
+    <style name="MwmWidget.M3.CardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/margin_half</item>
+        <item name="cardBackgroundColor">?appBackground</item>
+        <item name="android:padding">@dimen/margin_base</item>
+        <item name="cardPreventCornerOverlap">false</item>
+    </style>
 </resources>

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

@@ -239,10 +239,6 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
-  <style name="MwmWidget.FrameLayout.BookmarkCategories">
-    <item name="android:background">?windowBackgroundForced</item>
-  </style>
-
   <style name="MwmWidget.Counter">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>

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

@@ -278,10 +278,6 @@
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
-
-  <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>

android/app/src/main/res/xml/prefs_main.xml

@@ -143,6 +143,14 @@
         <extra android:name="from" android:value="settings" />
       </intent>
     </PreferenceScreen>
+    <SwitchPreferenceCompat
+        android:key="@string/pref_speedlimit"
+        android:title="@string/pref_speedlimit_title"
+        android:summary="@string/pref_speedlimit_summary"
+        android:defaultValue="true"
+        android:widgetLayout="@layout/preference_switch"
+        app:singleLineTitle="true"
+        app:icon="@drawable/ic_speed"/>
   </androidx.preference.PreferenceCategory>
 
   <PreferenceCategory

defines.hpp

@@ -113,6 +113,7 @@ auto constexpr TMP_OFFSETS_EXT = OFFSET_EXT EXTENSION_TMP;
 #define SKIPPED_ELEMENTS_FILE "skipped_elements.json"
 
 #define MAPCSS_MAPPING_FILE "mapcss-mapping.csv"
+#define SUBTYPES_FILE "subtypes.csv"
 #define REPLACED_TAGS_FILE "replaced_tags.txt"
 #define MIXED_TAGS_FILE "mixed_tags.txt"
 #define MIXED_NODES_FILE "mixed_nodes.txt"

libs/indexer/ftypes_subtypes.cpp

@@ -2,8 +2,10 @@
 
 #include "base/assert.hpp"
 #include "coding/csv_reader.hpp"
+#include "coding/reader_streambuf.hpp"
 #include "indexer/classificator.hpp"
 #include "platform/platform.hpp"
+#include "defines.hpp"
 
 namespace ftypes
 {
@@ -12,12 +14,14 @@ namespace ftypes
   {
     auto const & classificator = classif();
 
-    // Get the actual path to the CSV file.
+    // Get the stream to the CSV file.
     Platform & platform = GetPlatform();
-    string const filePath = platform.ReadPathForFile("subtypes.csv");
+    unique_ptr<ModelReader> reader = platform.GetReader(SUBTYPES_FILE);
+    ReaderStreamBuf buffer(std::move(reader));
+    istream stream(&buffer);
 
     // Load the CSV file and go through the lines of it one by one.
-    for (auto const & columns : coding::CSVRunner(coding::CSVReader(filePath, true, ';')))
+    for (auto const & columns : coding::CSVRunner(coding::CSVReader(stream, true, ';')))
     {
       // Skip empty lines.
       if (columns.empty())

libs/indexer/search_string_utils.cpp

@@ -33,7 +33,8 @@ std::array<UniString, 11> const kAllowedMisprints = {
 };
 
 static std::pair<UniString, UniString> const kPreprocessReplacements[] = {
-    {MakeUniString("a. d."), MakeUniString("an den")},
+    {MakeUniString("a. d."), MakeUniString("auf an den der")},
+    {MakeUniString("a.d."), MakeUniString("auf an den der")}, // hacks to handle "(auf/an) (den/der)" in German
     {MakeUniString("arm. gen"), MakeUniString("armádneho generála")},
     {MakeUniString("atr'"), MakeUniString("ambohitr'")},
     {MakeUniString("a. v."), MakeUniString("asociación vecinal")},

libs/search/query_params.cpp

@@ -89,16 +89,13 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"9", {"nove", "nueve", "تسع", "nueve", "novena", "noveno", "nona", "nono"}},
     {"9o", {"noveno", "nono"}},
     {"9th", {"ninth"}},
-    {"a", {"am", "auto-estrada", "aikštė", "autoroute"}},
+    {"a", {"am", "auto-estrada", "aikštė"}},
     {"abe", {"abbaye"}},
     {"accs", {"access"}},
     {"aceq", {"acequia"}},
     {"ach", {"ancien chemin"}},
-    //{"a.d", {"auf der", "an der"}}, // unreachable
     {"adi", {"ambodi"}},
     {"adm", {"admirała", "admirał"}},
-    {"aerd", {"aérodrome"}},
-    {"aerg", {"aérogare"}},
     {"afb", {"air force base"}},
     {"agl", {"agglomération"}},
     {"aha", {"andoha"}},
@@ -163,12 +160,9 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"awg", {"awang"}},
     {"az", {"azinhaga"}},
     {"ba", {"banan"}},
-    {"balc", {"balcon"}},
     {"balnr", {"balneario"}},
     {"barda", {"barriada"}},
-    {"barr", {"barrière"}},
     {"basn", {"basin"}},
-    {"bass", {"bassin"}},
     {"bast", {"baston"}},
     {"bat", {"batalionu", "batalion", "batalionów", "bataliony"}},
     {"bayer", {"bayerische", "bayerisch", "bayerischer", "bayerisches"}},
@@ -222,7 +216,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"brg", {"brigadeiro", "bourg", "bundesrealgymnasium"}},
     {"brgy", {"barangay"}},
     {"bri", {"bridge"}},
-    {"brg", {"barrage"}},
     {"brk", {"break", "brook"}},
     {"bro", {"brother"}},
     {"brw", {"brow"}},
@@ -264,19 +257,17 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"care", {"carrières", "carrière"}},
     {"carr", {"carré"}},
     {"carref", {"carrefour"}},
-    {"cas", {"caserne"}},
     {"cau", {"carreau"}},
     {"caus", {"causeway"}},
     {"cav", {"cavée"}},
     {"cbtiz", {"cobertizo"}},
     {"cc", {"calçada", "centro comercial"}},
-    {"ccal", {"centre commercial"}},
     {"c", {"cesta", "carrer", "calle", "centre"}},
     {"cckq", {"căn cứ không quân"}},
     {"ccnh", {"calçadinha"}},
     {"cct", {"circuit"}},
     {"ccvcn", {"circunvalación"}},
-    {"cd", {"cadde", "caddesi", "chemin départemental"}},
+    {"cd", {"cadde", "caddesi"}},
     {"cđ", {"cao đẳng"}},
     {"cds", {"cul-de-sac"}},
     {"ceb", {"ciclo do ensino básico"}},
@@ -290,13 +281,12 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"cft", {"croft"}},
     {"cgne", {"campagne"}},
     {"ch", {"church", "chaussee", "chemin", "chairman", "chase"}},
-    {"chau", {"chaussée"}},
     {"che", {"chemins", "chemin"}},
     {"chem", {"cheminements", "cheminement"}},
     {"chi", {"charmille"}},
-    {"chal", {"chalet"}},
+    {"chl", {"chalet"}},
     {"chor", {"chorążego", "chorąży"}},
-    {"chp", {"chapelle", "champ"}},
+    {"chp", {"chapelle"}},
     {"chs", {"chaussée", "chaussées"}},
     {"cht", {"château"}},
     {"chv", {"chemins vicinaux", "chemin vicinal"}},
@@ -312,7 +302,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"ck", {"creek"}},
     {"clb", {"câu lạc bộ"}},
     {"cl", {"close", "calle"}},
-    {"clr", {"clairiere"}},
     {"cllja", {"calleja"}},
     {"cllón", {"callejón"}},
     {"cllzo", {"callizo"}},
@@ -356,11 +345,9 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"cpl", {"corporal"}},
     {"cps", {"copse"}},
     {"cpt", {"captain"}},
-    {"cr", {"cour"}},
     {"cra", {"colexio rural agrupado", "carrera", "colegio rural agrupado"}},
     {"crc", {"circus"}},
     {"cr", {"creek", "crescent", "county route", "county road"}},
-    {"crs", {"cours"}},
     {"crcs", {"circus"}},
     {"crd", {"crossroad"}},
     {"cres", {"crescent"}},
@@ -508,8 +495,8 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"estda", {"estrada"}},
     {"est", {"estate", "estació"}},
     {"estr", {"estrada"}},
-    {"etg", {"étang"}},
     {"etang", {"étang"}},
+    {"étang", {"étang"}},
     {"etar", {"estação de tratamento de águas residuais"}},
     {"etorb", {"etorbidea"}},
     {"eu", {"escola universitària"}},
@@ -525,7 +512,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"fac", {"facultat"}},
     {"fawy", {"fairway"}},
     {"fb", {"fabrik"}},
-    {"fbg", {"faubourg"}},
     {"fbrca", {"fábrica"}},
     {"fca", {"fábrica", "finca"}},
     {"fc", {"futebol clube"}},
@@ -551,7 +537,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"fr", {"father", "frontage", "frei"}},
     {"frm", {"ferme", "fermes"}},
     {"frnt", {"front"}},
-    {"frt", {"forêt"}},
     {"frtg", {"frontage"}},
     {"frwy", {"freeway"}},
     {"fshr", {"foreshore"}},
@@ -566,14 +551,11 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"gal", {"galerie", "general", "galeries"}},
     {"garn", {"garenne"}},
     {"gbd", {"grand boulevard"}},
-    {"gdav", {"grande avenue"}},
     {"gde", {"gemeinde"}},
     {"gden", {"grands ensembles", "grand ensemble"}},
     {"gd", {"gasilski dom"}},
-    {"gdpl", {"grande place"}},
     {"gdn", {"gardens", "garden"}},
     {"gdns", {"gardens"}},
-    {"gdr", {"grande rue"}},
     {"gebr", {"gebroeders"}},
     {"gen", {"generaal", "generała", "generála", "general"}},
     {"geo", {"george"}},
@@ -597,9 +579,8 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"gra", {"grange"}},
     {"grg", {"gymnasium und realgymnasium"}},
     {"gr",
-    {"grande rue", "grandes rues", "gracht", "grand’rue", "gränd", "graben", "grovet", "gränden", "grove", "großes",
+     {"grande rue", "grandes rues", "gracht", "grand’rue", "gränd", "graben", "grovet", "gränden", "grove", "großes",
       "große", "großer"}},
-    {"grge", {"grange"}},
     {"gri", {"grille"}},
     {"grim", {"grimpette"}},
     {"grnd", {"ground"}},
@@ -758,9 +739,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"mans", {"mansions"}},
     {"mar", {"marche", "marches"}},
     {"marsz", {"marszałka (marszałek)"}},
-    {"mais", {"maison"}},
     {"maz", {"mazowiecka", "mazowiecki", "mazowieckie"}},
-    {"mch", {"marché"}},
     {"md", {"mead"}},
     {"mdr", {"meander"}},
     {"mdw", {"meadow", "meadows"}},
@@ -789,7 +768,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"mndr", {"meander"}},
     {"mn", {"mossèn"}},
     {"mnr", {"manor"}},
-    {"mnt", {"muntele", "maantee", "montée"}},
+    {"mnt", {"muntele", "maantee"}},
     {"mon", {"monument"}},
     {"mons", {"monsenhor"}},
     {"mpal", {"municipal"}},
@@ -920,7 +899,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"pi", {"polígon industrial"}},
     {"pje", {"pasaje"}},
     {"pj", {"polícia judiciária"}},
-    {"pk", {"point kilométrique"}},
     {"pkg", {"parking"}},
     {"pkld", {"parklands"}},
     {"pko", {"puistikko"}},
@@ -983,7 +961,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"prq", {"presqu’île"}},
     {"prtco", {"pórtico"}},
     {"prt", {"petite route"}},
-    {"prte", {"porte"}},
     {"prv", {"parvis"}},
     {"przla", {"prazuela"}},
     {"psge", {"passage"}},
@@ -1043,7 +1020,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"rdge", {"ridge"}},
     {"rdg", {"ridge"}},
     {"rdpt", {"rond-point"}},
-    {"rd", {"road", "route départementale"}},
+    {"rd", {"road"}},
     {"rdsd", {"roadside"}},
     {"rds", {"roads"}},
     {"rdtj", {"raudteejaam"}},
@@ -1070,7 +1047,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"rnde", {"ronde"}},
     {"rnd", {"round"}},
     {"rnge", {"range"}},
-    {"rn", {"rinne", "route nationale"}},
+    {"rn", {"rinne"}},
     {"robt", {"robert"}},
     {"roc", {"roc", "rocade"}},
     {"roqt", {"roquet"}},
@@ -1221,7 +1198,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"tercera", {"3", "3a"}},
     {"tercero", {"3", "3o"}},
     {"term", {"terminal"}},
-    {"terr", {"terrace", "terrasse"}},
+    {"terr", {"terrace"}},
     {"ter", {"terrace"}},
     {"tg", {"tanjong"}},
     {"thcs", {"trung học cơ sở"}},
@@ -1292,7 +1269,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"va", {"vale"}},
     {"v:a", {"västra"}},
     {"vbt", {"viện bảo tàng"}},
-    {"vc", {"voie communale"}},
     {"vche", {"vieux chemin"}},
     {"vcto", {"viaducto"}},
     {"vda", {"viuda"}},

qt/CMakeLists.txt

@@ -124,6 +124,7 @@ copy_resources(
   editor.config
   packed_polygons.bin
   patterns.txt
+  subtypes.csv
   transit_colors.txt
   types.txt
   mapcss-mapping.csv