[search] Add synonyms

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
[desktop] Update Fedora dependencies (#2957 )
2025-12-24 23:13:47 +00:00 · 2025-12-24 17:32:23 +01:00 · 2025-12-24 14:19:00 +01:00 · 2025-12-22 12:24:45 +01:00 · 2025-12-22 12:04:00 +01:00 · 2025-12-21 19:04:59 +01:00
35 changed files with 583 additions and 170 deletions
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -948,7 +948,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

    mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);

-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
    {
      mReset.setText(R.string.editor_place_doesnt_exist);
      return;
@@ -966,7 +966,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void reset()
  {
-    if (Editor.nativeIsMapObjectUploaded())
+    if (Editor.nativeAreSomeFeatureChangesUploaded())
    {
      placeDoesntExist();
      return;
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -15,7 +15,13 @@
    android:theme="@style/MwmWidget.ToolbarTheme">
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/save"
-      style="@style/MwmWidget.Downloader.ToolbarButton"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:gravity="center"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:padding="@dimen/margin_half"
+      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
      android:text="@string/editor_report_problem_send_button"/>
  </com.google.android.material.appbar.MaterialToolbar>

--- a/android/app/src/main/res/layout/fragment_suggest_country_download.xml
+++ b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
@@ -6,7 +6,6 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
  android:animateLayoutChanges="true"
  android:clickable="true"
  android:clipToPadding="false"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -6,7 +6,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_gravity="center"
  android:orientation="vertical"
-  android:background="?windowBackgroundForced"
+  android:background="?cardBackground"
  android:padding="@dimen/margin_base">
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -7,6 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -7,6 +7,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+  android:background="?cardBackground"
  android:minHeight="@dimen/height_item_oneline"
  android:paddingStart="@dimen/margin_base_plus"
  android:paddingEnd="@dimen/margin_base_plus">
--- a/android/app/src/main/res/layout/placeholder_title.xml
+++ b/android/app/src/main/res/layout/placeholder_title.xml
@@ -6,6 +6,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginBottom="@dimen/margin_half_plus"
-  android:textAppearance="@style/MwmTextAppearance.Title.Toolbar"
+  android:textSize="@dimen/text_size_headline"
+  android:fontFamily="@string/robotoMedium"
  android:gravity="center_horizontal"
  tools:text="Some long long long placeholder title"/>
--- a/android/app/src/main/res/layout/tab_timepicker.xml
+++ b/android/app/src/main/res/layout/tab_timepicker.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  style="@style/MwmWidget.Tab"
-  android:textAppearance="@style/MwmTextAppearance.Body3"
-  tools:drawableStart="@drawable/ic_menu_open"
-  tools:text="Some tab"/>
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -15,11 +15,6 @@
    <item name="android:textStyle">bold</item>
  </style>

-  <style name="MwmTextAppearance.Title.Toolbar">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-    <item name="android:fontFamily">@string/robotoMedium</item>
-  </style>
-
  <style name="MwmTextAppearance.Headline">
    <item name="android:textSize">@dimen/text_size_headline</item>
    <item name="android:textColor">?android:textColorPrimary</item>
@@ -121,10 +116,6 @@
    <item name="android:textColor">@color/bg_cards</item>
  </style>

-  <style name="MwmTextAppearance.Toolbar.Title.Button">
-    <item name="android:textSize">@dimen/text_size_body_3</item>
-  </style>
-
  <style name="MwmTextAppearance.NavMenu">
    <item name="android:textStyle">bold</item>
  </style>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -287,13 +287,6 @@
    <item name="android:textColor">@color/text_light</item>
  </style>

-  <style name="MwmWidget.Tab">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
-    <item name="android:gravity">center</item>
-  </style>
-
  <style name="MwmWidget.TabLayout" parent="Widget.Design.TabLayout">
    <item name="tabMaxWidth">0dp</item>
    <item name="tabTextAppearance">@style/MwmTextAppearance.Tab</item>
@@ -305,16 +298,6 @@
    <item name="tabSelectedTextColor">@color/white_primary</item>
  </style>

-  <style name="MwmWidget.Downloader.ToolbarButton">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:gravity">center</item>
-    <item name="android:layout_gravity">end|center_vertical</item>
-    <item name="android:background">?selectableItemBackgroundBorderless</item>
-    <item name="android:padding">@dimen/margin_half</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Toolbar.Title.Button</item>
-  </style>
-
  <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
    parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
@@ -377,9 +360,6 @@
  <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
    <item name="android:layout_width">wrap_content</item>
    <item name="android:layout_height">wrap_content</item>
-    <item name="android:textColor">?accentButtonTextColor</item>
-    <item name="backgroundTint">@null</item>
-    <item name="cornerRadius">20dp</item>
    <item name="android:textSize">16sp</item>
  </style>

@@ -389,13 +369,11 @@

  <style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
    <item name="android:textSize">16sp</item>
-    <item name="strokeColor">?colorSecondary</item>
    <item name="android:textColor">?colorSecondary</item>
  </style>

  <style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
    <item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
-    <item name="rippleColor">@null</item>
    <item name="backgroundTint">?colorSecondary</item>
    <item name="tint">?android:textColorPrimaryInverse</item>
  </style>
--- a/android/sdk/src/main/assets/mapcss-mapping.csv
+++ b/android/sdk/src/main/assets/mapcss-mapping.csv
@@ -0,0 +1 @@
+../../../../../data/mapcss-mapping.csv
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -580,10 +580,10 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObject
  return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID()));
 }

-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeAreSomeFeatureChangesUploaded(JNIEnv * env, jclass clazz)
 {
-  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId,
-                                                   g_editableMapObject.GetID().m_index);
+  return osm::Editor::Instance().AreSomeFeatureChangesUploaded(g_editableMapObject.GetID().m_mwmId,
+                                                               g_editableMapObject.GetID().m_index);
 }

 // static nativeMakeLocalizedName(String langCode, String name);
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
@@ -190,5 +190,5 @@ public final class Editor

  @FeatureStatus
  public static native int nativeGetMapObjectStatus();
-  public static native boolean nativeIsMapObjectUploaded();
+  public static native boolean nativeAreSomeFeatureChangesUploaded();
 }
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -453,7 +453,7 @@
 "shop-tattoo": "Tattoo Parlour|4tattoos",
 "shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime",
 "shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store",
