[editor] More reliable check for deprecated and moved features

Signed-off-by: map-per <map-per@gmx.de>
[editor] Add more complex types and support healthcare and education
2025-12-28 17:03:38 +00:00 · 2025-12-28 17:59:10 +01:00 · 2025-12-28 16:48:57 +01:00 · 2025-12-27 21:53:01 +01:00 · 2025-12-26 16:21:53 +01:00 · 2025-12-26 14:56:15 +01:00
45 changed files with 255 additions and 391 deletions
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+## Reporting Vulnerabilities
+You can report a security vulnerability by creating an issue or send mail to security@comaps.app
+
+## Verifying Fingerprints
+
+To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
+```
+SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
+SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
+MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
+```
+
+To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
+```
+app.comaps
+48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
+```
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -84,10 +84,10 @@
    <item name="transitRulerBackground">@color/white_4</item>
    <item name="transitStepDivider">@drawable/dot_divider</item>
    <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textAppearanceSmall">@style/MwmTextAppearance.Body4</item>
+    <item name="android:textAppearanceMedium">@style/MwmTextAppearance.Body2</item>
+    <item name="android:textAppearanceLarge">@style/MwmTextAppearance.Body1</item>
    <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
    <item name="elevationProfilePropIconTint">@color/white_secondary</item>
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -27,9 +27,9 @@
    <item>type2_combo</item>
    <item>nacs</item>
    <item>chademo</item>
-    <item>type1</item>
-    <item>type2_cable</item>
    <item>type2</item>
+    <item>type2_cable</item>
+    <item>type1</item>
    <item>schuko</item>
    <item>unknown</item>
  </string-array>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -308,26 +308,6 @@
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
  </style>

-  <style name="TextAppearance" parent="MwmTextAppearance.Body3"/>
-
-  <style name="TextAppearance.Small" parent="MwmTextAppearance.Body4"/>
-
-  <style name="TextAppearance.Medium" parent="MwmTextAppearance.Body2"/>
-
-  <style name="TextAppearance.Large" parent="MwmTextAppearance.Body1">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-  </style>
-
-  <style name="TextAppearance.Inverse" parent="MwmTextAppearance.Body3.Light"/>
-
-  <style name="TextAppearance.Small.Inverse" parent="MwmTextAppearance.Body4.Light"/>
-
-  <style name="TextAppearance.Medium.Inverse" parent="MwmTextAppearance.Body2.Light"/>
-
-  <style name="TextAppearance.Large.Inverse" parent="MwmTextAppearance.Body1.Light">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-  </style>
-
  <style
    name="MwmTheme.BottomSheetDialog"
    parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -85,14 +85,14 @@
    <item name="transitRulerBackground">@color/black_4</item>
    <item name="transitStepDivider">@drawable/dot_divider</item>
    <item name="accentColorSelector">@color/accent_color_selector</item>
-    <item name="android:textAppearance">@style/TextAppearance</item>
-    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
-    <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
-    <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
-    <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textAppearanceSmall">@style/MwmTextAppearance.Body4</item>
+    <item name="android:textAppearanceMedium">@style/MwmTextAppearance.Body2</item>
+    <item name="android:textAppearanceLarge">@style/MwmTextAppearance.Body1</item>
+    <item name="android:textAppearanceInverse">@style/MwmTextAppearance.Body3.Light</item>
+    <item name="android:textAppearanceSmallInverse">@style/MwmTextAppearance.Body4.Light</item>
+    <item name="android:textAppearanceMediumInverse">@style/MwmTextAppearance.Body2.Light</item>
+    <item name="android:textAppearanceLargeInverse">@style/MwmTextAppearance.Body1.Light</item>
    <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
    <item name="elevationProfilePropIconTint">@color/black_secondary</item>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -42,11 +42,10 @@
    <string name="type.amenity.gambling">Glücksspiel</string>
    <string name="type.leisure.adult_gaming_centre">Spielhalle für Erwachsene</string>
    <string name="type.leisure.amusement_arcade">Spielhalle für Unterhaltungsspiele</string>
-    <string name="type.amenity.charging_station.general">Ladestation</string>
-    <string name="type.amenity.charging_station.bicycle">Fahrräder</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorräder</string>
-    <string name="type.amenity.charging_station.motorcar">Autos</string>
-    <string name="type.amenity.charging_station.small">Begrenzte Kapazität</string>
+    <string name="type.amenity.charging_station">Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
+    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
+    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</string>
    <string name="type.amenity.childcare">Kindertagesstätte</string>
    <string name="type.amenity.cinema">Kino</string>
    <string name="type.leisure.bowling_alley">Bowlingbahn</string>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -52,11 +52,10 @@
    <string name="type.amenity.gambling">Gambling</string>
    <string name="type.leisure.adult_gaming_centre">Adult Gaming Centre</string>
    <string name="type.leisure.amusement_arcade">Arcade</string>
