[android] Add switch to enable 3D mode from layers bottomsheet

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-16 00:54:22 +00:00 · 2026-01-15 18:05:10 +01:00
36 changed files with 93 additions and 305 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,8 +104,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
  add_definitions(-DRELEASE)
  if (NOT MSVC)
-    add_compile_options(-O3)
-    set (CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
+    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
  endif()
 else()
  message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
--- a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java
@@ -1,24 +1,31 @@
 package app.organicmaps.maplayer;

 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CompoundButton;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.maplayer.Mode;
+import app.organicmaps.sdk.util.PowerManagment;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.widget.recycler.SpanningLinearLayoutManager;
 import com.google.android.material.button.MaterialButton;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import java.util.ArrayList;
 import java.util.List;

@@ -36,6 +43,20 @@ public class ToggleMapLayerFragment extends Fragment
  {
    View mRoot = inflater.inflate(R.layout.fragment_toggle_map_layer, container, false);

+    SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext());
+    final int powerManagementValue = sharedPreferences.getInt(ContextCompat.getString(requireContext(), R.string.power_management), PowerManagment.HIGH);
+    final boolean _3DEnabled = sharedPreferences.getBoolean(ContextCompat.getString(requireContext(), R.string.pref_3d_buildings),true);
+    MaterialSwitch m3DSwitch = mRoot.findViewById(R.id._3d_button);
+    m3DSwitch.setChecked(_3DEnabled);
+    if (powerManagementValue != PowerManagment.HIGH)
+    {
+        m3DSwitch.setEnabled(true);
+        m3DSwitch.setOnCheckedChangeListener((CompoundButton buttonView, boolean isChecked) -> Framework.nativeSet3dMode(true, isChecked));
+    }
+    else
+    {
+        m3DSwitch.setEnabled(false);
+    }
    mMapButtonsController =
        (MapButtonsController) requireActivity().getSupportFragmentManager().findFragmentById(R.id.map_buttons);
    MaterialButton mCloseButton = mRoot.findViewById(R.id.close_button);
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/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="?appBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
@@ -42,8 +42,20 @@
    android:id="@+id/recycler"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_base"
    android:minHeight="@dimen/toggle_map_layer_frame_height"
    android:paddingStart="@dimen/margin_base"
    android:paddingEnd="@dimen/margin_base" />
+    <com.google.android.material.divider.MaterialDivider
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content" />
+
+    <com.google.android.material.materialswitch.MaterialSwitch
+      android:id="@+id/_3d_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center|end"
+      android:text="@string/pref_map_3d_buildings_title"
+      android:layout_marginStart="@dimen/margin_half"
+      android:layout_marginEnd="@dimen/margin_base"
+      android:layout_marginBottom="@dimen/margin_base"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/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="?appBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/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">@color/bg_app</item>
+    <item name="appBackground">?android:attr/colorBackground</item>
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>
--- a/android/app/src/main/res/values/styles.xml
+++ b/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">?appBackground</item>
+    <item name="backgroundTint">?colorSurfaceContainerLow</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">?appBackground</item>
+    <item name="android:background">?colorSurfaceContainerLow</item>
    <item name="behavior_hideable">false</item>
  </style>

--- a/android/sdk/src/main/assets/subtypes.csv
+++ b/android/sdk/src/main/assets/subtypes.csv
@@ -1 +0,0 @@
-../../../../../data/subtypes.csv
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -339,7 +339,6 @@
    <string name="type.cuisine.vietnamese">Vietnamesisch</string>
    <string name="type.emergency">Notfall</string>
    <string name="type.emergency.access_point">Rettungspunkt</string>
-    <string name="type.emergency.access_point.address">Rettungsadresse</string>
    <string name="type.emergency.assembly_point">Notfall-Sammelpunkt</string>
    <string name="type.emergency.disaster_help_point">Notfall-Treffpunkt</string>
    <string name="type.emergency.life_ring">Rettungsring</string>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -376,7 +376,6 @@
    <string name="type.cuisine.vietnamese">Vietnamese</string>
    <string name="type.emergency">Emergency</string>
    <string name="type.emergency.access_point">Emergency Rescue Point</string>
-    <string name="type.emergency.access_point.address">Emergency Rescue Address</string>
    <string name="type.emergency.assembly_point">Emergency Assembly Point</string>
    <string name="type.emergency.disaster_help_point">Emergency Disaster Help Point</string>
    <string name="type.emergency.life_ring">Lifebuoy</string>
--- a/data/categories-strings/bg.json/localize.json
+++ b/data/categories-strings/bg.json/localize.json
@@ -186,7 +186,7 @@
 "place-state": "Щат|провинция",
 "place-region": "Район|Регион",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие|Жилищен комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие|Жилищен комплекс|ж.к.|ЖК",
 "place-hamlet": "Село",
 "place-village": "Село",
 "place-locality": "местност|регион|Място",
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -199,7 +199,7 @@
 "place-state": "Штат|провинция",
 "place-region": "Район",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ж.к.|ЖК",
 "place-hamlet": "Посёлок|деревня",
 "place-village": "Деревня|поселок",
 "place-locality": "Местность|регион",
--- a/data/categories-strings/uk.json/localize.json
+++ b/data/categories-strings/uk.json/localize.json
@@ -196,7 +196,7 @@
 "place-state": "Штат|провінція|регіон",
 "place-region": "Район|область",
 "place-island|place-islet": "Острів",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ж.к.|ЖК",
 "place-hamlet": "Поселення|селище|село",
 "place-village": "Село|хутір|поселення",
 "place-locality": "Місцевість|регіон|Місце",
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -472,7 +472,7 @@ amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_n
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
 deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
-emergency|access_point|address;[emergency=access_point][operator=helpbidea];;name;;362;
+deprecated:highway|service|driveway|bridge:01.2020;[highway=service][service=driveway][bridge?];x;name;int_name;362;highway|service|driveway
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;
 sport|10pin;365;
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1710,10 +1710,6 @@ node|z18-[emergency=defibrillator],

 node|z18-[emergency=access_point],
 {icon-image: access_point-m.svg;font-size: 11;}
-node|z18-20[emergency=access_point][operator=helpbidea],
-{icon-image: none;}
-node|z18-19[emergency=access_point][operator=helpbidea],
-{text: none;}

 node|z19-[emergency=assembly_point],
 {icon-image: assembly_point-m.svg;font-size: 11;}
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -2450,9 +2450,6 @@ emergency-phone                                     # icon z17- (also has captio
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

-emergency-access_point-address                      # caption z20-
-=== -9981
-
 amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -2456,9 +2456,6 @@ emergency-phone                                     # icon z17- (also has captio
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

-emergency-access_point-address                      # caption z20-
-=== -9981
-
 amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
--- a/data/subtypes.csv
+++ b/data/subtypes.csv
@@ -1,2 +0,0 @@
-Types;Related Subtypes
-amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -11,7 +11,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/ftypes_subtypes.hpp"

 #include "platform/platform.hpp"

@@ -352,11 +351,9 @@ private:
 // - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
 void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
 {
-  // Prevents types, that either have subtypes or are subtypes, from being removed
-  auto subtypes = ftypes::Subtypes::Instance();
-  auto const hasSubtypeRelatedTypes = [subtypes](auto const & lhs, auto const & rhs)
+  auto const isChargingStation = [](auto const & lhs, auto const & rhs)
  {
-    return subtypes.IsPathOfTypeWithSubtypesOrSubtype(lhs) || subtypes.IsPathOfTypeWithSubtypesOrSubtype(rhs);
+    return lhs.size() > 1 && rhs.size() > 1 && lhs.at(1) == "charging_station" && rhs.at(1) == "charging_station" && lhs.at(0) == "amenity" && rhs.at(0) == "amenity";
  };

  auto const equalPrefix = [](auto const & lhs, auto const & rhs)
@@ -377,10 +374,9 @@ void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
    return lhs < rhs;
  };

-  // `true` means it will be deleted, because being equal means it isn't unique
-  auto const isEqual = [&equalPrefix, &hasSubtypeRelatedTypes](auto const & lhs, auto const & rhs)
+  auto const isEqual = [&equalPrefix, &isChargingStation](auto const & lhs, auto const & rhs)
  {
-    if (hasSubtypeRelatedTypes(lhs, rhs))
+    if (isChargingStation(lhs, rhs))
      return false;
    
    if (equalPrefix(lhs, rhs))
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -361,7 +361,6 @@
 "type.cuisine.vietnamese" = "Vietnamesisch";
 "type.emergency" = "Notfall";
 "type.emergency.access_point" = "Rettungspunkt";
-"type.emergency.access_point.address" = "Rettungsadresse";
 "type.emergency.assembly_point" = "Notfall-Sammelpunkt";
 "type.emergency.disaster_help_point" = "Notfall-Treffpunkt";
 "type.emergency.life_ring" = "Rettungsring";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -372,7 +372,6 @@
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
-"type.emergency.access_point.address" = "Emergency Rescue Address";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
 "type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -391,7 +391,6 @@
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
-"type.emergency.access_point.address" = "Emergency Rescue Address";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
 "type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; };
 		27176A862E65B0150015F25F /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A852E65B0150015F25F /* Icon.icon */; };
 		27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A892E65B01B0015F25F /* Debug Icon.icon */; };
