[search] Improve french synonyms

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

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

@@ -197,8 +197,10 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
       items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
-      items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
-                                        () -> onDeleteActionSelected(mSelectedCategory)));
+      // Disallow deleting the last category
+      if (getAdapter().getBookmarkCategories().size() > 1)
+        items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
+                                          () -> onDeleteActionSelected(mSelectedCategory)));
     }
     return items;
   }
@@ -295,24 +297,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
   private void onDeleteActionSelected(@NonNull BookmarkCategory category)
   {
-    // Disallow deleting the last category
-    if ((getAdapter().getBookmarkCategories().size() > 1))
-    {
-        BookmarkManager.INSTANCE.deleteCategory(category.getId());
-        getAdapter().notifyDataSetChanged();
-    }
-    else
-    {
-        new MaterialAlertDialogBuilder(requireActivity())
-                .setMessage(R.string.unable_to_delete_list)
-                .setPositiveButton(android.R.string.yes, ((dialog, which) -> {
-                    onAddButtonClick();
-                    BookmarkManager.INSTANCE.deleteCategory(category.getId());
-                    getAdapter().notifyDataSetChanged();
-                }))
-                .setNegativeButton(android.R.string.no,(dialog, which) -> dialog.dismiss())
-                .show();
-    }
+    BookmarkManager.INSTANCE.deleteCategory(category.getId());
+    getAdapter().notifyDataSetChanged();
   }
 
   private void onSettingsActionSelected(@NonNull BookmarkCategory category)

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="?appBackground"
+    app:cardBackgroundColor="?cardBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp"
     tools:showIn="@layout/item_charging_sockets">

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

@@ -6,7 +6,6 @@
     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"
@@ -431,6 +430,7 @@
         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,6 +441,7 @@
         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,9 +2,10 @@
 <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="@color/bg_editor"
-        android:layout_marginBottom="@dimen/margin_quarter">
+        android:background="?windowBackgroundForced">
 
         <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="@color/bg_editor"
+    android:background="?windowBackgroundForced"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,13 +19,14 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?cardBackground"/>
 
   <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"
@@ -34,7 +35,7 @@
     android:textColor="?colorSecondary" />
 
   <include
-    layout="@layout/item_divider"
+    layout="@layout/shadow_bottom"
     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="@color/bg_editor">
+  android:background="?windowBackgroundForced">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -17,7 +17,8 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">
 
       <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="@color/bg_editor"
+  android:background="?windowBackgroundForced"
   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="?appBackground"
+    app:cardBackgroundColor="?cardBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp">
 

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

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

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

@@ -7,7 +7,6 @@
   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
@@ -21,12 +20,7 @@
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:drawableEnd="@drawable/ic_expand_more" />
 
-  <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"/>
+  <include layout="@layout/recycler_default" />
 
   <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="?appBackground"
+  android:background="?cardBackground"
   android:scrollbars="vertical"/>

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

@@ -16,8 +16,6 @@
   <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,8 +65,6 @@
   <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/strings.xml

@@ -975,5 +975,4 @@
     <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="unable_to_delete_list">The app cannot work without at least one list. Do you want to remove it and create a new one?</string>
 </resources>

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

@@ -89,16 +89,8 @@
     <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">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?cardBackground</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,6 +239,10 @@
     <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,6 +278,10 @@
   <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>

defines.hpp

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

libs/indexer/search_string_utils.cpp

@@ -33,8 +33,7 @@ std::array<UniString, 11> const kAllowedMisprints = {
 };
 
 static std::pair<UniString, UniString> const kPreprocessReplacements[] = {
-    {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("a. d."), MakeUniString("an den")},
     {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,13 +89,16 @@ 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ė"}},
+    {"a", {"am", "auto-estrada", "aikštė", "autoroute"}},
     {"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"}},
@@ -160,9 +163,12 @@ 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"}},
@@ -216,6 +222,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"brg", {"brigadeiro", "bourg", "bundesrealgymnasium"}},
     {"brgy", {"barangay"}},
     {"bri", {"bridge"}},
+    {"brg", {"barrage"}},
     {"brk", {"break", "brook"}},
     {"bro", {"brother"}},
     {"brw", {"brow"}},
@@ -257,17 +264,19 @@ 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"}},
+    {"cd", {"cadde", "caddesi", "chemin départemental"}},
     {"cđ", {"cao đẳng"}},
     {"cds", {"cul-de-sac"}},
     {"ceb", {"ciclo do ensino básico"}},
@@ -281,12 +290,13 @@ 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"}},
-    {"chl", {"chalet"}},
+    {"chal", {"chalet"}},
     {"chor", {"chorążego", "chorąży"}},
-    {"chp", {"chapelle"}},
+    {"chp", {"chapelle", "champ"}},
     {"chs", {"chaussée", "chaussées"}},
     {"cht", {"château"}},
     {"chv", {"chemins vicinaux", "chemin vicinal"}},
@@ -302,6 +312,7 @@ 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"}},
@@ -345,9 +356,11 @@ 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"}},
@@ -495,8 +508,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"}},
@@ -512,6 +525,7 @@ 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"}},
@@ -537,6 +551,7 @@ 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"}},
@@ -551,11 +566,14 @@ 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"}},
@@ -579,8 +597,9 @@ 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"}},
@@ -739,7 +758,9 @@ 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"}},
@@ -768,7 +789,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"mndr", {"meander"}},
     {"mn", {"mossèn"}},
     {"mnr", {"manor"}},
-    {"mnt", {"muntele", "maantee"}},
+    {"mnt", {"muntele", "maantee", "montée"}},
     {"mon", {"monument"}},
     {"mons", {"monsenhor"}},
     {"mpal", {"municipal"}},
@@ -899,6 +920,7 @@ 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"}},
@@ -961,6 +983,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"prq", {"presqu’île"}},
     {"prtco", {"pórtico"}},
     {"prt", {"petite route"}},
+    {"prte", {"porte"}},
     {"prv", {"parvis"}},
     {"przla", {"prazuela"}},
     {"psge", {"passage"}},
@@ -1020,7 +1043,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"rdge", {"ridge"}},
     {"rdg", {"ridge"}},
     {"rdpt", {"rond-point"}},
-    {"rd", {"road"}},
+    {"rd", {"road", "route départementale"}},
     {"rdsd", {"roadside"}},
     {"rds", {"roads"}},
     {"rdtj", {"raudteejaam"}},
@@ -1047,7 +1070,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"rnde", {"ronde"}},
     {"rnd", {"round"}},
     {"rnge", {"range"}},
-    {"rn", {"rinne"}},
+    {"rn", {"rinne", "route nationale"}},
     {"robt", {"robert"}},
     {"roc", {"roc", "rocade"}},
     {"roqt", {"roquet"}},
@@ -1198,7 +1221,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"tercera", {"3", "3a"}},
     {"tercero", {"3", "3o"}},
     {"term", {"terminal"}},
-    {"terr", {"terrace"}},
+    {"terr", {"terrace", "terrasse"}},
     {"ter", {"terrace"}},
     {"tg", {"tanjong"}},
     {"thcs", {"trung học cơ sở"}},
@@ -1269,6 +1292,7 @@ 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,7 +124,6 @@ copy_resources(
   editor.config
   packed_polygons.bin
   patterns.txt
-  subtypes.csv
   transit_colors.txt
   types.txt
   mapcss-mapping.csv