-    <string name="type.amenity.charging_station.general">Charging Station</string>
-    <string name="type.amenity.charging_station.bicycle">Bicycles</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorcycles</string>
-    <string name="type.amenity.charging_station.motorcar">Cars</string>
-    <string name="type.amenity.charging_station.small">Limited Capacity</string>
+    <string name="type.amenity.charging_station">Charging Station</string>
+    <string name="type.amenity.charging_station.bicycle">Bicycle Charging Station</string>
+    <string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
+    <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
    <string name="type.amenity.childcare">Nursery</string>
    <string name="type.amenity.cinema">Cinema</string>
    <string name="type.amenity.studio">Media Studio</string>
@@ -180,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 Shelter</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Sleep 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>
@@ -199,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">Ticket Machine</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Public Transport 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/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -328,9 +328,7 @@
 "amenity-car_wash": "4Autowaschanlage|Autowäsche",
 "amenity-veterinary": "4Tierarzt",
 "@charging_station": "4Ladestation|aufladen",
-"amenity-charging_station-bicycle|@charging_station": "5Fahrradladestation|Fahrrad aufladen|E-Bike aufladen|Fahrrad laden|E-Bike laden",
-"amenity-charging_station-motorcycle|@charging_station": "6Motorradladestation|Motorrad aufladen|Motorrad laden",
-"amenity-charging_station-motorcar|@charging_station": "4Autoladestation|5Autoladegerät|Auto aufladen|Auto laden",
+"amenity-charging_station-bicycle|@charging_station": "Fahrrad aufladen",
 "amenity-childcare": "Kindertagesstätte|Kindergarten|Kinderbetreuung",
 "amenity-bicycle_parking": "6Fahrradständer",
 "amenity-waste_basket": "6Abfalleimer|4Mülleimer|Papierkorb",
@@ -512,6 +510,7 @@
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraktion|Labyrinth",
 "building-guardhouse": "4Wache",
 "shop-lighting|@shop": "Leuchtmittel|Lampen|Leuchte",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Autoladestation|5Autoladegerät|Ladestation",
 "amenity-mobile_money_agent": "6Mobile Money Vertretung|Mobile Money|Mobiles Geld",
 "man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Teleskop",
 "amenity-sailing_school": "5Segelschule|5Bootsschule|Bootsfahrschule",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -81,6 +81,9 @@
 "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",
@@ -197,7 +200,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 Shelter|4Shelter|Refuge|lean shelter|shelter",
+"amenity-shelter-lean_to": "3Lean-to Sleep Shelter|4Shelter|Refuge|lean shelter|Lean-to Shelter",
 "amenity-stripclub": "Stripclub|strip club",
 "amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone",
 "@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet",
@@ -350,11 +353,10 @@
 "man_made-observatory": "4Observatory",
 "amenity-veterinary": "4Veterinary Doctor|3Veterinary|vet|veterinarian",
 "amenity-animal_shelter": "6Animal Shelter",
-"@charging_station": "4Charging Station|charging|charger",
-"amenity-charging_station-general|@charging_station": "",
-"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging Station|Bicycle Charging|Bike Charging",
-"amenity-charging_station-motorcycle|@charging_station": "5Motorcycle Charging Station|Motorcycle Charging|Motorbike Charging",
-"amenity-charging_station-motorcar|@charging_station": "3Car Charging Station|Motorcar Charging|Car Charging",
+"@charging_station": "4Charging Station|charging",
+"amenity-charging_station|@charging_station": "",
+"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
 "amenity-childcare": "Nursery|4Child Care|childcare",
 "amenity-bicycle_parking": "4Bicycle Parking|4Bike Parking",
 "amenity-waste_basket": "4Trash Bin|4litter bin|5waste basket|bin",
@@ -366,20 +368,21 @@
 "shop-pet|@shop": "3Pet",
 "tourism-zoo|@category_tourism|@category_children": "2Zoo",
 "attraction-animal": "Animal Enclosure",
-"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",
+"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",
 "amenity-community_centre": "4Community centre",
 "amenity-compressed_air": "6Compressed air",
 "amenity-courthouse": "4Courthouse",
-"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": "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-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing",
+"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-newspapers": "4Newspaper Dispenser|Newspapers",
-"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies",
+"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies|Vending Machine",
 "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",
@@ -399,6 +402,7 @@
 "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",
@@ -454,7 +458,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",
@@ -500,6 +504,7 @@
 "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/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -518,7 +518,7 @@
 "amenity-toilets|toilets-yes|@category_toilet": "wc",
 "leisure-sports_centre-sport-swimming": "4Centro de natación",
 "amenity-police|@category_police": "Estación de policía|policía",