-		272CA4492F127221005A3F5B /* subtypes.csv in Resources */ = {isa = PBXBuildFile; fileRef = 272CA4482F127221005A3F5B /* subtypes.csv */; };
 		272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */; };
 		272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */; };
 		272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */; };
@@ -765,7 +764,6 @@
 		270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = "<group>"; };
 		27176A852E65B0150015F25F /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = "<group>"; };
 		27176A892E65B01B0015F25F /* Debug Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "Debug Icon.icon"; sourceTree = "<group>"; };
-		272CA4482F127221005A3F5B /* subtypes.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = subtypes.csv; path = ../../data/subtypes.csv; sourceTree = SOURCE_ROOT; };
 		272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExistingProfileView.swift; sourceTree = "<group>"; };
 		272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoExistingProfileView.swift; sourceTree = "<group>"; };
 		272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
@@ -3956,7 +3954,6 @@
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
-				272CA4482F127221005A3F5B /* subtypes.csv */,
 				FAAEA7D0161BD26600CCD661 /* synonyms.txt */,
 				BB25B1A51FB32767007276FA /* transit_colors.txt */,
 				FA64D9A813F975AD00350ECF /* types.txt */,
@@ -4284,7 +4281,6 @@
 				34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
-				272CA4492F127221005A3F5B /* subtypes.csv in Resources */,
 				F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */,
 				F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */,