-"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|U+1F47E|U+1F579|U+1F3AE",
+"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|video game|videogame|U+1F47E|U+1F579|U+1F3AE",
 "tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy",
 "tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum",
 "tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park",
--- a/data/editor.config
+++ b/data/editor.config
@@ -394,32 +394,25 @@
      <type id="amenity-pharmacy" group="shop">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-buddhist" can_add="no">
+      <type id="amenity-place_of_worship-buddhist">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-christian" can_add="no">
+      <type id="amenity-place_of_worship-christian">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-hindu" can_add="no">
+      <type id="amenity-place_of_worship-hindu">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-jewish" can_add="no">
+      <type id="amenity-place_of_worship-jewish">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-muslim" can_add="no">
+      <type id="amenity-place_of_worship-muslim">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-shinto" can_add="no">
+      <type id="amenity-place_of_worship-shinto">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="amenity-place_of_worship-taoist" can_add="no">
+      <type id="amenity-place_of_worship-taoist">
        <include group="poi_internet" />
      </type>
      <type id="amenity-place_of_worship">
@@ -705,6 +698,9 @@
      <type id="leisure-resort">
        <include group="poi_internet" />
      </type>
+      <type id="leisure-sports_centre-sport-swimming">
+        <include group="poi_internet" />
+      </type>
      <type id="leisure-sports_centre">
        <include group="poi_internet" />
      </type>
@@ -1115,6 +1111,7 @@
      <type id="tourism-artwork">
        <include field="name" />
      </type>
+      <!-- Not addable because OSM category is too broad and due to vandalism problems -->
      <type id="tourism-attraction" can_add="no">
        <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
@@ -1144,26 +1141,22 @@
        <include group="poi_internet" />
        <include field="self_service" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-office" can_add="no">
+      <type id="tourism-information-office">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-visitor_centre" can_add="no">
+      <type id="tourism-information-visitor_centre">
        <include group="poi_internet" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-board" can_add="no">
+      <type id="tourism-information-board">
        <include field="name" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-map" can_add="no">
+      <type id="tourism-information-map">
        <include field="name" />
      </type>
-      <!-- Can not be added because it is a complex type -->
-      <type id="tourism-information-guidepost" can_add="no">
+      <type id="tourism-information-guidepost">
      </type>
-      <type id="tourism-information">
+      <!-- Too generic to add -->
+      <type id="tourism-information" can_add="no">
        <include group="poi" />
      </type>
      <type id="amenity-ranger_station">
@@ -1509,67 +1502,50 @@
      <type id="leisure-escape_game">
        <include group="poi_internet" />
      </type>
-      <!-- Uncomment this after our editor core supports complex types
+      <type id="amenity-vending_machine-parking_tickets">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-public_transport_tickets">
+        <include field="operator" />
+        <include field="level" />
+      </type>
      <type id="amenity-vending_machine-cigarettes">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="cigarettes" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-coffee">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="coffee" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-vending_machine-condoms">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="condoms" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-drinks">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="drinks" />
        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-excrement_bags">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-coffee">
+        <include field="operator" />
+        <include field="level" />
+      </type>
+      <type id="amenity-vending_machine-condoms">
+        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-food">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="food" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-newspapers">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="newspapers" />
        <include field="operator" />
+        <include field="level" />
      </type>
      <type id="amenity-vending_machine-sweets">
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="sweets" />
        <include field="operator" />
+        <include field="level" />
      </type>
-      <type id="shop-car_repair-tyres">
-        <tag k="shop" v="car_repair" />
-        <tag k="service" v="tyres" />
-        <include group="poi_internet" />
+      <type id="amenity-vending_machine">
+        <include field="operator" />
+        <include field="level" />
      </type>
-      <type id="leisure-sports_centre-climbing">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="climbing" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-shooting">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="shooting" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-swimming">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="swimming" />
-        <include group="poi_internet" />
-      </type>
-      <type id="leisure-sports_centre-yoga">
-        <tag k="leisure" v="sports_centre" />
-        <tag k="sport" v="yoga" />
-        <include group="poi_internet" />
-      </type-->
      <!-- Not addable as mapping as a node is uncommon -->
      <type id="natural-beach" can_add="no">
        <include field="name" />
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -5,7 +5,7 @@
 #   highway|bus_stop;[highway=bus_stop];;name;int_name;22;
 # It contains:
 # - type name: "highway|bus_stop" ("|" is converted to "-" internally)
-# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas
+# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas, best practice tagging for OSM editor is listed first
 # - "x" for a deprecated type or an empty cell otherwise
 # - primary title tag (usually "name")
 # - secondary title tag (usually "int_name")
@@ -626,7 +626,7 @@ highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
 drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
 drinking_water|no;505;
 amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
-amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
+amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
 amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -2455,9 +2455,9 @@ node|z17-[amenity=parking],
 {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}

 node|z16-[amenity=car_pooling],
-{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
+{icon-image: parking_pooling-s.svg;icon-min-distance: 5;}
 node|z17-[amenity=car_pooling],
-{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
+{icon-image: parking_pooling-m.svg;font-size: 11;icon-min-distance: 10}

 node|z16-[amenity=parking][location=underground],
 {icon-image:parking_underground-m.svg;}
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -734,7 +734,7 @@ node|z18-[amenity=water_point][drinking_water=not],
 node|z15-[amenity=parking],
 {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z15-[amenity=car_pooling],
-{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
+{icon-image: parking_pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z17[amenity=parking],
 node|z17[amenity=car_pooling],
 {icon-min-distance: 15;font-size: 13.75;}
--- a/docs/INSTALL_DESKTOP.md
+++ b/docs/INSTALL_DESKTOP.md
@@ -68,6 +68,10 @@ and apply the [Ubuntu workarounds accordingly](#workarounds-for-older-ubuntu-ver

 ```bash
 sudo dnf install -y \
+    awk \
+    wget \
+    optipng \
+    git \
    clang \
    cmake \
    ninja-build \
@@ -80,8 +84,13 @@ sudo dnf install -y \
    qt6-qtpositioning \
    qt6-qtpositioning-devel \
    qt6-qtsvg-devel \
-    python3-protobuf \
-    sqlite-devel
+    python3-pip \
+    sqlite-devel \
+    libXrandr-devel \
+    libXinerama-devel \
+    libXcursor-devel \
+    libXi-devel
+pip3 install "protobuf<3.21" --break-system-packages
 ```

 #### Alpine
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		27AF18562E1DB63000CD41E2 /* PowerSavingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */; };
 		27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18572E1DB63900CD41E2 /* Appearance.swift */; };
 		27AF185A2E1DB64500CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */; };
+		27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */ = {isa = PBXBuildFile; fileRef = 27FDBF202EEEFC830045621D /* mapcss-mapping.csv */; };
 		3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; };
 		33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; };
 		337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; };