-"amenity-charging_station-motorcar|@charging_station": "Cargador de autos|cargador de coches|cargador de carros",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Cargador de autos|cargador de coches|cargador de carros",
 "amenity-sailing_school": "Escuela de vela|Escuela de navegación",
 "amenity-flight_school": "Escuela de aviación|Escuela de aeronáutica|Escuela de pilotos|aeronáutica|vuelo|aviación",
 "amenity-prep_school": "Propedéutico|Tutoría",
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -486,7 +486,7 @@
 "amenity-love_hotel": "Hôtel de passe|Hôtel de sexe|Hôtel pour adultes",
 "healthcare-sample_collection": "Prélèvement d'échantillons",
 "recycling-cardboard|@category_recycling": "5Recyclage de carton|Déchets de carton|Carton",
-"amenity-charging_station-motorcar|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
 "shop-lighting|@shop": "4Lumières|Luminaires|4Lampes",
 "office-security": "Bureau de sécurité",
 "building-guardhouse": "Garde|poste de sécurité|poste de gardiennage",
--- a/data/categories-strings/lv.json/localize.json
+++ b/data/categories-strings/lv.json/localize.json
@@ -320,7 +320,7 @@
 "amenity-veterinary": "4Veterinārārsts|vetārsts|vetklīnika|veterinārā klīnika",
 "@charging_station": "4Uzlādes stacija|uzlāde",
 "amenity-charging_station-bicycle|@charging_station": "4Velosipēdu uzlāde|Riteņu uzlāde|Ričuku uzlāde|Divriteņu uzlāde",
-"amenity-charging_station-motorcar|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
 "amenity-childcare": "Bērnistaba",
 "amenity-bicycle_parking": "4Velonovietne",
 "amenity-waste_basket": "Atkritumu tvertne|4miskaste",
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -330,7 +330,7 @@
 "amenity-animal_shelter": "Приют для животных",
 "@charging_station": "4Зарядная станция|зарядка|электрозарядка|зарядить",
 "amenity-charging_station-bicycle|@charging_station": "4Велозарядка|Зарядка для велосипедов",
-"amenity-charging_station-motorcar|@charging_station": "4Автозарядка",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Автозарядка",
 "amenity-childcare": "Детская комната|3ясли",
 "amenity-bicycle_parking": "4Велопарковка|велостоянка",
 "amenity-waste_basket": "3Урна|4Мусорная корзина",
--- a/data/categories-strings/tr.json/localize.json
+++ b/data/categories-strings/tr.json/localize.json
@@ -331,7 +331,7 @@
 "amenity-veterinary": "4Veteriner",
 "@charging_station": "Şarj İstasyonu|şarj etme",
 "amenity-charging_station-bicycle|@charging_station": "4Bisiklet Şarjı",
-"amenity-charging_station-motorcar|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
 "amenity-childcare": "Çocuk Yuvası|Kreş",
 "amenity-bicycle_parking": "4Bisiklet park etme|bisiklet park",
 "amenity-waste_basket": "Çöp Kutusu",
--- 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" />
@@ -512,7 +512,7 @@
        <include group="poi_internet" />
      </type>
      <type id="amenity-charging_station">
-	<include group="charge_sockets" />
+        <include group="charge_sockets" />
        <include field="opening_hours" />
        <include field="operator" />
      </type>
@@ -625,23 +625,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" />
@@ -689,7 +689,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">
@@ -710,7 +710,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">
@@ -719,7 +719,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" />
@@ -729,8 +729,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" />
@@ -738,10 +738,9 @@
      <type id="waterway-waterfall">
        <include field="name" />
        <include field="height" />
-<!--        <include field="wikipedia" />-->
+        <!-- <include field="wikipedia" /> -->
      </type>
-      <!-- Too generic to be added -->
-      <type id="office" can_add="no">
+      <type id="office" group="office">
        <include group="poi_internet" />
      </type>
      <type id="office-company" group="office">
@@ -771,7 +770,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.
@@ -838,6 +837,12 @@
      <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>
@@ -1098,7 +1103,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>
@@ -1108,13 +1113,22 @@
      <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" />
@@ -1178,6 +1192,12 @@
      <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>
@@ -1375,6 +1395,9 @@
      <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>
@@ -1399,7 +1422,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" />
@@ -1426,10 +1449,14 @@
      <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>
@@ -1557,9 +1584,6 @@
      <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
@@ -45,8 +45,9 @@
 #
 # A C++ parser implementation used by the generator is in generator/utils.cpp::ParseMapCSS().
 # A python parser implementation used to compile *.mapcss style files is in tools/kothic/src/libkomwm.py::komap_mapswithme().
-# The app doesn't use this file directly, it loads a data/types.txt
+# The rendering engine in the app doesn't use this file directly, it loads a data/types.txt
 # which is derived from this file during style files compilation.
+# A C++ parser for matching types to OSM tags is implemented in editor/feature_type_to_osm.cpp
 #
 # Types that don't have any style defined are discarded by the generator.
 # To prevent discarding, add them to the exceptions in indexer/feature_visibility.cpp::IsUsefulNondrawableType()