--- a/libs/drape_frontend/frontend_renderer.cpp
+++ b/libs/drape_frontend/frontend_renderer.cpp
@@ -2371,7 +2371,7 @@ void FrontendRenderer::Routine::Do()

  m_renderer.CreateContext();

-#if defined(BUILD_DESIGNER) || defined(DEBUG) || defined(DEBUG_DRAPE_XCODE) || defined(SCENARIO_ENABLE)
+#if defined(DEBUG) || defined(DEBUG_DRAPE_XCODE) || defined(SCENARIO_ENABLE)
  gui::DrapeGui::Instance().GetScaleFpsHelper().SetVisible(true);
 #endif

--- a/libs/indexer/CMakeLists.txt
+++ b/libs/indexer/CMakeLists.txt
@@ -88,8 +88,6 @@ set(SRC
  ftraits.hpp
  ftypes_matcher.cpp
  ftypes_matcher.hpp
-  ftypes_subtypes.cpp
-  ftypes_subtypes.hpp
  house_to_street_iface.hpp
  index_builder.cpp
  index_builder.hpp
--- a/libs/indexer/feature_data.cpp
+++ b/libs/indexer/feature_data.cpp
@@ -3,7 +3,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/ftypes_subtypes.hpp"

 #include "base/assert.hpp"
 #include "base/macros.hpp"
@@ -192,13 +191,25 @@ void TypesHolder::SortBySpec()
  auto const getPriority = [&cl](uint32_t type) { return cl.GetObject(type)->GetMaxOverlaysPriority(); };

  auto const & checker = UselessTypesChecker::Instance();
-  auto const & subtypes = ftypes::Subtypes::Instance();
+  auto const & isChargingStationChecker = ftypes::IsCharingStationChecker::Instance();
+  auto const & isChargingStationSmallChecker = ftypes::IsCharingStationSmallChecker::Instance();

-  std::stable_sort(begin(), end(), [&checker, &getPriority, &subtypes](uint32_t t1, uint32_t t2)
+  std::stable_sort(begin(), end(), [&checker, &getPriority, &isChargingStationChecker, &isChargingStationSmallChecker](uint32_t t1, uint32_t t2)
  {
-    std::optional<bool> const comaprisonResultBasedOnTypeRelation = subtypes.ComaprisonResultBasedOnTypeRelation(t1, t2);
-    if (comaprisonResultBasedOnTypeRelation.has_value())
-      return comaprisonResultBasedOnTypeRelation.value();
+    if (isChargingStationChecker(t1) && isChargingStationChecker(t2))
+    {
+      if (isChargingStationSmallChecker(t1) && !isChargingStationSmallChecker(t2))
+        return false;
+      else if (!isChargingStationSmallChecker(t1) && isChargingStationSmallChecker(t2))
+        return true;
+      
+      uint8_t const t1Level = ftype::GetLevel(t1);
+      uint8_t const t2Level = ftype::GetLevel(t2);
+      if (t1Level == 2 && t2Level != 2)
+        return true;
+      else if (t1Level != 2 && t2Level == 2)
+        return false;
+    }
      
    int const p1 = getPriority(t1);
    int const p2 = getPriority(t2);
--- a/libs/indexer/feature_visibility.cpp
+++ b/libs/indexer/feature_visibility.cpp
@@ -5,7 +5,6 @@
 #include "indexer/feature.hpp"
 #include "indexer/feature_data.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/ftypes_subtypes.hpp"
 #include "indexer/scales.hpp"

 #include "base/assert.hpp"
@@ -136,9 +135,6 @@ bool TypeAlwaysExists(uint32_t type, GeomType geomType = GeomType::Undefined)
  if (IsUsefulStandaloneType(type, geomType))
    return true;

-  if (ftypes::Subtypes::Instance().IsTypeWithSubtypesOrSubtype(type))
-    return true;
-
  uint8_t const typeLevel = ftype::GetLevel(type);
  ftype::TruncValue(type, 1);

--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -753,6 +753,12 @@ IsDirectionalChecker::IsDirectionalChecker() : ftypes::BaseChecker(1 /* level */
  m_types.push_back(c.GetTypeByPath({"lateral"}));
 }

+IsCharingStationChecker::IsCharingStationChecker() : ftypes::BaseChecker(2 /* level */)
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"amenity", "charging_station"}));
+}
+
 IsCharingStationCarChecker::IsCharingStationCarChecker() : ftypes::BaseChecker(3 /* level */)
 {
  Classificator const & c = classif();
--- a/libs/indexer/ftypes_matcher.hpp
+++ b/libs/indexer/ftypes_matcher.hpp
@@ -519,6 +519,14 @@ public:
  DECLARE_CHECKER_INSTANCE(IsDirectionalChecker);
 };