@@ -789,6 +790,7 @@
 		27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = "<group>"; };
 		27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = "<group>"; };
+		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
 		28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = "<group>"; tabWidth = 2; };
 		30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -3948,6 +3950,7 @@
 				6B9978341C89A316003B8AA0 /* editor.config */,
 				978D4A30199A11E600D72CA7 /* faq.html */,
 				BB7626B41E8559980031D71C /* icudt75l.dat */,
+				27FDBF202EEEFC830045621D /* mapcss-mapping.csv */,
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
@@ -4201,6 +4204,7 @@
 				34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */,
 				340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */,
 				F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */,
+				27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */,
 				EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */,
 				993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */,
 				F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */,
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -158,7 +158,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
  [self configNavBar];
  auto const & fid = m_mapObject.GetID();
  self.featureStatus = osm::Editor::Instance().GetFeatureStatus(fid.m_mwmId, fid.m_index);
-  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
  m_newAdditionalLanguages.clear();
  if (self.isCreating)
  {
@@ -1089,7 +1089,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
 - (void)tapOnButtonCell:(UITableViewCell *)cell
 {
  auto const & fid = m_mapObject.GetID();
-  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
  NSIndexPath * ip = [self.tableView indexPathForCell:cell];
  [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade];

--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm
@@ -260,6 +260,14 @@ WeekDayView getWeekDayView()
  });
 }

+- (IBAction)extendedToggleButtonTap
+{
+  id<MWMPlacePageOpeningHoursCellProtocol> delegate = self.delegate;
+  if (delegate.isEditor) {
+    [delegate setOpeningHoursCellExpanded:!delegate.openingHoursCellExpanded];
+  }
+}
+
 #pragma mark - Properties

 - (BOOL)isExpanded
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib
@@ -172,17 +172,30 @@
                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
                        <rect key="frame" x="0.0" y="127" width="320" height="122"/>
                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <gestureRecognizers/>
                        <constraints>
                            <constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
                        </constraints>
                    </view>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYN-dO-J0e" userLabel="Editor Button">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="249"/>
+                        <state key="normal" title="Button"/>
+                        <buttonConfiguration key="configuration" style="plain"/>
+                        <connections>
+                            <action selector="extendedToggleButtonTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BSf-KC-HgD"/>
+                        </connections>
+                    </button>
                </subviews>
                <constraints>
                    <constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
+                    <constraint firstAttribute="trailing" secondItem="hYN-dO-J0e" secondAttribute="trailing" id="0Vo-1D-dPq"/>
                    <constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
+                    <constraint firstItem="hYN-dO-J0e" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="GVQ-l4-vnQ"/>
                    <constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
                    <constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
+                    <constraint firstItem="hYN-dO-J0e" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Sav-rp-wo2"/>
                    <constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
+                    <constraint firstAttribute="bottom" secondItem="hYN-dO-J0e" secondAttribute="bottom" id="Xe1-4J-wRh"/>
                    <constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
                    <constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
                    <constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
@@ -192,6 +205,7 @@
                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
                </userDefinedRuntimeAttributes>
            </tableViewCellContentView>
+            <gestureRecognizers/>
            <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
            <connections>
                <outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>