@@ -101,7 +102,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];;name;int_name;36;
+amenity|school;[amenity=school][education=school],[amenity=school],[education=school];;;;36;
 # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
 highway|cycleway;37;
 # ~16M usages.
@@ -202,7 +203,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;114;
+amenity|hospital;[amenity=hospital][healthcare=hospital],[amenity=hospital],[healthcare=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 +211,7 @@ highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
 amenity|post_office;117;
 # ~230k usages.
 landuse|quarry;118;
-amenity|pharmacy;119;
+amenity|pharmacy;[amenity=pharmacy][healthcare=pharmacy],[amenity=pharmacy],[healthcare=pharmacy];;;;119;
 man_made|pier;120;
 # ~220k usages.
 highway|motorway_junction;121;
@@ -276,7 +277,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];;name;int_name;176;
+amenity|university;[amenity=university][education=university],[amenity=university],[education=university];;;;176;
 highway|secondary_link;177;
 power|substation;178;
 railway|tram_stop;179;
@@ -301,7 +302,7 @@ railway|crossing;197;
 boundary|national_park;198;
 deprecated:natural|wood|deciduous:01.2020;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];x;name;int_name;199;landuse|forest|deciduous
 waterway|dam;200;
-amenity|charging_station|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2],[amenity=charging_station][!capacity],[amenity=charging_station][capacity=1],[amenity=charging_station][capacity=2],;;name;int_name;201;
+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;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
 # ~250K usages.
@@ -309,7 +310,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;207;
+amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;;;207;
 railway|disused;208;
 aeroway|runway;209;
 railway|halt;210;
@@ -327,7 +328,7 @@ sport|swimming;220;
 leisure|track;221;
 sport|skateboard;222;
 barrier|retaining_wall;223;
-amenity|college;[amenity=college],[education=college];;name;int_name;224;
+amenity|college;[amenity=college][education=college],[amenity=college],[education=college];;;;224;
 sport|baseball;225;
 highway|service|area;[highway=service][area?];;name;int_name;226;
 highway|residential|area;[highway=residential][area?];;name;int_name;227;
@@ -405,12 +406,12 @@ highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
 # TODO: its a mismapping likely, if there is a bridge structure still, then it should be railway=disused.
 railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
 man_made|lighthouse;299;
-amenity|charging_station|motorcycle;[amenity=charging_station][motorcycle?];;name;int_name;300;
+deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult
 man_made|storage_tank;301;
 man_made|silo;302;
 power|generator;303;
 highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
-amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?],[amenity=charging_station][motorcar?];;name;int_name;305;
+amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?];;name;int_name;305;
 natural|saddle;306;
 mountain_pass;[mountain_pass];;name;int_name;307;
 highway|raceway;308;
@@ -419,7 +420,7 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
 man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311;
 sport|equestrian;312;
 tourism|information|office;[tourism=information][information=office];;name;int_name;313;
-amenity|charging_station|carless;[amenity=charging_station][motorcar=not],[amenity=charging_station][motorcar=no];;name;int_name;314;
+deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path
 aeroway|gate;315;
 # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
 railway|preserved;316;
@@ -625,9 +626,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];;name;int_name;506;
-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|sailing_school;[amenity=sailing_school][education=sailing_school],[amenity=sailing_school],[education=sailing_school];;;;506;
+amenity|flight_school;[amenity=flight_school][education=flight_school],[amenity=flight_school],[education=flight_school];;;;507;
+amenity|prep_school;[amenity=prep_school][education=prep_school],[amenity=prep_school],[education=prep_school];;;;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
 social_facility|food_bank;511;
@@ -1160,8 +1161,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;1036;
-amenity|clinic;1037;
+amenity|dentist;[amenity=dentist][healthcare=dentist],[amenity=dentist],[healthcare=dentist];;;;1036;
+amenity|clinic;[amenity=clinic][healthcare=clinic],[amenity=clinic],[healthcare=clinic];;;;1037;
 barrier|entrance;1038;
 barrier|border_control;1039;
 shop|laundry;1040;
@@ -1192,7 +1193,7 @@ shop|tyres;1064;
 craft|beekeeper;1065;
 amenity|car_wash;1066;
 amenity|veterinary;1067;
-amenity|charging_station|general;[amenity=charging_station];;name;int_name;1068;
+amenity|charging_station;1068;
 amenity|childcare;1069;
 craft|blacksmith;1070;
 amenity|bicycle_parking;1071;
@@ -1257,8 +1258,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];;name;int_name;1133;
-amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134;
+amenity|music_school;[amenity=music_school][education=music_school],[amenity=music_school],[education=music_school];;;;1133;
+amenity|language_school;[amenity=language_school][education=language_school],[amenity=language_school],[education=language_school];;;;1134;
 historic|city_gate;1135;
 sport|padel;1136;
 sport|futsal;1137;
@@ -1285,7 +1286,7 @@ shop|charity;1157;
 hwtag|toll;1158;
 amenity|arts_centre;1159;
 amenity|biergarten;1160;
-amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161;
+amenity|driving_school;[amenity=driving_school][education=driving_school],[amenity=driving_school],[education=driving_school];;;;1161;
 amenity|food_court;1162;
 amenity|ice_cream;1163;
 amenity|internet_cafe;1164;
--- a/data/styles/default/dark/symbols/charging_station-small-m.svg
+++ b/data/styles/default/dark/symbols/charging_station-small-m.svg
--- a/data/styles/default/dark/symbols/charging_station-small-s.svg
+++ b/data/styles/default/dark/symbols/charging_station-small-s.svg
--- a/data/styles/default/dark/symbols/charging-station-m.svg
+++ b/data/styles/default/dark/symbols/charging-station-m.svg
--- a/data/styles/default/dark/symbols/charging-station-s.svg
+++ b/data/styles/default/dark/symbols/charging-station-s.svg
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -558,9 +558,8 @@ area|z15-[amenity=marketplace],
 area|z15-[office=diplomatic],
 area|z15-[amenity=vehicle_inspection],
 area|z15-[amenity=car_wash],
-area|z15-[amenity=fuel],
 area|z15-[amenity=charging_station][motorcar?],
-area|z16-[amenity=charging_station],
+area|z15-[amenity=fuel],
 area|z15-[amenity=motorcycle_parking],
 area|z15-[amenity=bicycle_parking],
 {fill-opacity: 1; fill-color: @general_area;}
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -2398,28 +2398,18 @@ node|z17-[amenity=fuel],
 node|z18-[amenity=fuel],
 {font-size: 11;}

-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
-node|z16-[amenity=charging_station],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: none;}
 node|z15-[amenity=charging_station][motorcar?][!capacity],
 node|z15-[amenity=charging_station][motorcar?][capacity=1],
 node|z15-[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: charging_station-small-m.svg;}
+node|z16-[amenity=charging_station],
+{icon-image: charging-point-m.svg;}