+class IsCharingStationChecker : public ftypes::BaseChecker
+{
+  IsCharingStationChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsCharingStationChecker);
+};
+
 class IsCharingStationCarChecker : public ftypes::BaseChecker
 {
  IsCharingStationCarChecker();
--- a/libs/indexer/ftypes_subtypes.cpp
+++ b/libs/indexer/ftypes_subtypes.cpp
@@ -1,94 +0,0 @@
-#include "indexer/ftypes_subtypes.hpp"
-
-#include "base/assert.hpp"
-#include "coding/csv_reader.hpp"
-#include "indexer/classificator.hpp"
-#include "platform/platform.hpp"
-
-namespace ftypes
-{
-  /// Constructor
-  Subtypes::Subtypes()
-  {
-    auto const & classificator = classif();
-
-    // Get the actual path to the CSV file.
-    Platform & platform = GetPlatform();
-    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(filePath, true, ';')))
-    {
-      // Skip empty lines.
-      if (columns.empty())
-        continue;
-
-      // There only should be two columns.
-      if (columns.size() != 2)
-      {
-        ASSERT(false, ("Parsing of subtypes file: Invalid columns \"", columns, "\""));
-        break;
-      }
-
-      // Parse the column. The first column has the type definitions(s) and the second one has the associated subtype definitions(s).
-      vector<uint32_t> types;
-      vector<uint32_t> subtypes;
-      for (int columnIndex = 0; columnIndex < 2; columnIndex++) {
-        string_view const column = columns[columnIndex];
-
-        // Separate the different type definitions by the `,`. There needs to be at least one.
-        vector<string_view> const typeDefinitions = strings::Tokenize(column, ",");
-        if (typeDefinitions.size() < 1)
-        {
-          ASSERT(columnIndex != 0, ("Parsing of subtypes file: Invalid or missing types definition \"", column, "\""));
-          ASSERT(columnIndex == 0, ("Parsing of subtypes file: Invalid or missing subtypes definition \"", column, "\""));
-          break;
-        }
-
-        // Parse the type definitions and convert them to actual types. Invalid types are getting skipped.
-        vector<uint32_t> typesInColumn;
-        for (auto typeDefinition : typeDefinitions)
-        {
-          vector<string_view> const typePath = strings::Tokenize(typeDefinition, "|");
-          uint32_t const type = classificator.GetTypeByPathSafe(typePath);
-          if (type != IndexAndTypeMapping::INVALID_TYPE)
-          {
-            typesInColumn.push_back(type);
-
-            vector<string> typesAndSubtypesPath(typePath.begin(), typePath.end());
-            if (find(m_typesAndSubtypesPaths.begin(), m_typesAndSubtypesPaths.end(), typesAndSubtypesPath) == m_typesAndSubtypesPaths.end())
-              m_typesAndSubtypesPaths.push_back(typesAndSubtypesPath);
-          }
-          else
-          {
-            ASSERT(columnIndex != 0, ("Parsing of subtypes file: Invalid type \"", typeDefinition, "\""));
-            ASSERT(columnIndex == 0, ("Parsing of subtypes file: Invalid subtype \"", typeDefinition, "\""));
-          }
-        }
-
-        if (columnIndex == 0)
-          types = typesInColumn;
-        else
-          subtypes = typesInColumn;
-      }
-
-      for (auto type : types)
-      {
-        m_types.insert(type);
-        m_typesWithSubtypes[type] = subtypes;
-      }
-
-      for (auto subtype : subtypes)
-      {
-        m_subtypes.insert(subtype);
-      }
-    }
-  }
-
-  /// Static instance
-  Subtypes const & Subtypes::Instance()
-  {
-    static Subtypes instance;
-    return instance;
-  }
-}  // namespace ftypes
--- a/libs/indexer/ftypes_subtypes.hpp
+++ b/libs/indexer/ftypes_subtypes.hpp
@@ -1,122 +0,0 @@
-#pragma once
-
-#include <map>
-#include <unordered_set>
-#include <vector>
-
-namespace ftypes
-{
-  using namespace std;
-
-  class Subtypes
-  {
-  public:
-    /// Static instance
-    static Subtypes const & Instance();
-
-    /**
-     * Checks if the given type is a type with subtypes or a subtype
-     * @param type The type to check
-     * @return `true` if it is a type with subtypes or a subtype, otherwise `false`
-     */
-    bool IsTypeWithSubtypesOrSubtype(uint32_t const type) const
-    {
-      return IsTypeWithSubtypes(type) || IsSubtype(type);
-    }
-
-    /**
-     * Checks if the given type is a type with subtypes
-     * @param type The type to check
-     * @return `true` if it is a type with subtypes, otherwise `false`
-     */
-    bool IsTypeWithSubtypes(uint32_t const type) const
-    {
-      return find(m_types.begin(), m_types.end(), type) != m_types.end();
-    }
-
-    /**
-     * Checks if the given type is a subtype
-     * @param type The type to check
-     * @return `true` if it is a subtype, otherwise `false`
-     */
-    bool IsSubtype(uint32_t const type) const
-    {
-      return find(m_subtypes.begin(), m_subtypes.end(), type) != m_subtypes.end();
-    }
-
-    /**
-     * Checks if the given type is a subtype of a given parent type
-     * @param type The type to check
-     * @param parentType The possible parent type
-     * @return `true` if it is a subtype of the parent type, otherwise `false`
-     */
-    bool IsSubtypeOfParentType(uint32_t const type, uint32_t const parentType) const
-    {
-      auto position = m_typesWithSubtypes.find(parentType);
-      if (position != m_typesWithSubtypes.end()) {
-        vector<uint32_t> subtypes = position->second;
-        return find(subtypes.begin(), subtypes.end(), type) != subtypes.end();
-      }
-
-      return false;
-    }
-
-    /**
-     * Compares to given types based on their type relation
-     * @param firstType The first type to compare
-     * @param secondType The type to compare
-     * @return `true` if the first type is a subtype but the second one isn't, `false` if it is the other way around
-     */
-    optional<bool> ComaprisonResultBasedOnTypeRelation(uint32_t const firstType, uint32_t const secondType) const
-    {
-      bool const firstTypeIsSubtype = IsSubtype(firstType);
-      bool const secondTypeIsSubtype = IsSubtype(secondType);
-      if (!firstTypeIsSubtype && !secondTypeIsSubtype)
-        return {};
-      else if (firstTypeIsSubtype && !secondTypeIsSubtype)
-        return false;
-      else if (!firstTypeIsSubtype && secondTypeIsSubtype)
-        return true;
-
-      // If they got to here, both are subtypes. So use the order of the subtypes for the comparison.
-      for (auto [types, subtypes] : m_typesWithSubtypes)
-      {
-        for (auto const subtype : subtypes)
-        {
-          if (subtype == firstType)
-            return true;
-          else if (subtype == secondType)
-            return false;
-        }
-      }
-
-      return {};
-    }
-
-    /**
-     * Checks if the given type path belongs to a type with subtypes or a subtype
-     * @param typePath The type path to check
-     * @return `true` if it is a type with subtypes or a subtype, otherwise `false`
-     */
-    bool IsPathOfTypeWithSubtypesOrSubtype(vector<string> const typePath) const
-    {
-      return find(m_typesAndSubtypesPaths.begin(), m_typesAndSubtypesPaths.end(), typePath) != m_typesAndSubtypesPaths.end();
-    }
-
-  private:
-    /// Constructor
-    Subtypes();
-
-    /// Types, which have subtypes, as unordered set for faster check performance
-    unordered_set<uint32_t> m_types;
-
-    /// Subypes as unordered set for faster check performance
-    unordered_set<uint32_t> m_subtypes;
-
-    /// Types with their associated subtypes
-    map<uint32_t, vector<uint32_t>> m_typesWithSubtypes;
-
-    /// Paths of types, which have subtypes, and subtypes for the generator
-    vector<vector<string>> m_typesAndSubtypesPaths;
-  };
-}  // namespace ftypes
--- a/libs/indexer/map_object.cpp
+++ b/libs/indexer/map_object.cpp
@@ -3,7 +3,6 @@
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/ftypes_subtypes.hpp"
 #include "indexer/road_shields_parser.hpp"

 #include "geometry/mercator.hpp"