--- a/libs/editor/CMakeLists.txt
+++ b/libs/editor/CMakeLists.txt
@@ -18,6 +18,8 @@ set(SRC
  edits_migration.hpp
  feature_matcher.cpp
  feature_matcher.hpp
+  feature_type_to_osm.cpp
+  feature_type_to_osm.hpp
  new_feature_categories.cpp
  new_feature_categories.hpp
  opening_hours_ui.cpp
--- a/libs/editor/editor_tests/CMakeLists.txt
+++ b/libs/editor/editor_tests/CMakeLists.txt
@@ -5,6 +5,7 @@ set(SRC
  editor_config_test.cpp
  editor_notes_test.cpp
  feature_matcher_test.cpp
+  feature_type_to_osm_test.cpp
  match_by_geometry_test.cpp
  new_feature_categories_test.cpp
  opening_hours_ui_test.cpp
--- a/libs/editor/editor_tests/feature_type_to_osm_test.cpp
+++ b/libs/editor/editor_tests/feature_type_to_osm_test.cpp
@@ -0,0 +1,224 @@
+#include "testing/testing.hpp"
+
+#include "editor/feature_type_to_osm.hpp"
+
+#include "indexer/classificator.hpp"
+#include "indexer/classificator_loader.hpp"
+
+using namespace editor;
+
+UNIT_TEST(simpleType)
+{
+  std::string data =
+      "amenity|restaurant;61;\n"
+      "amenity|bicycle_parking;1071;\n";
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+
+  uint32_t type = classif().GetTypeByReadableObjectName("amenity-restaurant");
+  std::vector<OSMTag> result = translator.OsmTagsFromType(type);
+  TEST_EQUAL(result.size(), 1, ());
+  TEST_EQUAL(result[0].key, "amenity", ());
+  TEST_EQUAL(result[0].value, "restaurant", ());
+}
+
+UNIT_TEST(simpleTypeWithTags)
+{
+  std::string data =
+      "building;[building];;addr:housenumber;name;1;\n"
+      "amenity|school;[amenity=school],[education=school];;name;int_name;36;\n"
+      "amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;name;int_name;207;\n";
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+
+  uint32_t buildingType = classif().GetTypeByReadableObjectName("building");
+  std::vector<OSMTag> buildingResult = translator.OsmTagsFromType(buildingType);
+  TEST_EQUAL(buildingResult.size(), 1, ());
+  TEST_EQUAL(buildingResult[0].key, "building", ());
+  TEST_EQUAL(buildingResult[0].value, "yes", ());
+
+  uint32_t schoolType = classif().GetTypeByReadableObjectName("amenity-school");
+  std::vector<OSMTag> schoolResult = translator.OsmTagsFromType(schoolType);
+  TEST_EQUAL(schoolResult.size(), 1, ());
+  TEST_EQUAL(schoolResult[0].key, "amenity", ());
+  TEST_EQUAL(schoolResult[0].value, "school", ());
+
+  uint32_t doctorType = classif().GetTypeByReadableObjectName("amenity-doctors");
+  std::vector<OSMTag> doctorResult = translator.OsmTagsFromType(doctorType);
+  TEST_EQUAL(doctorResult.size(), 2, ());
+  TEST_EQUAL(doctorResult[0].key, "amenity", ());
+  TEST_EQUAL(doctorResult[0].value, "doctors", ());
+  TEST_EQUAL(doctorResult[1].key, "healthcare", ());
+  TEST_EQUAL(doctorResult[1].value, "doctor", ());
+}
+
+UNIT_TEST(complexType)
+{
+  std::string data =
+      "building;[building];;addr:housenumber;name;1;\n"
+      " # comment that should be ignored\n"
+      "\n"
+      "amenity|restaurant;61;\n"
+      "tourism|information|office;[tourism=information][information=office];;name;int_name;313;\n"
+      "historic|castle|fortress;[historic=castle][castle_type=fortress],[historic=fortress];;name;int_name;1144;\n"
+      "#comment\n"
+      "amenity|place_of_worship|christian|mormon;[amenity=place_of_worship][religion=christian][denomination=mormon];;name;int_name;1572;\n";
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+
+  uint32_t officeType = classif().GetTypeByReadableObjectName("tourism-information-office");
+  std::vector<OSMTag> officeResult = translator.OsmTagsFromType(officeType);
+  TEST_EQUAL(officeResult.size(), 2, ());
+  TEST_EQUAL(officeResult[0].key, "tourism", ());
+  TEST_EQUAL(officeResult[0].value, "information", ());
+  TEST_EQUAL(officeResult[1].key, "information", ());
+  TEST_EQUAL(officeResult[1].value, "office", ());
+
+  uint32_t fortressType = classif().GetTypeByReadableObjectName("historic-castle-fortress");
+  std::vector<OSMTag> fortressResult = translator.OsmTagsFromType(fortressType);
+  TEST_EQUAL(fortressResult.size(), 2, ());
+  TEST_EQUAL(fortressResult[0].key, "historic", ());
+  TEST_EQUAL(fortressResult[0].value, "castle", ());
+  TEST_EQUAL(fortressResult[1].key, "castle_type", ());
+  TEST_EQUAL(fortressResult[1].value, "fortress", ());
+
+  uint32_t mormonType = classif().GetTypeByReadableObjectName("amenity-place_of_worship-christian-mormon");
+  std::vector<OSMTag> mormonResult = translator.OsmTagsFromType(mormonType);
+  TEST_EQUAL(mormonResult.size(), 3, ());
+  TEST_EQUAL(mormonResult[0].key, "amenity", ());
+  TEST_EQUAL(mormonResult[0].value, "place_of_worship", ());
+  TEST_EQUAL(mormonResult[1].key, "religion", ());
+  TEST_EQUAL(mormonResult[1].value, "christian", ());
+  TEST_EQUAL(mormonResult[2].key, "denomination", ());
+  TEST_EQUAL(mormonResult[2].value, "mormon", ());
+}
+
+UNIT_TEST(mandatorySelector)
+{
+  std::string data =
+      "amenity|parking|fee;[amenity=parking][fee];;name;int_name;125;\n"
+      "highway|track|bridge;[highway=track][bridge?];;name;int_name;193;\n"
+      "shop;[shop?];;name;int_name;943;\n"
+      "disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar];;;;1237;\n";
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+
+  uint32_t parkingType = classif().GetTypeByReadableObjectName("amenity-parking-fee");
+  std::vector<OSMTag> parkingResult = translator.OsmTagsFromType(parkingType);
+  TEST_EQUAL(parkingResult.size(), 2, ());
+  TEST_EQUAL(parkingResult[0].key, "amenity", ());
+  TEST_EQUAL(parkingResult[0].value, "parking", ());
+  TEST_EQUAL(parkingResult[1].key, "fee", ());
+  TEST_EQUAL(parkingResult[1].value, "yes", ());
+
+  uint32_t trackType = classif().GetTypeByReadableObjectName("highway-track-bridge");
+  std::vector<OSMTag> trackResult = translator.OsmTagsFromType(trackType);
+  TEST_EQUAL(trackResult.size(), 2, ());
+  TEST_EQUAL(trackResult[0].key, "highway", ());
+  TEST_EQUAL(trackResult[0].value, "track", ());
+  TEST_EQUAL(trackResult[1].key, "bridge", ());
+  TEST_EQUAL(trackResult[1].value, "yes", ());
+
+  uint32_t shopType = classif().GetTypeByReadableObjectName("shop");
+  std::vector<OSMTag> shopResult = translator.OsmTagsFromType(shopType);
+  TEST_EQUAL(shopResult.size(), 1, ());
+  TEST_EQUAL(shopResult[0].key, "shop", ());
+  TEST_EQUAL(shopResult[0].value, "yes", ());
+
+  uint32_t disusedType = classif().GetTypeByReadableObjectName("disusedbusiness");
+  std::vector<OSMTag> disusedResult = translator.OsmTagsFromType(disusedType);
+  TEST_EQUAL(disusedResult.size(), 1, ());
+  TEST_EQUAL(disusedResult[0].key, "disused:shop", ());
+  TEST_EQUAL(disusedResult[0].value, "yes", ());
+}
+
+UNIT_TEST(forbiddenSelector)
+{
+  std::string data =
+      "amenity|lounger;[amenity=lounger][!seasonal];;name;int_name;153;\n"
+      "amenity|charging_station|motorcar|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2];;name;int_name;201;\n";
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+
+  uint32_t loungerType = classif().GetTypeByReadableObjectName("amenity-lounger");
+  std::vector<OSMTag> loungerResult = translator.OsmTagsFromType(loungerType);
+  TEST_EQUAL(loungerResult.size(), 1, ());
+  TEST_EQUAL(loungerResult[0].key, "amenity", ());
+  TEST_EQUAL(loungerResult[0].value, "lounger", ());
+
+  uint32_t chargingType = classif().GetTypeByReadableObjectName("amenity-charging_station-motorcar-small");
+  std::vector<OSMTag> chargingResult = translator.OsmTagsFromType(chargingType);
+  TEST_EQUAL(chargingResult.size(), 2, ());
+  TEST_EQUAL(chargingResult[0].key, "amenity", ());
+  TEST_EQUAL(chargingResult[0].value, "charging_station", ());
+  TEST_EQUAL(chargingResult[1].key, "motorcar", ());
+  TEST_EQUAL(chargingResult[1].value, "yes", ());
+}
+
+UNIT_TEST(ignoreComments)
+{
+  std::string data =
+      "building;[building];;addr:housenumber;name;1;\n"
+      " # comment that should be ignored\n"
+      "\n"
+      "deprecated:waterway|riverbank:05.2024;52;x\n"
+      "amenity|restaurant;61;\n"
+      "moved:amenity|telephone:05.2024;122;amenity|telephone\n"
+      "natural|lake;564;natural|water|lake\n";  // moved type, should be ignored
+
+  classificator::Load();
+
+  TypeToOSMTranslator translator(false);
+  std::stringstream s(data);
+  translator.LoadFromStream(s);
+}
+
+UNIT_TEST(loadConfigFile)
+{
+  TypeToOSMTranslator translator(false);
+  translator.LoadConfigFile();
+
+  size_t size = translator.GetStorage().size();
+  LOG(LINFO, ("Size of feature type storage:", size));
+  ASSERT(size > 1300, ());
+  ASSERT(size < 1700, ());
+}
+
+UNIT_TEST(testWithRealFile)
+{
+  classificator::Load();
+
+  uint32_t restaurantType = classif().GetTypeByReadableObjectName("amenity-restaurant");
+  std::vector<OSMTag> restaurantResult = GetOSMTranslator().OsmTagsFromType(restaurantType);
+  TEST_EQUAL(restaurantResult.size(), 1, ());
+  TEST_EQUAL(restaurantResult[0].key, "amenity", ());
+  TEST_EQUAL(restaurantResult[0].value, "restaurant", ());
+
+  uint32_t officeType = classif().GetTypeByReadableObjectName("tourism-information-office");
+  std::vector<OSMTag> officeResult = GetOSMTranslator().OsmTagsFromType(officeType);
+  TEST_EQUAL(officeResult.size(), 2, ());
+  TEST_EQUAL(officeResult[0].key, "tourism", ());
+  TEST_EQUAL(officeResult[0].value, "information", ());
+  TEST_EQUAL(officeResult[1].key, "information", ());
+  TEST_EQUAL(officeResult[1].value, "office", ());
+}
--- a/libs/editor/editor_tests/osm_editor_test.cpp
+++ b/libs/editor/editor_tests/osm_editor_test.cpp
@@ -406,7 +406,7 @@ void EditorTest::GetFeatureStatusTest()
  TEST_EQUAL(editor.GetFeatureStatus(emo.GetID()), FeatureStatus::Created, ());
 }

-void EditorTest::IsFeatureUploadedTest()
+void EditorTest::AreSomeFeatureChangesUploadedTest()
 {
  auto & editor = osm::Editor::Instance();

@@ -419,19 +419,25 @@ void EditorTest::IsFeatureUploadedTest()
  });

  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-  { TEST(!editor.IsFeatureUploaded(ft.GetID().m_mwmId, ft.GetID().m_index), ()); });