-node|z14[amenity=charging_station][motorcar?],
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging-station-s.svg;}
+node|z15-[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging-station-m.svg;}
+
+node|z14[amenity=charging_station][motorcar?][capacity?],
 {text-offset: 1;font-size: 10;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
 {icon-min-distance: 20;}
@@ -2465,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/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -85,12 +85,8 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 180

 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-general                    # area z16- (also has icon z16-, caption(optional) z16-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
 amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -374,13 +374,13 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300

-amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
-=== 4280
-
 amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
 amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270

+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 4260
+
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250

@@ -424,23 +424,13 @@ highway-rest_area                                   # icon z15- (also has captio
 tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 tourism-chalet                                      # icon z16- (also has caption(optional) z16-)
-=== 3850
-
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800

-amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3752
-
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3751
-
-amenity-charging_station-general                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
+shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3750

-amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3749
-
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-adana                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-algiers                     # icon z16- (also has caption(optional) z17-)
@@ -1650,13 +1640,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700

-# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
-# === -5720
-
 # amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
 # amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730

+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -5740
+
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750

@@ -1700,23 +1690,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # tourism-chalet                                    # caption(optional) z16- (also has icon z16-)
-# === -6150
-
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200

-# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6248
-
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6249
-
-# amenity-charging_station-general                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
+# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6250

-# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6251
-
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-adana                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-algiers                   # caption(optional) z17- (also has icon z16-)
--- a/data/styles/default/light/symbols/charging_station-small-m.svg
+++ b/data/styles/default/light/symbols/charging_station-small-m.svg
--- a/data/styles/default/light/symbols/charging_station-small-s.svg
+++ b/data/styles/default/light/symbols/charging_station-small-s.svg
--- a/data/styles/default/light/symbols/charging-station-m.svg
+++ b/data/styles/default/light/symbols/charging-station-m.svg
--- a/data/styles/default/light/symbols/charging-station-s.svg
+++ b/data/styles/default/light/symbols/charging-station-s.svg
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -78,7 +78,6 @@ leisure-sports_centre-sport-volleyball              # area z13- (also has icon z
 leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
 === 190

-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
 amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
 landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
@@ -86,12 +85,9 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 180

 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-general                    # area z16- (also has icon z16-, caption(optional) z16-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
 amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -374,13 +374,13 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300

-amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
-=== 4280
-
 amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
 amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270

+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 4260
+
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250

@@ -424,23 +424,13 @@ highway-rest_area                                   # icon z14- (also has captio
 tourism-camp_site                                   # icon z13- (also has caption(optional) z13-, area z13-)
 tourism-caravan_site                                # icon z13- (also has caption(optional) z13-)
 tourism-chalet                                      # icon z14- (also has caption(optional) z14-)
-=== 3850
-
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800

-amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3752
-
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3751
-
-amenity-charging_station-general                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
+shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3750

-amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3749
-
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-adana                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-algiers                     # icon z16- (also has caption(optional) z17-)
@@ -1653,13 +1643,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700

-# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
-# === -5720
-
 # amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
 # amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730

+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -5740
+
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750

@@ -1703,23 +1693,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-camp_site                                 # caption(optional) z13- (also has icon z13-, area z13-)
 # tourism-caravan_site                              # caption(optional) z13- (also has icon z13-)
 # tourism-chalet                                    # caption(optional) z14- (also has icon z14-)
-# === -6150
-
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200

-# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6248
-
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6249
-
-# amenity-charging_station-general                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
+# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6250

-# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6251
-
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-adana                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-algiers                   # caption(optional) z17- (also has icon z16-)
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -349,9 +349,8 @@ area|z13-[highway=services],
 area|z13-[highway=rest_area],
 area|z13-[landuse=garages],

-area|z15-[amenity=fuel],
 area|z15-[amenity=charging_station][motorcar?],
-area|z16-[amenity=charging_station],
+area|z15-[amenity=fuel],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
 area|z17-[amenity=motorcycle_parking],
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -626,28 +626,16 @@ node|z17[amenity=fuel],
 node|z18-[amenity=fuel],
 {icon-image: fuel-m.svg;font-size: 14.5;}

-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
+node|z14-[amenity=charging_station][motorcar?][!capacity],
+node|z14-[amenity=charging_station][motorcar?][capacity=1],
+node|z14-[amenity=charging_station][motorcar?][capacity=2],
 node|z16-[amenity=charging_station],
-{icon-image: charging_station-small-m.svg;}
+{icon-image: charging-point-m.svg;}
+
+node|z14-[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging-station-m.svg;}

 node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: none;}
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?],
 {text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
 {icon-min-distance: 20;font-size: 12.5;}
@@ -746,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/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -33,12 +33,8 @@ amenity-parking-street_side-private                 # area z15- (also has icon z
 === 160

 amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-general                    # area z16- (also has icon z16-, caption(optional) z16-)
 amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-charging_station-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
 amenity-vehicle_inspection                          # area z17- (also has icon z17-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -170,28 +170,17 @@ aeroway-aerodrome-international                     # icon z7- (also has caption
 place-town                                          # caption z8-
 === 3250

-amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
-=== 3210
-
 amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
 amenity-fuel                                        # icon z12- (also has caption(optional) z12-, area z15-)
 === 3200

+amenity-charging_station-motorcar-small             # icon z16- (also has caption(optional) z16-, area z15-)
+=== 3190
+
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
 amenity-vending_machine-fuel                        # icon z17- (also has caption(optional) z17-)
-=== 3153
-
-amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3152
-
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3151
-
-amenity-charging_station-general                    # icon z16- (also has caption(optional) z16-, area z16-)
 === 3150

-amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3149
-
 railway-station-subway-moscow                       # icon z11-15 (also has caption(optional) z15)
 railway-station-subway-spb                          # icon z11-16 (also has caption(optional) z15-16)
 === 3100
@@ -539,6 +528,9 @@ natural-beach-gravel                                # caption z15- (also has are
 natural-beach-sand                                  # caption z15- (also has area z10-)
 === 900

+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
+=== 850
+
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
 historic-gallows                                    # icon z16- (also has caption(optional) z16-)
 historic-pillory                                    # icon z16- (also has caption(optional) z16-)
@@ -792,28 +784,17 @@ entrance-emergency                                  # icon z19- (also has captio
 # aeroway-aerodrome-international                   # caption(optional) z10- (also has icon z7-, area z10-)
 # === -6700

-# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
-# === -6790
-
 # amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
 # amenity-fuel                                      # caption(optional) z12- (also has icon z12-, area z15-)
 # === -6800

+# amenity-charging_station-motorcar-small           # caption(optional) z16- (also has icon z16-, area z15-)
+# === -6810
+
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
 # amenity-vending_machine-fuel                      # caption(optional) z17- (also has icon z17-)
-# === -6847
-
-# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6848
-
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6849
-
-# amenity-charging_station-general                  # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6850

-# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6851
-
 # railway-station-subway-moscow                     # caption(optional) z15 (also has icon z11-15)
 # railway-station-subway-spb                        # caption(optional) z15-16 (also has icon z11-16)
 # === -6900
@@ -1075,6 +1056,9 @@ entrance-emergency                                  # icon z19- (also has captio
 # amenity-hospital                                  # caption(optional) z15- (also has icon z15-)
 # === -9000

+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
+# === -9150
+
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
 # historic-gallows                                  # caption(optional) z16- (also has icon z16-)
 # historic-pillory                                  # caption(optional) z16- (also has icon z16-)
--- 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/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -42,11 +42,10 @@
 "type.amenity.gambling" = "Glücksspiel";
 "type.leisure.adult_gaming_centre" = "Spielhalle für Erwachsene";
 "type.leisure.amusement_arcade" = "Spielhalle für Unterhaltungsspiele";
-"type.amenity.charging_station.general" = "Ladestation";
-"type.amenity.charging_station.motorcar" = "Autos";
-"type.amenity.charging_station.motorcycle" = "Motorräder";
-"type.amenity.charging_station.bicycle" = "Fahrräder";
-"type.amenity.charging_station.small" = "Begrenzte Kapazität";
+"type.amenity.charging_station" = "Ladestation";
+"type.amenity.charging_station.bicycle" = "Fahrrad-Ladestation";
+"type.amenity.charging_station.motorcar" = "Kfz-Ladestation";
+"type.amenity.charging_station.motorcar.small" = "Kfz-Ladestation";
 "type.amenity.childcare" = "Kindertagesstätte";
 "type.amenity.cinema" = "Kino";
 "type.leisure.bowling_alley" = "Bowlingbahn";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -47,11 +47,10 @@
 "type.amenity.gambling" = "Gambling";
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
-"type.amenity.charging_station.general" = "Charging Station";
-"type.amenity.charging_station.motorcar" = "Cars";
-"type.amenity.charging_station.motorcycle" = "Motorcycles";
-"type.amenity.charging_station.bicycle" = "Bicycles";
-"type.amenity.charging_station.small" = "Limited Capacity";
+"type.amenity.charging_station" = "Charging Station";
+"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
+"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -54,11 +54,10 @@
 "type.amenity.studio" = "Media Studio";
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
-"type.amenity.charging_station.general" = "Charging Station";
-"type.amenity.charging_station.motorcar" = "Cars";
-"type.amenity.charging_station.motorcycle" = "Motorcycles";
-"type.amenity.charging_station.bicycle" = "Bicycles";
-"type.amenity.charging_station.small" = "Limited Capacity";
+"type.amenity.charging_station" = "Charging Station";
+"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
+"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
@@ -190,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 Shelter";
+"type.amenity.shelter.lean_to" = "Lean-to Sleep Shelter";
 "type.amenity.public_bath" = "Public Bath";
 "type.amenity.shower" = "Shower";
 "type.amenity.stripclub" = "Stripclub";
@@ -209,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" = "Ticket Machine";
+"type.amenity.vending_machine.public_transport_tickets" = "Public Transport 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/libs/editor/feature_type_to_osm.cpp
+++ b/libs/editor/feature_type_to_osm.cpp
@@ -35,24 +35,31 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
    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() != ';')