@@ -120,7 +119,6 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
  copy.SortBySpec();

  auto const & isPoi = ftypes::IsPoiChecker::Instance();
-  auto const & subtypes = ftypes::Subtypes::Instance();
  auto const & isDirectional = ftypes::IsDirectionalChecker::Instance();
  auto const & amenityChecker = ftypes::IsAmenityChecker::Instance();
  auto const & charingStationCarChecker = ftypes::IsCharingStationCarChecker::Instance();
@@ -143,7 +141,7 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
    }

    // Ignore types that are not POI
-    if (!isMainType && !isPoi(type) && !subtypes.IsTypeWithSubtypesOrSubtype(type) && !isDirectional(type))
+    if (!isMainType && !isPoi(type) && !isDirectional(type))
      continue;

    // Ignore general amenity
--- a/libs/indexer/search_string_utils.cpp
+++ b/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")},
@@ -128,7 +127,6 @@ static std::pair<UniString, UniString> const kPreprocessReplacements[] = {
    {MakeUniString("пр-д"), MakeUniString("проезд")},
    {MakeUniString("пр-т"), MakeUniString("проспект")},
    {MakeUniString("р-н"), MakeUniString("район")},
-    {MakeUniString("ж.к."), MakeUniString("жк")},
    {MakeUniString("আ/এ"), MakeUniString("আবাসিক এলাকা")},
 };