+  { TEST(!editor.AreSomeFeatureChangesUploaded(ft.GetID().m_mwmId, ft.GetID().m_index), ()); });

  osm::EditableMapObject emo;
  CreateCafeAtPoint({3.0, 3.0}, mwmId, emo);

-  TEST(!editor.IsFeatureUploaded(emo.GetID().m_mwmId, emo.GetID().m_index), ());
+  TEST(!editor.AreSomeFeatureChangesUploaded(emo.GetID().m_mwmId, emo.GetID().m_index), ());
+
+  // generate journal with uploaded changes
+  osm::EditJournal journal;
+  journal.AddTagChange("addr:housenumber", "", "42");
+  journal.Clear();
+  emo.SetJournal(std::move(journal));

  pugi::xml_document doc;
  GenerateUploadedFeature(mwmId, emo, doc);
  editor.m_storage->Save(doc);
  editor.LoadEdits();

-  TEST(editor.IsFeatureUploaded(emo.GetID().m_mwmId, emo.GetID().m_index), ());
+  TEST(editor.AreSomeFeatureChangesUploaded(emo.GetID().m_mwmId, emo.GetID().m_index), ());
 }

 void EditorTest::DeleteFeatureTest()
@@ -1309,9 +1315,9 @@ UNIT_CLASS_TEST(EditorTest, GetFeatureStatusTest)
  EditorTest::GetFeatureStatusTest();
 }

-UNIT_CLASS_TEST(EditorTest, IsFeatureUploadedTest)
+UNIT_CLASS_TEST(EditorTest, AreSomeFeatureChangesUploadedTest)
 {
-  EditorTest::IsFeatureUploadedTest();
+  EditorTest::AreSomeFeatureChangesUploadedTest();
 }

 UNIT_CLASS_TEST(EditorTest, DeleteFeatureTest)
--- a/libs/editor/editor_tests/osm_editor_test.hpp
+++ b/libs/editor/editor_tests/osm_editor_test.hpp
@@ -31,7 +31,7 @@ public:
  void SetIndexTest();
  void GetEditedFeatureStreetTest();
  void GetFeatureStatusTest();
-  void IsFeatureUploadedTest();
+  void AreSomeFeatureChangesUploadedTest();
  void DeleteFeatureTest();
  void ClearAllLocalEditsTest();
  void GetFeaturesByStatusTest();
