[search] Improve french synonyms

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

CMakeLists.txt

@@ -104,7 +104,8 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
   add_definitions(-DRELEASE)
   if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-O3)
+    set (CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
   endif()
 else()
   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})

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

@@ -41,5 +41,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|start"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>

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

@@ -40,5 +40,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|center"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>

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

@@ -151,7 +151,7 @@
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
 
-    <item name="appBackground">?android:attr/colorBackground</item>
+    <item name="appBackground">@color/bg_app</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

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

@@ -287,13 +287,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?colorSurfaceContainerLow</item>
+    <item name="backgroundTint">?appBackground</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?colorSurfaceContainerLow</item>
+    <item name="android:background">?appBackground</item>
     <item name="behavior_hideable">false</item>
   </style>
 

libs/search/query_params.cpp

@@ -89,7 +89,7 @@ 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"}},
@@ -97,13 +97,15 @@ unordered_map<string, vector<string>> const kSynonyms = {
     //{"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"}},
     {"ahi", {"ambohi"}},
     {"aire", {"aire", "aires"}},
     {"akh", {"allgemeines krankenhaus"}},
-    {"al", {"alejach", "aleją", "alley", "alei", "alue", "aleja", "alameda", "alle", "aleea", "aleje", "allee", "alėja"}},
+    {"al", {"alejach", "aleją", "alley", "alei", "alue", "aleja", "alameda", "alle", "aleea", "aleje", "allee"}},
     {"alam", {"alameda"}},
     {"alea", {"aleea"}},
     {"ale", {"aleea"}},
@@ -131,8 +133,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"apt", {"apartat", "apartment"}},
     {"apto", {"apartamento"}},
     {"aptos", {"apartamentos"}},
-    {"aps", {"apskritis"}},
-    {"apskr", {"apskritis"}}
     {"apts", {"apartments"}},
     {"arb", {"arboleda"}},
     {"arc", {"arcade", "arcades"}},
@@ -163,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"}},
@@ -219,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"}},
@@ -260,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"}},
@@ -284,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"}},
@@ -305,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"}},
@@ -348,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"}},
@@ -498,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,10 +522,10 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"ext", {"extension"}},
     {"extrm", {"extramuros"}},
     {"extrr", {"extrarradio"}},
-    {"ež", {"ežeras"}},
     {"fac", {"facultat"}},
     {"fawy", {"fairway"}},
     {"fb", {"fabrik"}},
+    {"fbg", {"faubourg"}},
     {"fbrca", {"fábrica"}},
     {"fca", {"fábrica", "finca"}},
     {"fc", {"futebol clube"}},
@@ -541,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"}},
@@ -555,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"}},
@@ -583,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"}},
@@ -687,7 +702,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"kgv", {"kleingartenverein"}},
     {"kh", {"krankenhaus"}},
     {"kj", {"kuja"}},
-    {"k", {"kalea", "katu", "koło", "kolo", "kort", "korte", "kaimas"}},
+    {"k", {"kalea", "katu", "koło", "kolo", "kort", "korte"}},
     {"kl", {"konzentrationslager", "klein", "kleines", "kleiner", "kleine", "kylä"}},
     {"knm", {"khu nghỉ mát"}},
     {"kol", {"kolonel", "kolonia"}},
@@ -743,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,11 +785,11 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"mł", {"mała", "mały", "małe"}},
     {"ml", {"mała", "mały", "mall", "małe"}},
     {"mln", {"moulin", "moulins"}},
-    {"m", {"municipal", "miasto", "miestas"}},
+    {"m", {"municipal", "miasto"}},
     {"mndr", {"meander"}},
     {"mn", {"mossèn"}},
     {"mnr", {"manor"}},
-    {"mnt", {"muntele", "maantee"}},
+    {"mnt", {"muntele", "maantee", "montée"}},
     {"mon", {"monument"}},
     {"mons", {"monsenhor"}},
     {"mpal", {"municipal"}},
