[search] Add German synonym

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>

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/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

@@ -94,7 +94,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"accs", {"access"}},
     {"aceq", {"acequia"}},
     {"ach", {"ancien chemin"}},
-    //{"a.d", {"auf der", "an der"}}, // unreachable
     {"adi", {"ambodi"}},
     {"adm", {"admirała", "admirał"}},
     {"afb", {"air force base"}},
@@ -103,7 +102,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"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 +130,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"}},
@@ -512,7 +509,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"ext", {"extension"}},
     {"extrm", {"extramuros"}},
     {"extrr", {"extrarradio"}},
-    {"ež", {"ežeras"}},
     {"fac", {"facultat"}},
     {"fawy", {"fairway"}},
     {"fb", {"fabrik"}},
@@ -687,7 +683,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"}},
@@ -768,7 +764,7 @@ 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"}},
@@ -780,8 +776,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"}},
@@ -1001,6 +995,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 +1006,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"}},
@@ -1062,7 +1057,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 +1099,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 +1122,6 @@ unordered_map<string, vector<string>> const kSynonyms = {
     {"sixteenth", {"16th"}},
     {"sixth", {"6th"}},
     {"sk", {"sokak", "sokağı"}},
-    {"skg", {"skersgatvis"}},
     {"skv", {"skveras"}},
     {"slj", {"sobre-loja"}},
     {"slov", {"slovenskih"}},
@@ -1311,7 +1305,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 +1315,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 +1336,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"}},