--- a/libs/editor/feature_type_to_osm.cpp
+++ b/libs/editor/feature_type_to_osm.cpp
@@ -0,0 +1,166 @@
+#include "editor/feature_type_to_osm.hpp"
+
+#include "base/assert.hpp"
+#include "coding/reader_streambuf.hpp"
+#include "indexer/classificator.hpp"
+#include "platform/platform.hpp"
+
+#include <string>
+
+namespace editor
+{
+TypeToOSMTranslator::TypeToOSMTranslator(bool initialize)
+{
+  if (initialize)
+    LoadConfigFile();
+}
+
+void TypeToOSMTranslator::LoadConfigFile()
+{
+  Platform & p = GetPlatform();
+  std::unique_ptr<ModelReader> reader = p.GetReader("mapcss-mapping.csv");
+  ReaderStreamBuf buffer(std::move(reader));
+  std::istream s(&buffer);
+
+  LoadFromStream(s);
+}
+
+void TypeToOSMTranslator::LoadFromStream(std::istream & s)
+{
+  m_storage.clear();
+
+  std::string line;
+  while (s.good())
+  {
+    getline(s, line);
+    strings::Trim(line);
+
+    // skip empty lines, comments, deprecated and moved types
+    if (line.empty() || line.front() == '#' || line.starts_with("deprecated") || line.starts_with("moved") ||
+        line.back() != ';')
+      continue;
+
+    std::vector<std::string_view> const rowTokens = strings::Tokenize(line, ";");
+    if (rowTokens.size() < 2)
+    {
+      ASSERT(false, ("Invalid feature type definition:", line));
+      continue;
+    }
+
+    // Get internal feature type
+    std::vector<std::string_view> const featureTypeTokens = strings::Tokenize(rowTokens[0], "|");
+    uint32_t const type = classif().GetTypeByPathSafe(featureTypeTokens);
+    ASSERT(type != IndexAndTypeMapping::INVALID_TYPE, ("Feature with invalid type:", line));
+
+    if (rowTokens.size() == 2)
+    {
+      // Derive OSM tags from type name
+      ASSERT(featureTypeTokens.size() <= 2, ("OSM tags can not be inferred from name:", line));
+
+      OSMTag osmTag;
+
+      // e.g. "amenity-restaurant"
+      if (featureTypeTokens.size() >= 2)
+      {
+        osmTag.key = featureTypeTokens[0];
+        osmTag.value = featureTypeTokens[1];
+      }
+      // e.g. "building"
+      else if (featureTypeTokens.size() == 1)
+      {
+        osmTag.key = featureTypeTokens[0];
+        osmTag.value = "yes";
+      }
+
+      m_storage.insert({type, {osmTag}});
+    }
+    else
+    {
+      // OSM tags are listed in the feature type entry
+      std::vector<std::string_view> const osmTagTokens = strings::Tokenize(rowTokens[1], ",");
+
+      // First entry is the best practice way to tag a feature
+      std::string_view const osmTagList = osmTagTokens[0];
+
+      // Process OSM tag list (e.g. "[tourism=information][information=office]")
+      std::vector<OSMTag> osmTags;
+      size_t pos = 0;
+
+      while ((pos = osmTagList.find('[', pos)) != std::string::npos)
+      {
+        size_t end = osmTagList.find(']', pos);
+
+        if (end == std::string::npos)
+        {
+          ASSERT(false, ("Bracket not closed in OSM tag:", line));
+          break;
+        }
+
+        std::string_view keyValuePair = osmTagList.substr(pos + 1, end - pos - 1);
+
+        if (keyValuePair.empty())
+        {
+          ASSERT(false, ("Key value pair is empty:", line));
+          break;
+        }
+
+        size_t equalSign = keyValuePair.find('=');
+        if (equalSign != std::string::npos)
+        {
+          // Tags in key=value format
+          OSMTag osmTag;
+          osmTag.key = keyValuePair.substr(0, equalSign);
+          osmTag.value = keyValuePair.substr(equalSign + 1);
+
+          // mapcss-mapping.csv uses 'not' instead of 'no' as a workaround for the rendering engine
+          if (osmTag.value == "not")
+            osmTag.value = "no";
+
+          osmTags.push_back(osmTag);
+        }
+        else if (keyValuePair.front() == '!')
+        {
+          // Tags with "forbidden" selector '!' are skipped
+        }
+        else
+        {
+          // Tags with optional "mandatory" selector '?'
+          if (keyValuePair.back() == '?')
+            keyValuePair.remove_suffix(1);
+
+          OSMTag osmTag;
+          osmTag.key = keyValuePair;
+          osmTag.value = "yes";
+
+          osmTags.push_back(osmTag);
+        }
+
+        pos = end + 1;
+      }
+
+      ASSERT(!osmTags.empty(), ("No OSM tags found for feature:", line));
+
+      m_storage.insert({type, osmTags});
+    }
+  }
+}
+
+std::vector<OSMTag> const & TypeToOSMTranslator::OsmTagsFromType(uint32_t type) const
+{
+  auto it = m_storage.find(type);
+
+  if (it == m_storage.end())
+  {
+    ASSERT(false, ("OSM tags for type", type, "could not be found"));
+    return kEmptyResult;
+  }
+
+  return it->second;
+}
+
+TypeToOSMTranslator const & GetOSMTranslator()
+{
+  static TypeToOSMTranslator translator;
+  return translator;
+}
+}  // namespace editor
--- a/libs/editor/feature_type_to_osm.hpp
+++ b/libs/editor/feature_type_to_osm.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <unordered_map>
+#include <vector>
+
+namespace editor
+{
+
+struct OSMTag
+{
+  std::string key;
+  std::string value;
+};
+
+class TypeToOSMTranslator
+{
+public:
+  std::vector<OSMTag> static constexpr kEmptyResult = {};
+
+  TypeToOSMTranslator() : TypeToOSMTranslator(true) {}
+  explicit TypeToOSMTranslator(bool initialize);
+
+  void LoadConfigFile();
+  void LoadFromStream(std::istream & s);
+  std::vector<OSMTag> const & OsmTagsFromType(uint32_t type) const;
+
+  std::unordered_map<uint32_t, std::vector<OSMTag>> const & GetStorage() const { return m_storage; }
+
+private:
+  std::unordered_map<uint32_t, std::vector<OSMTag>> m_storage;
+};
+
+TypeToOSMTranslator const & GetOSMTranslator();
+
+}  // namespace editor
--- a/libs/editor/osm_editor.cpp
+++ b/libs/editor/osm_editor.cpp
@@ -279,10 +279,10 @@ FeatureStatus Editor::GetFeatureStatus(FeatureID const & fid) const
  return GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index);
 }