+    // skip empty lines and comments
+    if (line.empty() || line.front() == '#')
      continue;

-    std::vector<std::string_view> const rowTokens = strings::Tokenize(line, ";");
-    if (rowTokens.size() < 2)
+    std::vector<std::string> rowTokens;
+    strings::ParseCSVRow(line, ';', rowTokens);
+
+    // make sure entry is in full or short format
+    if (rowTokens.size() != 3 && rowTokens.size() != 7)
    {
      ASSERT(false, ("Invalid feature type definition:", line));
      continue;
    }

+    // skip deprecated and moved types
+    if ((rowTokens.size() == 3 && !rowTokens[2].empty()) || (rowTokens.size() == 7 && rowTokens[2] == "x"))
+      continue;
+
    // Get internal feature type
+    ASSERT(!rowTokens[0].empty(), ("No feature type found:", line));
    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)
+    if (rowTokens.size() == 3)
    {
      // Derive OSM tags from type name
      ASSERT(featureTypeTokens.size() <= 2, ("OSM tags can not be inferred from name:", line));
@@ -77,6 +84,11 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
    else
    {
      // OSM tags are listed in the feature type entry
+      if (rowTokens[1].empty())
+      {
+        ASSERT(false, ("No OSM tags found:", line));
+        continue;
+      }
      std::vector<std::string_view> const osmTagTokens = strings::Tokenize(rowTokens[1], ",");

      // First entry is the best practice way to tag a feature
--- a/libs/indexer/feature_data.cpp
+++ b/libs/indexer/feature_data.cpp
@@ -191,21 +191,9 @@ void TypesHolder::SortBySpec()
  auto const getPriority = [&cl](uint32_t type) { return cl.GetObject(type)->GetMaxOverlaysPriority(); };

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

-  std::stable_sort(begin(), end(), [&checker, &getPriority, &isChargingStationChecker, &isChargingStationSmallChecker](uint32_t t1, uint32_t t2)
+  std::stable_sort(begin(), end(), [&checker, &getPriority](uint32_t t1, uint32_t t2)
  {
-    if (isChargingStationSmallChecker(t1) && !isChargingStationSmallChecker(t2))
-      return false;
-    else if (isChargingStationSmallChecker(t1) && !isChargingStationSmallChecker(t2))
-      return true;
-    
-    if (isChargingStationChecker(t1) && !isChargingStationChecker(t2))
-      return true;
-    else if (isChargingStationChecker(t2) && !isChargingStationChecker(t1))
-      return false;
-      
    int const p1 = getPriority(t1);
    int const p2 = getPriority(t2);
    if (p1 != p2)
@@ -415,13 +403,6 @@ void FeatureParams::SetRwSubwayType(char const * cityName)

 FeatureParams::TypesResult FeatureParams::FinishAddingTypesEx()
 {
-  auto const & cl = classif();
-  auto charingStation = cl.GetTypeByPath({"amenity", "charging_station", "general"});
-  auto motorcarCharingStation = cl.GetTypeByPath({"amenity", "charging_station", "motorcar"});
-  auto carelessCharingStation = cl.GetTypeByPath({"amenity", "charging_station", "carless"});
-  if (IsTypeExist(charingStation) && !IsTypeExist(motorcarCharingStation) && !IsTypeExist(carelessCharingStation))
-    AddType(motorcarCharingStation);
-
  base::SortUnique(m_types);

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

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

-class IsCharingStationChecker : public ftypes::BaseChecker
-{
-  IsCharingStationChecker();
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsCharingStationChecker);
-};
-
-class IsCharingStationCarChecker : public ftypes::BaseChecker
-{
-  IsCharingStationCarChecker();
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsCharingStationCarChecker);
-};
-
-class IsCharingStationCarlessChecker : public ftypes::BaseChecker
-{
-  IsCharingStationCarlessChecker();
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsCharingStationCarlessChecker);
-};
-
-class IsCharingStationSmallChecker : public ftypes::BaseChecker
-{
-  IsCharingStationSmallChecker();
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsCharingStationSmallChecker);
-};
-
 class IsTaxiChecker : public BaseChecker
 {
  IsTaxiChecker();
--- a/libs/indexer/map_object.cpp
+++ b/libs/indexer/map_object.cpp
@@ -121,19 +121,12 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
  auto const & isPoi = ftypes::IsPoiChecker::Instance();
  auto const & isDirectional = ftypes::IsDirectionalChecker::Instance();
  auto const & amenityChecker = ftypes::IsAmenityChecker::Instance();
-  auto const & charingStationCarChecker = ftypes::IsCharingStationCarChecker::Instance();
-  auto const & charingStationCarlessChecker = ftypes::IsCharingStationCarlessChecker::Instance();
-  auto const & charingStationSmallChecker = ftypes::IsCharingStationSmallChecker::Instance();

  std::ostringstream oss;
  bool isMainType = true;
  bool isFirst = true;
  for (auto const type : copy)
  {
-    // Ignore some charing stations
-    if (charingStationCarlessChecker(type) || ((charingStationCarChecker(type) || charingStationSmallChecker(type)) && charingStationCarlessChecker(copy)))
-      continue;
-    
    if (isMainType && !withMainType)
    {
      isMainType = false;
--- a/libs/map/bookmark_helpers.cpp
+++ b/libs/map/bookmark_helpers.cpp
@@ -86,9 +86,7 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
    {"amenity-bureau_de_change", {kml::BookmarkIcon::Exchange, BookmarkBaseType::Exchange}},

    {"amenity-charging_station", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
-    {"amenity-charging_station-general", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
    {"amenity-charging_station-bicycle", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
-    {"amenity-charging_station-motorcycle", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
    {"amenity-charging_station-motorcar", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
    {"amenity-fuel", {kml::BookmarkIcon::Gas, BookmarkBaseType::Gas}},

--- a/libs/map/search_mark.cpp
+++ b/libs/map/search_mark.cpp
@@ -228,9 +228,7 @@ private:
        {{"shop", "money_lender"}, SearchMarkType::Bank},
        {{"amenity", "fuel"}, SearchMarkType::Fuel},
        {{"amenity", "charging_station"}, SearchMarkType::ChargingStation},
-        {{"amenity", "charging_station", "general"}, SearchMarkType::ChargingStation},
        {{"amenity", "charging_station", "bicycle"}, SearchMarkType::ChargingStation},
-        {{"amenity", "charging_station", "motorcycle"}, SearchMarkType::ChargingStation},
        {{"amenity", "charging_station", "motorcar"}, SearchMarkType::ChargingStation},
        {{"shop", "alcohol"}, SearchMarkType::ShopAlcohol},
        {{"shop", "beverages"}, SearchMarkType::ShopAlcohol},
Author	SHA1	Message	Date
map-per	69d14e2027	[editor] More reliable check for deprecated and moved features Signed-off-by: map-per <map-per@gmx.de>	2025-12-28 17:59:10 +01:00
map-per	ec59698f4a	[editor] Add more complex types and support healthcare and education Signed-off-by: map-per <map-per@gmx.de>	2025-12-28 16:48:57 +01:00
Jean-Baptiste	0c2763f3ce	[doc] Create an security markdown file Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-27 21:53:01 +01:00
Jean-Baptiste	c9a4483f50	[android] Re-organize charging station sockets by power Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-26 16:21:53 +01:00
Jean-Baptiste	0eafe3482e	[android] Remove TextAppearance styles text Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-26 14:56:15 +01:00
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