December R3 maps-only release notes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[fdroid] Release version 2025.12.19-11
2025-12-27 16:33:38 +00:00 · 2025-12-27 20:56:50 +07:00 · 2025-12-19 22:44:47 +07:00
29 changed files with 185 additions and 674 deletions
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +0,0 @@
-• OpenStreetMap Daten vom 17. Dezember
-• Map download server nun wählbar
-• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
-• Vermeidung von Parkplatzwegen im Routing
-• Neuer Zoombutton
-• Verbesserte Französchische Suchsynonme
-• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
-Mehr auf codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,8 +1,4 @@
-• OpenStreetMap data as of December 17
-• Make map download server configurable
-• Added info about outdated maps and an update button to the selected place info card
-• Avoid using parking aisles for routing
-• Changed shape of zoom buttons
-• Improved French search synonyms
-• OSM editor: check length limit for OSM tags in value validation
-More details on codeberg.org/comaps/comaps/releases
+This is a maps-only update just to keep your maps fresh!
+• OpenStreetMap data as of December 27
+
+Please see previous releases' changes on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,8 +0,0 @@
-• Données OpenStreetMap du 17 décembre
-• Serveur de téléchargement de cartes configurable
-• Ajout d'un message d'avertissement pour les cartes trop anciennes
-• Évitement des allées de parking dans les itinéraires
-• Mise à jour de l'apparence des boutons de zooms
-• Amélioration des synonymes de recherche en français
-• Editeur OSM: vérification de la taille limite des tags OSM
-Plus d'informations sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,8 +0,0 @@
-• Dados OSM de 17/12
-• Servidor de download de mapas configurável
-• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
-• Evita o uso de corredores de estacionamento para roteamento
-• Formato dos botões de zoom alterado
-• Sinônimos de busca em francês aprimorados
-• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
-Mais detalhes em codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +0,0 @@
-• Карты OpenStreetMap от 17 декабря
-• Возможность настройки сервера для скачивания карт
-• Добавлена информация об устаревании карт и кнопка обновления (при выборе места на карте)
-• Парковочные проезды больше не используются для транзитной маршрутизации
-• Изменены кнопки масштабирования карты
-• На карту добавлены ирригационные гидранты
-• Редактор OSM: проверка максимальной длины OSM тегов
-Подробнее на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.12.19-11-FDroid+25121911
--- 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.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
    {
      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.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
    {
      placeDoesntExist();
      return;
--- a/android/sdk/src/main/assets/mapcss-mapping.csv
+++ b/android/sdk/src/main/assets/mapcss-mapping.csv
@@ -1 +0,0 @@
-../../../../../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_nativeAreSomeFeatureChangesUploaded(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
 {
-  return osm::Editor::Instance().AreSomeFeatureChangesUploaded(g_editableMapObject.GetID().m_mwmId,
-                                                               g_editableMapObject.GetID().m_index);
+  return osm::Editor::Instance().IsFeatureUploaded(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 nativeAreSomeFeatureChangesUploaded();
+  public static native boolean nativeIsMapObjectUploaded();
 }
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -179,7 +179,7 @@
    <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
    <string name="type.amenity.shelter.basic_hut">Bivouac Hut</string>
    <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Lean-to Sleep Shelter</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Shelter</string>
    <string name="type.amenity.public_bath">Public Bath</string>
    <string name="type.amenity.shower">Shower</string>
    <string name="type.amenity.stripclub">Stripclub</string>
@@ -198,7 +198,7 @@
    <string name="type.amenity.vending_machine.food">Food Dispenser</string>
    <string name="type.amenity.vending_machine.newspapers">Newspaper Dispenser</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parking Meter</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Public Transport Ticket Machine</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Ticket Machine</string>
    <string name="type.amenity.vending_machine.sweets">Sweets Dispenser</string>
    <string name="type.amenity.vending_machine.excrement_bags">Excrement Bags Dispenser</string>
    <string name="type.amenity.parcel_locker">Parcel Locker</string>
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -81,9 +81,6 @@
 "amenity-townhall": "3Town Hall|townhall|city hall|guildhall|village hall|4municipal hall|civic centre",
 "tourism-attraction|@category_tourism": "4Attraction|U+1F3A0|U+1F3A1|U+1F3A2|U+1F3AA",
 "tourism-artwork": "3Artwork|U+1F3A8",
-"tourism-artwork-sculpture": "Sculpture|Artwork|U+1F3A8",
-"tourism-artwork-statue": "Statue|Artwork|U+1F3A8",
-"tourism-artwork-painting": "Painting|Artwork|U+1F3A8",
 "tourism-viewpoint|@category_tourism": "4Viewpoint|Vista",
 "tourism-information": "4Tourist Information|4information|U+1F481",
 "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|picnic|Barbecue Grill|Picnic Table|bbq|Barbec",
@@ -200,7 +197,7 @@
 "amenity-school": "3School|U+1F392|U+1F3EB",
 "amenity-shelter": "4Shelter|refuge",
 "amenity-shelter-basic_hut": "basic hut|3Bivouac Hut|Bivvy|Bothy|Hut",
-"amenity-shelter-lean_to": "3Lean-to Sleep Shelter|4Shelter|Refuge|lean shelter|Lean-to Shelter",
+"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge|lean shelter|shelter",
 "amenity-stripclub": "Stripclub|strip club",
 "amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone",
 "@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet",
@@ -368,21 +365,20 @@
 "shop-pet|@shop": "3Pet",
 "tourism-zoo|@category_tourism|@category_children": "2Zoo",
 "attraction-animal": "Animal Enclosure",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourist Office|Tourism office|6Ranger station|Information",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station|Information",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourism office|6Ranger station",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station",
 "amenity-community_centre": "4Community centre",
 "amenity-compressed_air": "6Compressed air",
 "amenity-courthouse": "4Courthouse",
-"amenity-vending_machine": "Vending Machine",
-"amenity-vending_machine-cigarettes": "4Cigarette dispenser|Vending Machine",
-"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee|Vending Machine",
-"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat|Vending Machine",
-"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages|Vending Machine",
-"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks|Vending Machine",
+"amenity-vending_machine-cigarettes": "4Cigarette dispenser",
+"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee",
+"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat",
+"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages",
+"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks",
 "amenity-vending_machine-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "4Public Transport Ticket Machine|6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing|Vending Machine",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing",
 "amenity-vending_machine-newspapers": "4Newspaper Dispenser|Newspapers",
-"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies|Vending Machine",
+"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies",
 "amenity-vending_machine-excrement_bags": "5Excrement Bags Dispenser|4Poop Bags|3Dog Poop Bags|Animal Waste",
 "amenity-parcel_locker|@category_post": "4Parcel Locker|4Parcel Pickup",
 "shop-outpost": "4Pickup Point|4Parcel Pickup",
@@ -402,7 +398,6 @@
 "tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet",
 "tourism-information-board": "Information Board",
 "tourism-information-map": "Tourist map|map|4Information",
-"tourism-information-guidepost": "Guidepost",
 "aerialway-station": "Aerialway Station|5Cable car station",
 "aeroway-helipad": "4Helipad",
 "barrier-border_control": "4Border Control",
@@ -504,7 +499,6 @@
 "leisure-track": "Track",
 "leisure-bandstand": "5Bandstand",
 "power-plant": "Power Plant",
-"power-generator-wind": "Wind Generator",
 "shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House",
 "shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector",
 "man_made-cairn": "4Cairn",
--- a/data/editor.config
+++ b/data/editor.config
@@ -9,7 +9,7 @@
  -->
  <!-- TODO: grouping like in <type id="shop-bag" group="shop"> is not currently used,
       see https://github.com/organicmaps/organicmaps/pull/7678#issuecomment-2017488467
-  -->
+   -->
  <editor>
    <!-- TODO: disabling is not implemented, remove? see a todo in Editor::GetEditableProperties() -->
    <disable everywhere="no">
@@ -122,10 +122,10 @@
        </value>
      </field>
      <!-- Uncomment this and other ele fields when the code supports it. -->
-      <!-- <field name="ele"> -->
-      <!--   <tag k="ele" /> -->
-      <!--   <value type="number" /> -->
-      <!-- </field> -->
+<!--      <field name="ele">-->
+<!--        <tag k="ele" />-->
+<!--        <value type="number" />-->
+<!--      </field>-->
      <!-- Skipping FMD_TURN_LANES. -->
      <field name="email">
        <tag k="email" />
@@ -135,9 +135,9 @@
        <tag k="addr:postcode" />
      </field>
      <!-- Uncomment this and other wiki fields when the code supports it. -->
-      <!-- <field name="wikipedia" editable="no"> -->
-      <!--   <tag k="wikipedia" /> -->
-      <!-- </field> -->
+<!--      <field name="wikipedia" editable="no">-->
+<!--        <tag k="wikipedia" />-->
+<!--      </field>-->
      <!-- Skipping FMD_MAXSPEED. -->
      <field name="flats">
        <tag k="addr:flats" />
@@ -175,10 +175,10 @@
      </field>
      <!-- Field groups. -->
      <field_group name="charge_sockets">
-        <field_ref name="socket_type1_count" />
-        <field_ref name="socket_type1_output" />
-        <field_ref name="socket_type2_count" />
-        <field_ref name="socket_type2_output" />
+	<field_ref name="socket_type1_count" />
+	<field_ref name="socket_type1_output" />
+	<field_ref name="socket_type2_count" />
+	<field_ref name="socket_type2_output" />
      </field_group>
      <field_group name="address">
        <field_ref name="street" />
@@ -236,11 +236,11 @@
    <types>
      <type id="aeroway-aerodrome" editable="no">
        <include group="poi" />
-        <!-- <include field="ele" /> -->
+<!--        <include field="ele" />-->
      </type>
      <type id="aeroway-airport" editable="no">
        <include group="poi" />
-        <!-- <include field="ele" /> -->
+<!--        <include field="ele" />-->
      </type>
      <type id="amenity-atm" group="banking" priority="low">
        <include field="opening_hours" />
@@ -394,25 +394,32 @@
      <type id="amenity-pharmacy" group="shop">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-buddhist">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-buddhist" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-christian">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-christian" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-hindu">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-hindu" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-jewish">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-jewish" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-muslim">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-muslim" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-shinto">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-shinto" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-place_of_worship-taoist">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-taoist" can_add="no">
        <include group="poi_internet" />
      </type>
      <type id="amenity-place_of_worship">
@@ -511,18 +518,8 @@
      <type id="amenity-animal_shelter">
        <include group="poi_internet" />
      </type>
-      <type id="amenity-charging_station-motorcar-small">
-        <include group="charge_sockets" />
-        <include field="opening_hours" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-charging_station-bicycle">
-        <include group="charge_sockets" />
-        <include field="opening_hours" />
-        <include field="operator" />
-      </type>
      <type id="amenity-charging_station">
-        <include group="charge_sockets" />
+	<include group="charge_sockets" />
        <include field="opening_hours" />
        <include field="operator" />
      </type>
@@ -635,23 +632,23 @@
      </type>
      <type id="historic-archaeological_site" group="historic">
        <include group="poi" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="historic-castle" group="historic">
        <include group="poi" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="historic-memorial" group="historic">
        <include field="name" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="historic-monument" group="historic">
        <include field="name" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="historic-ruins" group="historic">
        <include field="name" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="historic-aircraft" group="historic">
        <include field="name" />
@@ -699,7 +696,7 @@
      <!-- Not addable as mapping as a node is uncommon, also ambiguous with amenity-grave_yard -->
      <type id="landuse-cemetery" can_add="no">
        <include group="poi" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <!-- Not addable as mapping as a node is uncommon -->
      <type id="leisure-garden" can_add="no">
@@ -708,9 +705,6 @@
      <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>
@@ -720,7 +714,7 @@
      <!-- Not addable as mapping as a node is uncommon -->
      <type id="leisure-stadium" can_add="no">
        <include group="poi_internet" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <!-- Not addable as mapping as a node is uncommon -->
      <type id="leisure-swimming_pool" can_add="no">
@@ -729,7 +723,7 @@
      </type>
      <type id="natural-cave_entrance" group="historic">
        <include field="name" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="natural-geyser">
        <include field="name" />
@@ -739,8 +733,8 @@
      </type>
      <type id="natural-peak">
        <include field="name" />
-        <!-- <include field="wikipedia" /> -->
-        <!-- <include field="ele" /> -->
+<!--        <include field="wikipedia" />-->
+<!--        <include field="ele" />-->
      </type>
      <type id="natural-spring">
        <include field="name" />
@@ -748,9 +742,10 @@
      <type id="waterway-waterfall">
        <include field="name" />
        <include field="height" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
-      <type id="office" group="office">
+      <!-- Too generic to be added -->
+      <type id="office" can_add="no">
        <include group="poi_internet" />
      </type>
      <type id="office-company" group="office">
@@ -780,7 +775,7 @@
      <!-- Not addable because ambiguous with landuse=farmyard -->
      <type id="place-farm" can_add="no">
        <include group="poi_internet" />
-        <!-- <include field="wikipedia" /> -->
+<!--        <include field="wikipedia" />-->
      </type>

      <!-- Do not allow to edit settlements.
@@ -847,12 +842,6 @@
      <type id="shop-bathroom_furnishing" group="shop">
        <include group="poi_internet" />
      </type>
-      <type id="shop-beauty-nails">
-        <include group="poi_internet" />
-      </type>
-      <type id="shop-beauty-day_spa">
-        <include group="poi_internet" />
-      </type>
      <type id="shop-beauty">
        <include group="poi_internet" />
      </type>
@@ -1113,7 +1102,7 @@
      </type>
      <type id="tourism-alpine_hut" group="accomodation">
        <include group="poi_internet" />
-        <!-- <include field="ele" /> -->
+<!--        <include field="ele" />-->
        <include field="opening_hours" />
        <include field="website" />
      </type>
@@ -1123,22 +1112,12 @@
      <type id="tourism-aquarium">
        <include group="poi_internet" />
      </type>
-      <type id="tourism-artwork-sculpture">
-        <include field="name" />
-      </type>
-      <type id="tourism-artwork-statue">
-        <include field="name" />
-      </type>
-      <type id="tourism-artwork-painting">
-        <include field="name" />
-      </type>
      <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" /> -->
+<!--        <include field="wikipedia" />-->
      </type>
      <type id="attraction-animal">
        <include field="name" />
@@ -1165,22 +1144,26 @@
        <include group="poi_internet" />
        <include field="self_service" />
      </type>
-      <type id="tourism-information-office">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-office" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="tourism-information-visitor_centre">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-visitor_centre" can_add="no">
        <include group="poi_internet" />
      </type>
-      <type id="tourism-information-board">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-board" can_add="no">
        <include field="name" />
      </type>
-      <type id="tourism-information-map">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-map" can_add="no">
        <include field="name" />
      </type>
-      <type id="tourism-information-guidepost">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-guidepost" can_add="no">
      </type>
-      <!-- Too generic to add -->
-      <type id="tourism-information" can_add="no">
+      <type id="tourism-information">
        <include group="poi" />
      </type>
      <type id="amenity-ranger_station">
@@ -1202,12 +1185,6 @@
      <type id="amenity-compressed_air" />
      <type id="amenity-bbq" />
      <type id="leisure-slipway" />
-      <type id="amenity-shelter-basic_hut">
-        <include field="name" />
-      </type>
-      <type id="amenity-shelter-lean_to">
-        <include field="name" />
-      </type>
      <type id="amenity-shelter">
        <include field="name" />
      </type>
@@ -1405,9 +1382,6 @@
      <type id="leisure-indoor_play">
        <include group="poi_internet" />
      </type>
-      <type id="leisure-fitness_centre-sport-yoga">
-        <include group="poi_internet" />
-      </type>
      <type id="leisure-fitness_centre">
        <include group="poi_internet" />
      </type>
@@ -1432,7 +1406,7 @@
      <type id="man_made-petroleum_well">
        <include field="name" />
        <include field="operator" />
-        <!-- <include field="ele" /> -->
+<!--        <include field="ele" />-->
      </type>
      <type id="man_made-water_well">
        <include field="name" />
@@ -1459,14 +1433,10 @@
      <type id="man_made-lighthouse">
        <include field="name" />
      </type>
-      <type id="man_made-mast-communication" />
      <type id="man_made-mast" />
      <type id="man_made-survey_point">
        <include field="name" />
      </type>
-      <type id="power-generator-wind">
-        <include field="operator" />
-      </type>
      <type id="man_made-windmill">
        <include field="name" />
      </type>
@@ -1539,50 +1509,67 @@
      <type id="leisure-escape_game">
        <include group="poi_internet" />
      </type>
-      <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>
+      <!-- Uncomment this after our editor core supports complex types
      <type id="amenity-vending_machine-cigarettes">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="cigarettes" />
        <include field="operator" />
-        <include field="level" />
-      </type>
-      <type id="amenity-vending_machine-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">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="coffee" />
        <include field="operator" />
-        <include field="level" />
      </type>
      <type id="amenity-vending_machine-condoms">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="condoms" />
+        <include field="operator" />
+      </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-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="amenity-vending_machine">
-        <include field="operator" />
-        <include field="level" />
+      <type id="shop-car_repair-tyres">
+        <tag k="shop" v="car_repair" />
+        <tag k="service" v="tyres" />
+        <include group="poi_internet" />
      </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" />
@@ -1594,6 +1581,9 @@
      <type id="building-address" can_add="yes">
        <include group="address" />
      </type>
+      <!-- Uncomment this after a map style is added
+      <type id="man_made-surveillance">
+      </type-->
      <type id="tourism-theme_park">
        <include group="poi_internet" />
      </type>
--- 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, best practice tagging for OSM editor is listed first
+# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas
 # - "x" for a deprecated type or an empty cell otherwise
 # - primary title tag (usually "name")
 # - secondary title tag (usually "int_name")
@@ -101,7 +101,7 @@ natural|wetland;33;
 deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
 # ~1M usages.
 power|minor_line;[power=minor_line][!location];;;;35;
-amenity|school;[amenity=school][education=school],[amenity=school],[education=school];;name;int_name;36;
+amenity|school;[amenity=school],[education=school];;name;int_name;36;
 # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
 highway|cycleway;37;
 # ~16M usages.
@@ -202,7 +202,7 @@ landuse|commercial;111;
 moved:railway|station:05.2024;112;railway|station
 deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path
 # ~200k usages.
-amenity|hospital;[amenity=hospital][healthcare=hospital],[amenity=hospital],[healthcare=hospital];;name;int_name;114;
+amenity|hospital;114;
 # TODO: merge with "intermittent".
 waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
 highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
@@ -210,7 +210,7 @@ highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
 amenity|post_office;117;
 # ~230k usages.
 landuse|quarry;118;
-amenity|pharmacy;[amenity=pharmacy][healthcare=pharmacy],[amenity=pharmacy],[healthcare=pharmacy];;name;int_name;119;
+amenity|pharmacy;119;
 man_made|pier;120;
 # ~220k usages.
 highway|motorway_junction;121;
@@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu
 landuse|recreation_ground;173;
 landuse|village_green;174;
 amenity|drinking_water;175;
-amenity|university;[amenity=university][education=university],[amenity=university],[education=university];;name;int_name;176;
+amenity|university;[amenity=university],[education=university];;name;int_name;176;
 highway|secondary_link;177;
 power|substation;178;
 railway|tram_stop;179;
@@ -309,7 +309,7 @@ power|portal;204;
 # Marsh 500K usages, wet_meadow 160K
 natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
 leisure|stadium;206;
-amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;name;int_name;207;
+amenity|doctors;207;
 railway|disused;208;
 aeroway|runway;209;
 railway|halt;210;
@@ -327,7 +327,7 @@ sport|swimming;220;
 leisure|track;221;
 sport|skateboard;222;
 barrier|retaining_wall;223;
-amenity|college;[amenity=college][education=college],[amenity=college],[education=college];;name;int_name;224;
+amenity|college;[amenity=college],[education=college];;name;int_name;224;
 sport|baseball;225;
 highway|service|area;[highway=service][area?];;name;int_name;226;
 highway|residential|area;[highway=residential][area?];;name;int_name;227;
@@ -625,9 +625,9 @@ toilets|yes;502;
 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],[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
-amenity|flight_school;[amenity=flight_school][education=flight_school],[amenity=flight_school],[education=flight_school];;name;int_name;507;
-amenity|prep_school;[amenity=prep_school][education=prep_school],[amenity=prep_school],[education=prep_school];;name;int_name;508;
+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|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
 social_facility|food_bank;511;
@@ -1160,8 +1160,8 @@ railway|subway_entrance|madrid;[railway=subway_entrance][city=madrid];;name;int_
 railway|subway_entrance|roma;[railway=subway_entrance][city=roma];;name;int_name;1033;
 railway|subway_entrance|spb;[railway=subway_entrance][city=spb];;name;int_name;1034;
 aerialway|drag_lift;1035;
-amenity|dentist;[amenity=dentist][healthcare=dentist],[amenity=dentist],[healthcare=dentist];;name;int_name;1036;
-amenity|clinic;[amenity=clinic][healthcare=clinic],[amenity=clinic],[healthcare=clinic];;name;int_name;1037;
+amenity|dentist;1036;
+amenity|clinic;1037;
 barrier|entrance;1038;
 barrier|border_control;1039;
 shop|laundry;1040;
@@ -1257,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n
 amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130;
 amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131;
 leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132;
-amenity|music_school;[amenity=music_school][education=music_school],[amenity=music_school],[education=music_school];;name;int_name;1133;
-amenity|language_school;[amenity=language_school][education=language_school],[amenity=language_school],[education=language_school];;name;int_name;1134;
+amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133;
+amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134;
 historic|city_gate;1135;
 sport|padel;1136;
 sport|futsal;1137;
@@ -1285,7 +1285,7 @@ shop|charity;1157;
 hwtag|toll;1158;
 amenity|arts_centre;1159;
 amenity|biergarten;1160;
-amenity|driving_school;[amenity=driving_school][education=driving_school],[amenity=driving_school],[education=driving_school];;name;int_name;1161;
+amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161;
 amenity|food_court;1162;
 amenity|ice_cream;1163;
 amenity|internet_cafe;1164;
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -189,7 +189,7 @@
 "type.amenity.shelter.basic_hut" = "Bivouac Hut";

 /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */
-"type.amenity.shelter.lean_to" = "Lean-to Sleep Shelter";
+"type.amenity.shelter.lean_to" = "Lean-to Shelter";
 "type.amenity.public_bath" = "Public Bath";
 "type.amenity.shower" = "Shower";
 "type.amenity.stripclub" = "Stripclub";
@@ -208,7 +208,7 @@
 "type.amenity.vending_machine.food" = "Food Dispenser";
 "type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
 "type.amenity.vending_machine.parking_tickets" = "Parking Meter";
-"type.amenity.vending_machine.public_transport_tickets" = "Public Transport Ticket Machine";
+"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 "type.amenity.vending_machine.sweets" = "Sweets Dispenser";
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 "type.amenity.parcel_locker" = "Parcel Locker";
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -40,7 +40,6 @@
 		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 */; };
@@ -790,7 +789,6 @@
 		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>"; };
@@ -3950,7 +3948,6 @@
 				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 */,
@@ -4204,7 +4201,6 @@
 				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().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(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().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
  NSIndexPath * ip = [self.tableView indexPathForCell:cell];
  [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade];

--- a/libs/editor/CMakeLists.txt
+++ b/libs/editor/CMakeLists.txt
@@ -18,8 +18,6 @@ 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,7 +5,6 @@ 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
@@ -1,224 +0,0 @@
-#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::AreSomeFeatureChangesUploadedTest()
+void EditorTest::IsFeatureUploadedTest()
 {
  auto & editor = osm::Editor::Instance();

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

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

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

-  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));
+  TEST(!editor.IsFeatureUploaded(emo.GetID().m_mwmId, emo.GetID().m_index), ());

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

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

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

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

 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 AreSomeFeatureChangesUploadedTest();
+  void IsFeatureUploadedTest();
  void DeleteFeatureTest();
  void ClearAllLocalEditsTest();
  void GetFeaturesByStatusTest();
--- a/libs/editor/feature_type_to_osm.cpp
+++ b/libs/editor/feature_type_to_osm.cpp
@@ -1,166 +0,0 @@
-#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
@@ -1,36 +0,0 @@
-#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::AreSomeFeatureChangesUploaded(MwmId const & mwmId, uint32_t index) const
+bool Editor::IsFeatureUploaded(MwmId const & mwmId, uint32_t index) const
 {
  auto const features = m_features.Get();
-  return AreSomeFeatureChangesUploadedImpl(*features, mwmId, index);
+  return IsFeatureUploadedImpl(*features, mwmId, index);
 }

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

-  if (AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index))
+  if (IsFeatureUploaded(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 && AreSomeFeatureChangesUploadedImpl(*features, fid.m_mwmId, fid.m_index));
+    auto const createdAndUploaded = (isCreated && IsFeatureUploadedImpl(*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::AreSomeFeatureChangesUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index)
+bool Editor::IsFeatureUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index)
 {
  auto const * info = GetFeatureTypeInfo(features, mwmId, index);
-  return info && !info->m_object.GetJournal().GetJournalHistory().empty();
+  return info && info->m_uploadStatus == kUploaded;
 }

 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 AreSomeFeatureChangesUploaded(MwmId const & mwmId, uint32_t index) const;
+  bool IsFeatureUploaded(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 AreSomeFeatureChangesUploadedImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index);
+  static bool IsFeatureUploadedImpl(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,6 +1,4 @@
 #include "editor/xml_feature.hpp"
-
-#include "editor/feature_type_to_osm.hpp"
 #include "editor/keys_to_remove.hpp"

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

 void XMLFeature::SetOSMTagsForType(uint32_t type)
 {
-  if (ftypes::IsAddressChecker::Instance()(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))
  {
    // Addresses don't have a category tag
-    return;
  }
+  else
+  {
+    string const strType = classif().GetReadableObjectName(type);
+    strings::SimpleTokenizer iter(strType, "-");
+    string_view const k = *iter;

-  std::vector<OSMTag> const & osmTags = GetOSMTranslator().OsmTagsFromType(type);
-
-  for (auto const & osmTag : osmTags)
-    SetTagValue(osmTag.key, osmTag.value);
+    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);
+    }
+  }
 }

 void XMLFeature::UpdateOSMTag(std::string_view key, std::string_view value)
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -126,7 +126,6 @@ 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,9 +8,6 @@

 /* 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 */; };
@@ -80,10 +77,6 @@
 /* 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>"; };
@@ -206,7 +199,6 @@
 			isa = PBXGroup;
 			children = (
 				3496AC041DC204B700C5DDBA /* editor.config */,
-				27998A9E2EEEFE09001EAFD0 /* mapcss-mapping.csv */,
 				270C9C212E16AABF00ABA688 /* module.modulemap */,
 				34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */,
 				34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */,
@@ -250,8 +242,6 @@
 				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 */,
@@ -280,7 +270,6 @@
 				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 */,
@@ -349,7 +338,6 @@
 				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 */,
@@ -482,7 +470,6 @@
 				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 */,
@@ -501,7 +488,6 @@
 			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
Konstantin Pastbin	72433c6754	December R3 maps-only release notes Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-12-27 20:56:50 +07:00
Konstantin Pastbin	7641ea3c74	[fdroid] Release version 2025.12.19-11 Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-12-19 22:44:47 +07:00