-bool Editor::IsFeatureUploaded(MwmId const & mwmId, uint32_t index) const
+bool Editor::AreSomeFeatureChangesUploaded(MwmId const & mwmId, uint32_t index) const
 {
  auto const features = m_features.Get();
-  return IsFeatureUploadedImpl(*features, mwmId, index);
+  return AreSomeFeatureChangesUploadedImpl(*features, mwmId, index);
 }

 void Editor::DeleteFeature(FeatureID const & fid)
@@ -425,7 +425,7 @@ bool Editor::RollBackChanges(FeatureID const & fid)
 {
  CHECK_THREAD_CHECKER(MainThreadChecker, (""));

-  if (IsFeatureUploaded(fid.m_mwmId, fid.m_index))
+  if (AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index))
    return false;

  return RemoveFeature(fid);
@@ -982,7 +982,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, featur
            "but was not found on the ground.\n";
    auto const features = m_features.Get();
    auto const isCreated = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index) == FeatureStatus::Created;
-    auto const createdAndUploaded = (isCreated && IsFeatureUploadedImpl(*features, fid.m_mwmId, fid.m_index));
+    auto const createdAndUploaded = (isCreated && AreSomeFeatureChangesUploadedImpl(*features, fid.m_mwmId, fid.m_index));
    CHECK(!isCreated || createdAndUploaded, ());

    if (createdAndUploaded)
@@ -1177,10 +1177,10 @@ FeatureStatus Editor::GetFeatureStatusImpl(FeaturesContainer const & features, M
  return featureInfo->m_status;
 }

-bool Editor::IsFeatureUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index)
+bool Editor::AreSomeFeatureChangesUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index)
 {
  auto const * info = GetFeatureTypeInfo(features, mwmId, index);
-  return info && info->m_uploadStatus == kUploaded;
+  return info && !info->m_object.GetJournal().GetJournalHistory().empty();
 }

 void Editor::UpdateXMLFeatureTags(editor::XMLFeature & feature, std::list<JournalEntry> const & journal,
--- a/libs/editor/osm_editor.hpp
+++ b/libs/editor/osm_editor.hpp
@@ -125,7 +125,7 @@ public:
  FeatureStatus GetFeatureStatus(FeatureID const & fid) const;

  /// @returns true if a feature was uploaded to osm.
-  bool IsFeatureUploaded(MwmId const & mwmId, uint32_t index) const;
+  bool AreSomeFeatureChangesUploaded(MwmId const & mwmId, uint32_t index) const;

  /// Marks feature as "deleted" from MwM file.
  void DeleteFeature(FeatureID const & fid);
@@ -240,7 +240,7 @@ private:

  static FeatureStatus GetFeatureStatusImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index);

-  static bool IsFeatureUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index);
+  static bool AreSomeFeatureChangesUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index);

  static void UpdateXMLFeatureTags(editor::XMLFeature & feature, std::list<JournalEntry> const & journal,
                                   ChangesetWrapper & changeset);
--- a/libs/editor/xml_feature.cpp
+++ b/libs/editor/xml_feature.cpp
@@ -1,4 +1,6 @@
 #include "editor/xml_feature.hpp"
+
+#include "editor/feature_type_to_osm.hpp"
 #include "editor/keys_to_remove.hpp"

 #include "indexer/classificator.hpp"
@@ -640,36 +642,16 @@ void XMLFeature::RemoveTag(string_view key)

 void XMLFeature::SetOSMTagsForType(uint32_t type)
 {
-  if (ftypes::IsRecyclingCentreChecker::Instance()(type))
-  {
-    SetTagValue("amenity", "recycling");
-    SetTagValue("recycling_type", "centre");
-  }
-  else if (ftypes::IsRecyclingContainerChecker::Instance()(type))
-  {
-    SetTagValue("amenity", "recycling");
-    SetTagValue("recycling_type", "container");
-  }
-  else if (ftypes::IsAddressChecker::Instance()(type))
+  if (ftypes::IsAddressChecker::Instance()(type))
  {
    // Addresses don't have a category tag
+    return;
  }
-  else
-  {
-    string const strType = classif().GetReadableObjectName(type);
-    strings::SimpleTokenizer iter(strType, "-");
-    string_view const k = *iter;

-    if (++iter)
-    {
-      // Main type is stored as "k=amenity v=restaurant"
-      SetTagValue(k, *iter);
-    }
-    else {
-      // Main type is stored as "k=building v=yes"
-      SetTagValue(k, kYes);
-    }
-  }
+  std::vector<OSMTag> const & osmTags = GetOSMTranslator().OsmTagsFromType(type);
+
+  for (auto const & osmTag : osmTags)
+    SetTagValue(osmTag.key, osmTag.value);
 }

 void XMLFeature::UpdateOSMTag(std::string_view key, std::string_view value)
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -126,6 +126,7 @@ copy_resources(
  patterns.txt
  transit_colors.txt
  types.txt
+  mapcss-mapping.csv
  World.mwm
  WorldCoasts.mwm
 )
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -8,6 +8,9 @@

 /* Begin PBXBuildFile section */
 		271DC2172EC60C0C00442D94 /* keys_to_remove.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */; };
+		27FDBF1B2EEEFC3F0045621D /* feature_type_to_osm_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27FDBF1A2EEEFC3F0045621D /* feature_type_to_osm_test.cpp */; };
+		27FDBF1E2EEEFC5A0045621D /* feature_type_to_osm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27FDBF1D2EEEFC5A0045621D /* feature_type_to_osm.cpp */; };
+		27FDBF1F2EEEFC5A0045621D /* feature_type_to_osm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 27FDBF1C2EEEFC5A0045621D /* feature_type_to_osm.hpp */; };
 		340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */; };
 		340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */; };
 		340DC8291C4E71E500EAA2CC /* changeset_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */; };