@@ -780,8 +797,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"mrdor", {"mirador"}},
     {"mr", {"meester", "meander"}},
     {"ms", {"middle school"}},
-    {"mst", {"miestas"}},
-    {"mstl", {"miestelis"}},
     {"mte", {"montée", "montées"}},
     {"mtir", {"monestir"}},
     {"mt", {"mount", "mont", "muntele"}},
@@ -905,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"}},
@@ -967,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"}},
@@ -1001,6 +1018,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"q", {"quadra", "quận", "quelle"}},
     {"qta", {"quinta"}},
     {"qt", {"quảng trường"}},
+    {"quad", {"quad"}},
     {"qua", {"quartier"}},
     {"quarta", {"4", "4a"}},
     {"quarto", {"4", "4o"}},
@@ -1011,9 +1029,9 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"qys", {"quays"}},
     {"rac", {"raccourci"}},
     {"raid", {"raidillon"}},
+    {"rang", {"rang"}},
     {"ra", {"ramble"}},
     {"ra", {"ribeira"}},
-    {"raj", {"rajonas"}},
     {"ras", {"rautatieasema"}},
     {"rbla", {"rambla"}},
     {"rbra", {"ribera"}},
@@ -1025,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"}},
@@ -1052,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"}},
@@ -1062,7 +1080,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"rowy", {"right of way"}},
     {"rpe", {"rampe"}},
     {"rpt", {"rond point"}},
-    {"r", {"river", "ruine", "regional", "rio", "rue", "rua", "raitti", "rues", "rajonas"}},
+    {"r", {"river", "ruine", "regional", "rio", "rue", "rua", "raitti", "rues"}},
     {"rsbl", {"rosebowl"}},
     {"rs", {"rumah sakit"}},
     {"rst", {"rest"}},
@@ -1104,7 +1122,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"segunda", {"2", "2a"}},
     {"segundo", {"2", "2o"}},
     {"send", {"sendero"}},
-    {"sen", {"sente", "senator", "sentiers", "sentier", "sentes", "seniūnija"}},
+    {"sen", {"sente", "senator", "sentiers", "sentier", "sentes"}},
     {"sent", {"sentier"}},
     {"séptima", {"7", "7a"}},
     {"séptimo", {"7", "7o"}},
@@ -1127,7 +1145,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"sixteenth", {"16th"}},
     {"sixth", {"6th"}},
     {"sk", {"sokak", "sokağı"}},
-    {"skg", {"skersgatvis"}},
     {"skv", {"skveras"}},
     {"slj", {"sobre-loja"}},
     {"slov", {"slovenskih"}},
@@ -1204,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ở"}},
@@ -1275,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"}},
@@ -1311,7 +1329,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"vr", {"vrouwe"}},
     {"vsta", {"vista"}},
     {"vst", {"vista"}},
-    {"vs", {"volksschule", "viensėdis"}},
+    {"vs", {"volksschule"}},
     {"vte", {"vieille route"}},
     {"v",
      {"västra", "vei", "von", "velike", "veliko", "väg", "via", "quinta", "velikem", "veliki", "vegen", "veien", "veg",
@@ -1321,6 +1339,8 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"vw", {"view"}},
     {"vy", {"valley"}},
     {"wadm", {"wiceadmirała", "wiceadmirał"}},
+    {"walk", {"walk"}},
+    {"way", {"way"}},
     {"westl", {"westliche", "westliches", "westlicher"}},
     {"wg", {"weg"}},
     {"whrf", {"wharf"}},
@@ -1340,6 +1360,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"wu", {"wirtschaftsuniversität"}},
     {"w", {"wald", "west", "weg"}},
     {"wyb", {"wybrzeża", "wybrzeże", "wybrzeżem"}},
+    {"wynd", {"wynd"}},
     {"wyn", {"wynd"}},
     {"wy", {"way"}},
     {"wz", {"westzijde"}},