--- a/libs/routing/geometry.cpp
+++ b/libs/routing/geometry.cpp
@@ -183,15 +183,8 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType

  auto const & optionsClassfier = RoutingOptionsClassifier::Instance();
  for (uint32_t type : types)
-  {
    if (auto const it = optionsClassfier.Get(type))
-    {
-      if (*it == RoutingOptions::Road::Dirty && m_routingOptions.Has(RoutingOptions::Road::Paved))
-        continue;
-
      m_routingOptions.Add(*it);
-    }
-  }

  m_junctions.clear();
  m_junctions.reserve(count);
--- a/libs/search/query_params.cpp
+++ b/libs/search/query_params.cpp
@@ -94,6 +94,7 @@ 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"}},
@@ -621,7 +622,7 @@ unordered_map<string, vector<string>> const kSynonyms = {
    {"hse", {"house"}},
    {"hs", {"haus", "high school"}},
    {"hst", {"haltestelle"}},
-    {"ht", {"heights", "hinteres", "hinterer", "hinter", "hintere"}},
+    {"ht", {"heights", "hinteres", "hinterer", "hinter…", "hintere"}},
    {"htl", {"höhere technische lehranstalt"}},
    {"hts", {"heights"}},
    {"htt", {"hütte"}},
@@ -679,12 +680,12 @@ unordered_map<string, vector<string>> const kSynonyms = {
    {"kel", {"kelurahan"}},
    {"kga", {"kleingartenanlage"}},
    {"kgg", {"kagalang-galang"}},
-    {"kg", {"katastralgemeinde", "kampong", "kogel"}},
+    {"kg", {"katastralgemeinde", "…kogel", "kampong", "kogel"}},
    {"kgv", {"kleingartenverein"}},
    {"kh", {"krankenhaus"}},
    {"kj", {"kuja"}},
-    {"k", {"kalea", "katu", "koło", "kolo", "kort", "korte"}},
-    {"kl", {"konzentrationslager", "klein", "kleines", "kleiner", "kleine", "kylä"}},
+    {"k", {"kalea", "katu", "koło", "kolo", "kort(e)"}},
+    {"kl", {"konzentrationslager", "klein…", "kleines", "kleiner", "kleine", "kylä"}},
    {"knm", {"khu nghỉ mát"}},
    {"kol", {"kolonel", "kolonia"}},
    {"kon", {"koning", "koningin"}},
@@ -1506,11 +1507,12 @@ void QueryParams::ClearStreetIndices()
    AdditionalCommonTokens()
    {
      char const * arr[] = {
-          "a",  "and", "s",   "the",                      // English
-          "am", "an",  "auf", "der", "im", "und", "zum",  // German
-          "as", "d",   "da",  "das", "de", "del", "di",  "do", "dos", "du", "e",
-          "el", "et",  "la",  "las", "le", "les", "los", "o",  "os",  "y",  // French, Italian, Portuguese, Spanish
-          "в",  "и",   "за",  "к",   "на", "я"                              // Cyrillic
+          "a",  "and", "s",   "the",                       // English
+          "am", "an",  "auf", "der", "im",  "und", "zum",  // German
+          "as", "d", "da", "das", "de", "del", "di", "do",
+          "dos", "du", "e", "el", "et", "la",  "las", "le",
+          "les", "los", "o",   "os", "y",                  // French, Italian, Portuguese, Spanish
+          "в",  "и",   "на",  "я"                                     // Cyrillic
      };
      for (char const * s : arr)
        m_strings.insert(NormalizeAndSimplifyString(s));
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -7,9 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		272CA4462F126795005A3F5B /* ftypes_subtypes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 272CA4442F126795005A3F5B /* ftypes_subtypes.hpp */; };
-		272CA4472F126795005A3F5B /* ftypes_subtypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 272CA4452F126795005A3F5B /* ftypes_subtypes.cpp */; };
-		272CA44D2F12723B005A3F5B /* subtypes.csv in Resources */ = {isa = PBXBuildFile; fileRef = 272CA44C2F12723B005A3F5B /* subtypes.csv */; };
 		27BCD5272E93E625002C50F0 /* feature_charge_sockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27BCD5262E93E625002C50F0 /* feature_charge_sockets.cpp */; };
 		27BCD5282E93E625002C50F0 /* feature_charge_sockets.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 27BCD5252E93E625002C50F0 /* feature_charge_sockets.hpp */; };
 		27BCD52A2E93E670002C50F0 /* feature_charge_sockets_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27BCD5292E93E670002C50F0 /* feature_charge_sockets_test.cpp */; };