@@ -77,6 +80,10 @@
 /* Begin PBXFileReference section */
 		270C9C212E16AABF00ABA688 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = ../../libs/editor/module.modulemap; sourceTree = SOURCE_ROOT; };
 		271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = keys_to_remove.hpp; sourceTree = "<group>"; };
+		27998A9E2EEEFE09001EAFD0 /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "../../data/mapcss-mapping.csv"; sourceTree = SOURCE_ROOT; };
+		27FDBF1A2EEEFC3F0045621D /* feature_type_to_osm_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_type_to_osm_test.cpp; sourceTree = "<group>"; };
+		27FDBF1C2EEEFC5A0045621D /* feature_type_to_osm.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = feature_type_to_osm.hpp; sourceTree = "<group>"; };
+		27FDBF1D2EEEFC5A0045621D /* feature_type_to_osm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = feature_type_to_osm.cpp; sourceTree = "<group>"; };
 		340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_auth.cpp; sourceTree = "<group>"; };
 		340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_auth.hpp; sourceTree = "<group>"; };
 		340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changeset_wrapper.cpp; sourceTree = "<group>"; };
@@ -199,6 +206,7 @@
 			isa = PBXGroup;
 			children = (
 				3496AC041DC204B700C5DDBA /* editor.config */,
+				27998A9E2EEEFE09001EAFD0 /* mapcss-mapping.csv */,
 				270C9C212E16AABF00ABA688 /* module.modulemap */,
 				34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */,
 				34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */,
@@ -242,6 +250,8 @@
 				6715560420BEC331002BA3B4 /* edits_migration.hpp */,
 				3D052486200F62ED00F24998 /* feature_matcher.cpp */,
 				3D052485200F62ED00F24998 /* feature_matcher.hpp */,
+				27FDBF1D2EEEFC5A0045621D /* feature_type_to_osm.cpp */,
+				27FDBF1C2EEEFC5A0045621D /* feature_type_to_osm.hpp */,
 				271DC2162EC60C0C00442D94 /* keys_to_remove.hpp */,
 				6715565220BF0F86002BA3B4 /* new_feature_categories.cpp */,
 				6715565320BF0F87002BA3B4 /* new_feature_categories.hpp */,
@@ -270,6 +280,7 @@
 				3496ABD21DC2034900C5DDBA /* editor_config_test.cpp */,
 				3496ABD31DC2034900C5DDBA /* editor_notes_test.cpp */,
 				3D052489200F630000F24998 /* feature_matcher_test.cpp */,
+				27FDBF1A2EEEFC3F0045621D /* feature_type_to_osm_test.cpp */,
 				3D05248A200F630000F24998 /* match_by_geometry_test.cpp */,
 				6715560920BEF0A4002BA3B4 /* new_feature_categories_test.cpp */,
 				3496ABD41DC2034900C5DDBA /* opening_hours_ui_test.cpp */,
@@ -338,6 +349,7 @@
 				34527C521C89B1770015050E /* editor_config.hpp in Headers */,
 				675B562820D2706000A521D2 /* editable_feature_source.hpp in Headers */,
 				6715565520BF0F87002BA3B4 /* new_feature_categories.hpp in Headers */,
+				27FDBF1F2EEEFC5A0045621D /* feature_type_to_osm.hpp in Headers */,
 				6715560820BEC332002BA3B4 /* edits_migration.hpp in Headers */,
 				3D052487200F62EE00F24998 /* feature_matcher.hpp in Headers */,
 				271DC2172EC60C0C00442D94 /* keys_to_remove.hpp in Headers */,
@@ -470,6 +482,7 @@
 				340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */,
 				6715560720BEC332002BA3B4 /* osm_editor.cpp in Sources */,
 				3D052488200F62EE00F24998 /* feature_matcher.cpp in Sources */,
+				27FDBF1E2EEEFC5A0045621D /* feature_type_to_osm.cpp in Sources */,
 				3D489BEF1D4F67E10052AA38 /* editor_storage.cpp in Sources */,
 				3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */,
 				340DC8291C4E71E500EAA2CC /* changeset_wrapper.cpp in Sources */,
@@ -488,6 +501,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3496ABE11DC2035800C5DDBA /* config_loader_test.cpp in Sources */,
+				27FDBF1B2EEEFC3F0045621D /* feature_type_to_osm_test.cpp in Sources */,
 				671555E820BDC5D3002BA3B4 /* osm_editor_test.cpp in Sources */,
 				3496ABE21DC2035800C5DDBA /* editor_config_test.cpp in Sources */,
 				FACB76B826B89DF700810C9C /* feature_matcher_test.cpp in Sources */,
Author	SHA1	Message	Date
x7z4w	e4275cdd3c	[search] Add synonyms Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-24 17:32:23 +01:00
Chris H. Meyer	4ef9395442	[desktop] Update Fedora dependencies (#2957 ) Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-committed-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2025-12-24 14:19:00 +01:00
Yannik Bloscheck	30cf2b5770	[styles] Fix wrong filename for car pooling parking Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-22 12:24:45 +01:00
Yannik Bloscheck	6aed26c48e	[ios] Extend opening hours button in editor Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-22 12:04:00 +01:00
Jean-Baptiste	dad91b82a6	[android] Remove custom properties in M3 styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-21 19:04:59 +01:00
Jean-Baptiste	7024aace6f	[android] Remove ToolbarButton styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-21 10:40:54 +01:00
Jean-Baptiste	6291133a69	[android] Remove grey background on some views Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-21 10:39:38 +01:00
Jean-Baptiste	1c5121d447	[android] Remove tab time picker view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-20 14:23:24 +01:00
Yannik Bloscheck	4398e492b8	[iOS] Added new editor files to their Xcode projects Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-12-19 19:45:31 +01:00
map-per	1907e039e3	[editor] Support complex POI types in the editor (#2855 ) Signed-off-by: map-per <map-per@gmx.de>	2025-12-19 19:45:31 +01:00
map-per	26bad5dffb	[editor] 'discard' and 'delete' buttons only available when nothing was uploaded to OSM Signed-off-by: map-per <map-per@gmx.de>	2025-12-19 17:37:36 +01:00