@@ -233,9 +230,6 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		272CA4442F126795005A3F5B /* ftypes_subtypes.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ftypes_subtypes.hpp; sourceTree = "<group>"; };
-		272CA4452F126795005A3F5B /* ftypes_subtypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ftypes_subtypes.cpp; sourceTree = "<group>"; };
-		272CA44C2F12723B005A3F5B /* subtypes.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = subtypes.csv; path = ../../data/subtypes.csv; sourceTree = "<group>"; };
 		27BCD5252E93E625002C50F0 /* feature_charge_sockets.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = feature_charge_sockets.hpp; sourceTree = "<group>"; };
 		27BCD5262E93E625002C50F0 /* feature_charge_sockets.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_charge_sockets.cpp; sourceTree = "<group>"; };
 		27BCD5292E93E670002C50F0 /* feature_charge_sockets_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_charge_sockets_test.cpp; sourceTree = "<group>"; };
@@ -505,7 +499,6 @@
 				3496AB9C1DC1FA5200C5DDBA /* drules_proto.bin */,
 				3496ABA21DC1FA7200C5DDBA /* editor.config */,
 				3496ABAE1DC1FAC900C5DDBA /* minsk-pass.mwm */,
-				272CA44C2F12723B005A3F5B /* subtypes.csv */,
 				3496AB961DC1FA2000C5DDBA /* types.txt */,
 			);
 			name = Resources;
@@ -696,8 +689,6 @@
 				3D74ABBB1EA67C1E0063A898 /* ftypes_mapping.hpp */,
 				675340D51A3F540F00A0A8C3 /* ftypes_matcher.cpp */,
 				675340D61A3F540F00A0A8C3 /* ftypes_matcher.hpp */,
-				272CA4452F126795005A3F5B /* ftypes_subtypes.cpp */,
-				272CA4442F126795005A3F5B /* ftypes_subtypes.hpp */,
 				675340DB1A3F540F00A0A8C3 /* index_builder.cpp */,
 				675340DC1A3F540F00A0A8C3 /* index_builder.hpp */,
 				675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */,
@@ -824,7 +815,6 @@
 				675341411A3F540F00A0A8C3 /* scales.hpp in Headers */,
 				675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */,
 				40009062201F5CB000963E18 /* cell_value_pair.hpp in Headers */,
-				272CA4462F126795005A3F5B /* ftypes_subtypes.hpp in Headers */,
 				347F337C1C454242009758CC /* rank_table.hpp in Headers */,
 				40D62CEF23F2E8BE009A20F5 /* dat_section_header.hpp in Headers */,
 				F61F83071E4B187500B37B7A /* road_shields_parser.hpp in Headers */,
@@ -945,7 +935,6 @@
 				3496ABA31DC1FA7200C5DDBA /* editor.config in Resources */,
 				3496AB9D1DC1FA5200C5DDBA /* drules_proto_clear.bin in Resources */,
 				3496AB9E1DC1FA5200C5DDBA /* drules_proto_dark.bin in Resources */,
-                                272CA44D2F12723B005A3F5B /* subtypes.csv in Resources */,
 				FA67C84F26BB36D700B33DCA /* categories_brands.txt in Resources */,
 				FA67C84626BB356800B33DCA /* categories_cuisines.txt in Resources */,
 				3496ABA11DC1FA5200C5DDBA /* drules_proto.bin in Resources */,
@@ -1038,7 +1027,6 @@
 				4043C0B924ACBA3300545FD8 /* transliteration_loader.cpp in Sources */,
 				6753411C1A3F540F00A0A8C3 /* shared_load_info.cpp in Sources */,
 				67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */,
-				272CA4472F126795005A3F5B /* ftypes_subtypes.cpp in Sources */,
 				BBB7060F23E46E0100A7F29A /* isolines_info.cpp in Sources */,
 				408FE47724FEB95600F5D06D /* metadata_serdes.cpp in Sources */,
 				34583BCB1C88552100F94664 /* map_object.cpp in Sources */,