Fix html vs markdown format

Signed-off-by: patepelo <developer.anton@gmail.com>

android/app/build.gradle

@@ -256,18 +256,17 @@ android {
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
     // Some languages not supported by Android require to be specified here to be applied
     localeFilters += [
-            "en",
             "af",
             "ar",
             "az",
             "be",
             "bg",
-            "bn",
             "ca",
             "cs",
             "da",
             "de",
             "el",
+            "en",
             "en-rGB",
             "es",
             "es-rMX",
@@ -277,16 +276,11 @@ android {
             "fi",
             "fr",
             "fr-rCA",
-            "gl",
+            "iw",
-            "gsw",
-            "he",
             "hi",
             "hu",
-            "id",
             "in",
-            "is",
             "it",
-            "iw",
             "ja",
             "kw",
             "ko",
@@ -295,20 +289,16 @@ android {
             "mr",
             "mt",
             "nb",
-            "nb-rNO",
             "nl",
             "pl",
             "pt",
             "pt-rBR",
             "ro",
             "ru",
-            "sl",
             "sk",
-            "sr-rCyrl",
+            "sr",
-            "sr-rLatn",
             "sv",
             "sw",
-            "ta",
             "th",
             "tr",
             "uk",

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -132,6 +132,7 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -711,6 +712,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
+      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -237,7 +237,6 @@ public class EditorHostFragment
     for (LocalizedName name : sNames)
       languages.add(name.lang);
     args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
-    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
     editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
   }
 

android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java

@@ -1,15 +1,11 @@
 package app.organicmaps.editor;
 
-import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
-
 import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
 import androidx.fragment.app.Fragment;
-
-import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
@@ -25,7 +21,6 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
   final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
-  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
 
   public interface Listener
   {
@@ -39,8 +34,6 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
   protected LanguagesAdapter createAdapter()
   {
     Bundle args = getArguments();
-    boolean includeLocalLanguage =
-        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
     Set<String> existingLanguages =
         args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();
 
@@ -75,12 +68,6 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 
     languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());
 
-    if (includeLocalLanguage) {
-      String localLanguageLabel = getString(R.string.pref_maplanguage_local);
-      Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
-      languages.add(0, localLanguage);
-    }
-
     return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
   }
 

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -1,7 +1,6 @@
 package app.organicmaps.settings;
 
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
-import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -141,13 +140,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
   private void updateMapLanguageCodeSummary()
   {
     final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    String mapLanguageCode = MapLanguageCode.getMapLanguageCode();
+    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
-    if (mapLanguageCode.equals(DEFAULT_LANG_CODE)) {
+    pref.setSummary(locale.getDisplayLanguage());
-      pref.setSummary(R.string.pref_maplanguage_local);
-    } else {
-      Locale locale = new Locale(mapLanguageCode);
-      pref.setSummary(locale.getDisplayLanguage());
-    }
   }
 
   private void updateRoutingSettingsPrefsSummary()

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java

@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
   @Override
   public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
   {
-    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
+    return new BottomSheetDialog(requireContext(), getTheme()) {
       @Override
       public void onAttachedToWindow()
       {

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java

@@ -105,12 +105,4 @@ public class PlacePageUtils
     });
     popup.show();
   }
-
-    public static String buildPanoramaxURL(double lat, double lon)
-    {
-        final String panoramaxURL = "https://api.panoramax.xyz/?map=";
-        final String levelZoom = "16";
-        final String quality_score = "&pic_score=ABC";
-        return panoramaxURL +  levelZoom + "/" + lat + "/" + lon + quality_score;
-    }
 }

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -4,7 +4,6 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
 import static app.organicmaps.sdk.util.Utils.getTagValueLocalized;
-import static app.organicmaps.widget.placepage.PlacePageUtils.buildPanoramaxURL;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -291,9 +290,6 @@ public class PlacePageView extends Fragment
     openIn.setOnClickListener(this);
     openIn.setOnLongClickListener(this);
     openIn.setVisibility(VISIBLE);
-    LinearLayout openPhotoViewer = mFrame.findViewById(R.id.ll__place_open_phviewer);
-    openPhotoViewer.setOnClickListener(this);
-    openPhotoViewer.setVisibility(VISIBLE);
     mTvLatlon = mFrame.findViewById(R.id.tv__place_latlon);
     mWifi = mFrame.findViewById(R.id.ll__place_wifi);
     mTvWiFi = mFrame.findViewById(R.id.tv__place_wifi);
@@ -1009,8 +1005,6 @@ public class PlacePageView extends Fragment
                                                    mMapObject.getName());
       Utils.openUri(requireContext(), Uri.parse(uri), R.string.uri_open_location_failed);
     }
-    else if (id == R.id.ll__place_open_phviewer)
-        Utils.openUrl(requireContext(), buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
     else if (id == R.id.direction_frame)
       showBigDirection();
     else if (id == R.id.item_icon)
@@ -1058,10 +1052,6 @@ public class PlacePageView extends Fragment
                                                    mMapObject.getName());
       PlacePageUtils.copyToClipboard(requireContext(), mFrame, uri);
     }
-    else if (id == R.id.ll__place_open_phviewer)
-    {
-        PlacePageUtils.copyToClipboard(requireContext(),mFrame, buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
-    }
     else if (id == R.id.ll__place_operator)
       items.add(mTvOperator.getText().toString());
     else if (id == R.id.ll__place_network)

android/app/src/main/res/layout-land/layout_nav.xml

@@ -41,5 +41,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|start"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </FrameLayout>

android/app/src/main/res/layout/bottom_sheet_menu_item.xml

@@ -8,6 +8,7 @@
   android:paddingStart="@dimen/margin_base"
   android:paddingEnd="@dimen/margin_base"
   android:gravity="center_vertical"
+  android:background="?clickableBackground"
   android:orientation="horizontal">
 
   <com.google.android.material.imageview.ShapeableImageView

android/app/src/main/res/layout/fragment_report.xml

@@ -20,8 +20,8 @@
       android:gravity="center"
       android:layout_gravity="end|center_vertical"
       android:background="?selectableItemBackgroundBorderless"
-      android:textSize="@dimen/text_size_toolbar"
       android:padding="@dimen/margin_half"
+      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
       android:text="@string/editor_report_problem_send_button"/>
   </com.google.android.material.appbar.MaterialToolbar>
 

android/app/src/main/res/layout/layout_nav.xml

@@ -40,5 +40,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|center"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?cardBackground"/>
 </FrameLayout>

android/app/src/main/res/layout/place_page.xml

@@ -4,7 +4,6 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:descendantFocusability="blocksDescendants"
-  android:background="?cardBackground"
   android:orientation="vertical">
   <include
     android:id="@+id/pp__preview"

android/app/src/main/res/layout/place_page_details.xml

@@ -71,8 +71,6 @@
     <include layout="@layout/place_page_latlon"/>
 
     <include layout="@layout/place_page_open_in"/>
-
-    <include layout="@layout/place_page_open_photoviewer" />
   </LinearLayout>
 
   <include

android/app/src/main/res/layout/place_page_open_photoviewer.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll__place_open_phviewer"
-    style="@style/PlacePageItemFrame"
-    tools:background="#20FF0000"
-    tools:visibility="visible">
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/iv__place_open_phviewer"
-        style="@style/PlacePageMetadataIcon"
-        app:srcCompat="@drawable/ic_panoramax"
-        app:tint="?colorSecondary"/>
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/tv__place_open_phviewer"
-        android:textAlignment="viewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/open_place_in_pnx"
-        android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
-</LinearLayout>

android/app/src/main/res/layout/position_chooser.xml

@@ -15,8 +15,15 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
-    app:title="@string/editor_add_select_location">
+
+      <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/margin_half"
+        android:text="@string/editor_add_select_location"
+        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
     </com.google.android.material.appbar.MaterialToolbar>
 
   <com.google.android.material.textview.MaterialTextView

android/app/src/main/res/values-night/colors.xml

@@ -15,7 +15,6 @@
   <color name="bg_cards">#FF3C4044</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
-  <color name="bg_app">#10140F</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

android/app/src/main/res/values/strings.xml

@@ -797,10 +797,8 @@
     <string name="enable_show_on_lock_screen">Show on the lock screen</string>
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">When enabled, the app will work on the lockscreen even when the device is locked.</string>
-    <!-- Current language of the map -->
+    <!-- Current language of the map! -->
     <string name="change_map_locale">Map language</string>
-    <!-- Local language -->
-    <string name="pref_maplanguage_local">Local Language</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Map data from OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
@@ -975,5 +973,4 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
-    <string name="open_place_in_pnx">Open in Panoramax</string>
 </resources>

android/app/src/main/res/values/styles-text.xml

@@ -98,6 +98,16 @@
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
 
+  <style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+    <item name="android:textColor">@color/text_light</item>
+    <item name="android:textColorHint">@color/text_light_hint</item>
+  </style>
+
+  <style name="MwmTextAppearance.Toolbar.Title.Light">
+    <item name="android:textColor">@color/bg_cards</item>
+  </style>
+
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

android/app/src/main/res/values/styles.xml

@@ -143,7 +143,8 @@
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
-    <item name="titleTextColor">@color/text_light</item>
+    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
     <item name="buttonGravity">center_vertical</item>
   </style>
 
@@ -168,7 +169,9 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
+    <item name="android:background">@android:color/transparent</item>
+  </style>
 
   <style name="MwmWidget.TextView.Item">
     <item name="android:layout_width">match_parent</item>
@@ -287,13 +290,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?colorSurfaceContainerLow</item>
+    <item name="backgroundTint">?cardBackground</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?colorSurfaceContainerLow</item>
+    <item name="android:background">?cardBackground</item>
     <item name="behavior_hideable">false</item>
   </style>
 

android/app/src/main/res/xml/locales_config.xml

@@ -7,7 +7,6 @@
     <locale android:name="az" />
     <locale android:name="be" />
     <locale android:name="bg" />
-    <locale android:name="bn" />
     <locale android:name="ca" />
     <locale android:name="cs" />
     <locale android:name="da" />
@@ -22,16 +21,11 @@
     <locale android:name="fi" />
     <locale android:name="fr" />
     <locale android:name="fr-CA" />
-    <locale android:name="gl" />
+    <locale android:name="iw" />
-    <locale android:name="gsw" />
-    <locale android:name="he" />
     <locale android:name="hi" />
     <locale android:name="hu" />
-    <locale android:name="id" />
     <locale android:name="in" />
-    <locale android:name="is" />
     <locale android:name="it" />
-    <locale android:name="iw" />
     <locale android:name="ja" />
     <locale android:name="kw" />
     <locale android:name="ko" />
@@ -40,20 +34,16 @@
     <locale android:name="mr" />
     <locale android:name="mt" />
     <locale android:name="nb" />
-    <locale android:name="nb-NO" />
     <locale android:name="nl" />
     <locale android:name="pl" />
     <locale android:name="pt" />
     <locale android:name="pt-BR" />
     <locale android:name="ro" />
     <locale android:name="ru" />
-    <locale android:name="sl" />
     <locale android:name="sk" />
-    <locale android:name="sr-Cyrl" />
+    <locale android:name="sr" />
-    <locale android:name="sr-Latn" />
     <locale android:name="sv" />
     <locale android:name="sw" />
-    <locale android:name="ta" />
     <locale android:name="th" />
     <locale android:name="tr" />
     <locale android:name="uk" />

android/sdk/src/main/res/values-de/types_strings.xml

@@ -43,10 +43,9 @@
     <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">Ladestation</string>
-    <string name="type.amenity.charging_station.bicycle">Fahrräder</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorräder</string>
+    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcar">Autos</string>
+    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</string>
-    <string name="type.amenity.charging_station.small">Begrenzte Kapazität</string>
     <string name="type.amenity.childcare">Kindertagesstätte</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingbahn</string>

android/sdk/src/main/res/values/types_strings.xml

@@ -53,10 +53,9 @@
     <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">Charging Station</string>
-    <string name="type.amenity.charging_station.bicycle">Bicycles</string>
+    <string name="type.amenity.charging_station.bicycle">Bicycle Charging Station</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorcycles</string>
+    <string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
-    <string name="type.amenity.charging_station.motorcar">Cars</string>
+    <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
-    <string name="type.amenity.charging_station.small">Limited Capacity</string>
     <string name="type.amenity.childcare">Nursery</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.amenity.studio">Media Studio</string>
@@ -932,11 +931,11 @@
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Railway</string>
     <string name="type.railway.abandoned">Abandoned Railway</string>
+    <string name="type.railway.abandoned.bridge">Abandoned Railway Bridge</string>
+    <string name="type.railway.abandoned.tunnel">Abandoned Railway Tunnel</string>
     <string name="type.railway.construction">Railway Construction</string>
     <string name="type.railway.crossing">Railway Crossing</string>
     <string name="type.railway.disused">Disused Railway</string>
-    <string name="type.railway.disused.bridge">Disused Railway Bridge</string>
-    <string name="type.railway.disused.tunnel">Disused Railway Tunnel</string>
     <string name="type.railway.funicular">Funicular</string>
     <string name="type.railway.funicular.bridge">Funicular Bridge</string>
     <string name="type.railway.funicular.tunnel">Funicular Tunnel</string>

data/categories-strings/de.json/localize.json

@@ -331,9 +331,7 @@
 "amenity-car_wash": "4Autowaschanlage|Autowäsche",
 "amenity-veterinary": "4Tierarzt|4Tierärztin|4Tierarztpraxis|4Tierpraxis|4Tierdoktor|5Hundearzt|5Katzenarzt|4Haustiere|U+2695",
 "@charging_station": "4Ladestation|aufladen",
-"amenity-charging_station-bicycle|@charging_station": "5Fahrradladestation|Fahrrad aufladen|E-Bike aufladen|Fahrrad laden|E-Bike laden",
+"amenity-charging_station-bicycle|@charging_station": "Fahrrad aufladen",
-"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-childcare": "Kindertagesstätte|Kindergarten|Kinderbetreuung",
 "amenity-bicycle_parking": "6Fahrradständer",
 "amenity-waste_basket": "6Abfalleimer|4Mülleimer|4Restmüll|3Müll|4Müllkorb|U+1F6AE|U+1F5D1",
@@ -518,6 +516,7 @@
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "4Attraktion|4Labyrinth",
 "building-guardhouse": "4Wache",
 "shop-lighting|@shop": "Leuchtmittel|Lampen|Leuchte",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Autoladestation|5Autoladegerät|4Ladestation|4Ladegerät|U+1F50C|U+1FAAB|U+1F50B",
 "amenity-mobile_money_agent": "6Mobile Money Vertretung|6Mobile Money|6Mobiles Geld",
 "man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Teleskop",
 "amenity-sailing_school": "5Segelschule|5Bootsschule|Bootsfahrschule",

data/categories-strings/en.json/localize.json

@@ -353,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",
+"@charging_station": "4Charging Station|charging",
 "amenity-charging_station|@charging_station": "",
-"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging Station|Bicycle Charging|Bike Charging",
+"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging",
-"amenity-charging_station-motorcycle|@charging_station": "5Motorcycle Charging Station|Motorcycle Charging|Motorbike Charging",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
-"amenity-charging_station-motorcar|@charging_station": "3Car Charging Station|Motorcar Charging|Car Charging",
 "amenity-childcare": "Nursery|4Child Care|childcare",
 "amenity-bicycle_parking": "4Bicycle Parking|4Bike Parking",
 "amenity-waste_basket": "4Trash Bin|4litter bin|5waste basket|bin",

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|4Estación de carga|3Estación de carga|Cargador",
+"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Cargador de autos|cargador de coches|cargador de carros|4Estación de carga|3Estación de carga|Cargador",
 "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",

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",

data/categories-strings/lt.json/localize.json

@@ -1,543 +1 @@
-{
+{}
-"@category_eat": "",
-"@category_food": "",
-"@category_transport": "",
-"@category_fuel": "",
-"@category_parking": "",
-"@category_shopping": "",
-"@category_hotel": "",
-"@category_tourism": "",
-"@category_entertainment": "",
-"@category_nightlife": "",
-"@category_children": "",
-"@category_atm": "",
-"@category_rv": "",
-"amenity-atm|@category_atm": "",
-"@category_bank": "",
-"@category_secondhand": "",
-"amenity-bank|@category_bank": "",
-"@category_recycling": "",
-"amenity-bureau_de_change": "",
-"amenity-studio": "",
-"amenity-bar|amenity-pub|@category_eat|@category_nightlife": "",
-"amenity-cafe|@category_eat": "",
-"amenity-fast_food|@category_eat": "",
-"amenity-restaurant|@category_eat": "",
-"amenity-fuel|@category_fuel": "",
-"@shop": "",
-"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "",
-"shop|@shop": "",
-"shop-cannabis|@shop": "",
-"shop-cosmetics|@category_shopping|@shop": "",
-"shop-convenience|@category_food|@shop": "",
-"shop-deli|@category_food|@shop": "",
-"shop-farm|@category_food|@shop": "",
-"shop-garden_centre|@shop": "",
-"shop-grocery|@category_food|@shop": "",
-"shop-health_food|@category_food|@shop": "",
-"shop-hearing_aids|@shop": "",
-"shop-mobile_phone|@shop": "",
-"shop-florist|@shop": "",
-"shop-butcher|@category_food|@shop": "",
-"shop-furniture|@shop": "",
-"shop-kitchen|@shop": "",
-"shop-alcohol|@category_food|@shop": "",
-"shop-books|@shop": "",
-"shop-shoes|@category_shopping|@shop": "",
-"shop-electronics|@shop": "",
-"shop-hardware|shop-doityourself|@shop": "",
-"shop-houseware|@shop": "",
-"shop-jewelry|@category_shopping|@shop": "",
-"shop-optician|@shop": "",
-"shop-gift|@category_shopping|@shop": "",
-"shop-beauty": "",
-"shop-beauty-nails": "",
-"shop-greengrocer|@category_food|@shop": "",
-"shop-sports|@category_shopping|@shop": "",
-"shop-supermarket|@category_food|@shop": "",
-"shop-mall|@category_shopping|@shop": "",
-"shop-department_store|@category_shopping|@shop": "",
-"shop-beverages|@category_food|@shop": "",
-"shop-computer|@shop": "",
-"shop-confectionery|craft-confectionery|@category_food|@shop": "",
-"shop-laundry": "",
-"shop-toys|@category_children|@shop": "",
-"amenity-marketplace|@category_food": "",
-"amenity-mobile_money_agent": "",
-"amenity-money_transfer": "",
-"shop-clothes|@category_shopping|@shop": "",
-"shop-caravan|@category_rv|@shop": "",
-"shop-car|@shop": "",
-"shop-bicycle|@shop": "",
-"shop-kiosk": "",
-"highway-bus_stop|@category_transport": "",
-"railway-tram_stop|@category_transport": "",
-"amenity-bus_station|@category_transport": "",
-"railway-station|railway-halt|building-train_station|@category_transport": "",
-"railway-station-funicular": "",
-"railway-station-subway|@category_transport": "",
-"amenity-ferry_terminal|@category_transport": "",
-"amenity-taxi|@category_transport": "",
-"amenity-townhall": "",
-"tourism-attraction|@category_tourism": "",
-"tourism-artwork": "",
-"tourism-artwork-sculpture": "",
-"tourism-artwork-statue": "",
-"tourism-artwork-painting": "",
-"tourism-viewpoint|@category_tourism": "",
-"tourism-information": "",
-"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "",
-"amenity-place_of_worship": "",
-"amenity-place_of_worship-christian": "",
-"amenity-place_of_worship-muslim": "",
-"amenity-place_of_worship-buddhist": "",
-"amenity-place_of_worship-hindu": "",
-"amenity-place_of_worship-shinto": "",
-"amenity-place_of_worship-jewish": "",
-"amenity-place_of_worship-taoist": "",
-"tourism-museum|@category_tourism": "",
-"waterway-waterfall|@category_tourism": "",
-"historic-archaeological_site|@category_tourism": "",
-"historic-battlefield": "",
-"historic-stone": "",
-"historic-boundary_stone": "",
-"historic-castle|@category_tourism": "",
-"historic-city_gate|@category_tourism": "",
-"historic-citywalls|@category_tourism": "",
-"historic-fort|@category_tourism": "",
-"historic-gallows|@category_tourism": "",
-"historic-memorial|@category_tourism": "",
-"historic-memorial-cross": "",
-"historic-memorial-plaque": "",
-"historic-memorial-sculpture|@category_tourism": "",
-"historic-memorial-statue|@category_tourism": "",
-"historic-memorial-stolperstein": "",
-"historic-memorial-war_memorial|@category_tourism": "",
-"historic-monument|@category_tourism": "",
-"historic-pillory|@category_tourism": "",
-"historic-cannon": "",
-"historic-anchor": "",
-"historic-ruins|@category_tourism": "",
-"historic-mine": "",
-"historic-ship|@category_tourism": "",
-"historic-wreck": "",
-"historic-locomotive|@category_tourism": "",
-"historic-tank|@category_tourism": "",
-"historic-aircraft|@category_tourism": "",
-"historic-tomb|@category_tourism": "",
-"man_made-cross": "",
-"historic-wayside_cross": "",
-"historic-wayside_shrine": "",
-"leisure-dog_park": "",
-"leisure-dance|@category_entertainment": "",
-"leisure-garden": "",
-"leisure-firepit": "",
-"amenity-bench|amenity-bench-backless": "",
-"amenity-boat_rental": "",
-"amenity-bicycle_rental": "",
-"amenity-bicycle_repair_station": "",
-"amenity-car_sharing": "",
-"amenity-car_rental": "",
-"amenity-motorcycle_rental": "",
-"amenity-cinema|@category_entertainment": "",
-"leisure-bowling_alley|@category_entertainment": "",
-"amenity-theatre|@category_entertainment": "",
-"amenity-nightclub|@category_entertainment|@category_nightlife": "",
-"amenity-brothel": "",
-"amenity-love_hotel": "",
-"@gambling": "",
-"amenity-gambling|@gambling": "",
-"amenity-casino|@category_entertainment|@category_nightlife|@gambling": "",
-"leisure-adult_gaming_centre|@gambling": "",
-"leisure-amusement_arcade|@category_entertainment": "",
-"amenity-college": "",
-"amenity-fire_station": "",
-"amenity-fountain": "",
-"amenity-grave_yard|landuse-cemetery": "",
-"shop-funeral_directors": "",
-"@category_hospital": "",
-"amenity-hospital|@category_hospital": "",
-"amenity-clinic|@category_hospital": "",
-"amenity-doctors|@category_hospital": "",
-"amenity-dentist": "",
-"healthcare-laboratory": "",
-"healthcare-physiotherapist": "",
-"healthcare-alternative": "",
-"healthcare-audiologist": "",
-"healthcare-blood_donation": "",
-"healthcare-optometrist": "",
-"healthcare-podiatrist": "",
-"healthcare-psychotherapist": "",
-"healthcare-sample_collection": "",
-"healthcare-speech_therapist": "",
-"amenity-hunting_stand": "",
-"amenity-kindergarten": "",
-"amenity-library": "",
-"amenity-parking|amenity-parking_entrance|@category_parking": "",
-"@category_pharmacy": "",
-"amenity-pharmacy|@category_pharmacy": "",
-"@category_post": "",
-"amenity-post_box|@category_post": "",
-"amenity-post_office|post_office-post_partner|@category_post": "",
-"amenity-vehicle_inspection": "",
-"amenity-waste_disposal": "",
-"amenity-recycling-centre|@category_recycling": "",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "",
-"recycling-batteries|@category_recycling": "",
-"recycling-clothes|@category_recycling": "",
-"recycling-glass_bottles|@category_recycling": "",
-"recycling-paper|@category_recycling": "",
-"recycling-plastic|@category_recycling": "",
-"recycling-plastic_bottles|@category_recycling": "",
-"recycling-scrap_metal|@category_recycling": "",
-"recycling-small_appliances|@category_recycling": "",
-"recycling-cardboard|@category_recycling": "",
-"recycling-cans|@category_recycling": "",
-"recycling-shoes|@category_recycling": "",
-"recycling-green_waste|@category_recycling": "",
-"recycling-cartons|@category_recycling": "",
-"amenity-sanitary_dump_station|@category_rv": "",
-"amenity-school": "",
-"amenity-shelter": "",
-"amenity-shelter-basic_hut": "",
-"amenity-shelter-lean_to": "",
-"amenity-stripclub": "",
-"amenity-telephone": "",
-"@category_toilet": "",
-"amenity-toilets|toilets-yes|@category_toilet": "",
-"amenity-university": "",
-"place-continent": "",
-"place-country": "",
-"place-city": "",
-"place-town": "",
-"place-city-capital": "",
-"place-county": "",
-"place-state": "",
-"place-region": "",
-"place-island|place-islet": "",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "",
-"place-hamlet": "",
-"place-village": "",
-"place-locality": "",
-"place-farm": "",
-"highway-raceway": "",
-"highway-path|highway-footway|highway-steps|highway-cycleway": "",
-"highway-pedestrian|highway-primary|highway-primary_link|highway-residential|highway-secondary|highway-secondary_link|highway-tertiary|highway-tertiary_link|highway-service|highway-road|highway-track|highway-trunk|highway-trunk_link|highway-living_street|highway-unclassified|highway-motorway_link|highway-motorway|highway-cycleway": "",
-"highway-motorway_junction": "",
-"highway-elevator": "",
-"@mountain": "",
-"natural-peak|@mountain": "",
-"natural-saddle|mountain_pass": "",
-"natural-strait": "",
-"landuse-forest": "",
-"leisure-park": "",
-"tourism-aquarium|@category_tourism": "",
-"tourism-hostel|@category_hotel": "",
-"tourism-hotel|@category_hotel": "",
-"tourism-guest_house|@category_hotel": "",
-"tourism-motel|@category_hotel": "",
-"tourism-alpine_hut|@category_hotel": "",
-"shop-hairdresser": "",
-"aeroway-aerodrome": "",
-"leisure-stadium": "",
-"leisure-playground|@category_children": "",
-"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "",
-"leisure-sports_centre-sport-swimming": "",
-"leisure-golf_course": "",
-"leisure-miniature_golf": "",
-"leisure-escape_game": "",
-"leisure-hackerspace": "",
-"leisure-pitch": "",
-"leisure-swimming_pool": "",
-"leisure-swimming_pool-private": "",
-"sport-american_football": "",
-"sport-archery": "",
-"sport-athletics": "",
-"sport-australian_football": "",
-"sport-baseball": "",
-"sport-basketball": "",
-"sport-beachvolleyball": "",
-"sport-bowls": "",
-"sport-chess": "",
-"sport-cricket": "",
-"sport-curling": "",
-"sport-equestrian": "",
-"sport-golf": "",
-"sport-gymnastics": "",
-"sport-handball": "",
-"sport-scuba_diving": "",
-"sport-shooting": "",
-"sport-skateboard": "",
-"sport-skiing": "",
-"sport-soccer": "",
-"sport-swimming": "",
-"sport-table_tennis": "",
-"sport-tennis": "",
-"sport-padel": "",
-"sport-volleyball": "",
-"sport-9pin": "",
-"sport-10pin": "",
-"building": "",
-"building-address": "",
-"@category_police": "",
-"amenity-police|@category_police": "",
-"office-diplomatic": "",
-"natural-bay": "",
-"@category_water": "",
-"amenity-drinking_water|drinking_water-yes|@category_water": "",
-"natural-hot_spring|@category_water": "",
-"natural-spring|@category_water": "",
-"man_made-water_well|@category_water": "",
-"amenity-water_point|@category_water|@category_rv": "",
-"man_made-water_tap|@category_water": "",
-"@waterbody": "",
-"natural-water|@waterbody": "",
-"natural-water-basin|landuse-basin|@waterbody": "",
-"natural-water-pond|@waterbody": "",
-"natural-water-lake|@waterbody": "",
-"natural-water-reservoir|landuse-reservoir|@waterbody": "",
-"waterway-river|waterway-stream|natural-water-river": "",
-"waterway-canal": "",
-"shop-car_repair": "",
-"tourism-camp_site|@category_hotel": "",
-"tourism-caravan_site|@category_rv||@category_hotel": "",
-"office": "",
-"office-company": "",
-"office-government": "",
-"office-lawyer": "",
-"office-telecommunication": "",
-"craft-beekeeper": "",
-"craft-blacksmith": "",
-"craft-brewery": "",
-"craft-caterer": "",
-"craft-carpenter": "",
-"craft-confectionery": "",
-"craft-electrician": "",
-"craft-electronics_repair": "",
-"craft-gardener": "",
-"craft-grinding_mill": "",
-"craft-handicraft": "",
-"craft-hvac": "",
-"craft-metal_construction": "",
-"craft-key_cutter": "",
-"craft-locksmith": "",
-"craft-painter": "",
-"craft-photographer": "",
-"craft-plumber": "",
-"craft-sawmill": "",
-"craft-shoemaker": "",
-"craft-winery": "",
-"craft-tailor": "",
-"area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "",
-"place-sea": "",
-"place-ocean": "",
-"@category_wifi": "",
-"internet_access|internet_access-wlan|@category_wifi": "",
-"natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "",
-"man_made-lighthouse": "",
-"man_made-survey_point": "",
-"man_made-flagpole": "",
-"man_made-mast": "",
-"man_made-communications_tower|man_made-tower-communication": "",
-"man_made-petroleum_well": "",
-"organic-only|organic-yes": "",
-"shop-copyshop": "",
-"shop-photo|@shop": "",
-"shop-camera|@shop": "",
-"shop-travel_agency": "",
-"shop-outdoor|@shop": "",
-"shop-dry_cleaning": "",
-"shop-tyres|@shop": "",
-"amenity-car_wash": "",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "",
-"man_made-observatory": "",
-"amenity-veterinary": "",
-"amenity-animal_shelter": "",
-"@charging_station": "",
-"amenity-charging_station|@charging_station": "",
-"amenity-charging_station-bicycle|@charging_station": "",
-"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "",
-"amenity-childcare": "",
-"amenity-bicycle_parking": "",
-"amenity-waste_basket": "",
-"emergency-phone": "",
-"leisure-fitness_centre": "",
-"leisure-sauna": "",
-"shop-car_repair-tyres|shop-car_repair": "",
-"shop-chemist|@shop": "",
-"shop-pet|@shop": "",
-"tourism-zoo|@category_tourism|@category_children": "",
-"attraction-animal": "",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "",
-"amenity-community_centre": "",
-"amenity-compressed_air": "",
-"amenity-courthouse": "",
-"amenity-vending_machine": "",
-"amenity-vending_machine-cigarettes": "",
-"amenity-vending_machine-coffee": "",
-"amenity-vending_machine-condoms": "",
-"amenity-vending_machine-drinks": "",
-"amenity-vending_machine-food|@category_food": "",
-"amenity-vending_machine-parking_tickets|@category_parking": "",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "",
-"amenity-vending_machine-newspapers": "",
-"amenity-vending_machine-sweets": "",
-"amenity-vending_machine-excrement_bags": "",
-"amenity-parcel_locker|@category_post": "",
-"shop-outpost": "",
-"amenity-vending_machine-fuel|@category_fuel": "",
-"building-garage": "",
-"highway-rest_area|highway-services": "",
-"man_made-chimney": "",
-"man_made-crane": "",
-"man_made-tower|man_made-flare": "",
-"shop-bookmaker|@gambling": "",
-"shop-seafood|@category_food|@shop": "",
-"shop-second_hand|@category_shopping|@shop|@category_secondhand": "",
-"shop-charity|@shop|@category_secondhand": "",
-"shop-ticket": "",
-"shop-wine|@category_food|@shop": "",
-"shop-car_parts|@shop": "",
-"tourism-chalet|@category_hotel": "",
-"tourism-information-board": "",
-"tourism-information-map": "",
-"tourism-information-tactile_map": "",
-"tourism-information-guidepost": "",
-"aerialway-station": "",
-"aeroway-helipad": "",
-"barrier-border_control": "",
-"leisure-water_park|@category_tourism|@category_children": "",
-"man_made-water_tower": "",
-"man_made-windmill": "",
-"natural-cave_entrance": "",
-"natural-volcano|@mountain": "",
-"office-estate_agent": "",
-"waterway-lock_gate": "",
-"amenity-public_bookcase": "",
-"sport-climbing": "",
-"sport-yoga": "",
-"leisure-fitness_centre-sport-yoga": "",
-"tourism-apartment|@category_hotel": "",
-"leisure-resort|@category_hotel": "",
-"amenity-biergarten|@category_eat|@category_nightlife": "",
-"amenity-driving_school": "",
-"amenity-sailing_school": "",
-"amenity-flight_school": "",
-"amenity-prep_school": "",
-"amenity-music_school": "",
-"amenity-language_school": "",
-"amenity-ice_cream": "",
-"amenity-internet_cafe": "",
-"amenity-motorcycle_parking": "",
-"amenity-parking_space-disabled|@category_parking": "",
-"amenity-car_pooling|@category_parking": "",
-"amenity-nursing_home": "",
-"amenity-payment_terminal": "",
-"amenity-payment_centre": "",
-"amenity-public_bath": "",
-"amenity-shower": "",
-"emergency-access_point": "",
-"emergency-assembly_point": "",
-"emergency-life_ring": "",
-"emergency-defibrillator": "",
-"emergency-fire_hydrant": "",
-"amenity-hydrant": "",
-"emergency-lifeguard": "",
-"emergency-mountain_rescue": "",
-"leisure-fitness_station": "",
-"office-insurance": "",
-"office-ngo": "",
-"shop-erotic|@shop": "",
-"shop-beauty-day_spa": "",
-"shop-massage": "",
-"shop-motorcycle|@shop": "",
-"shop-motorcycle_repair": "",
-"shop-newsagent": "",
-"shop-pawnbroker": "",
-"shop-stationery|@shop": "",
-"shop-tattoo": "",
-"shop-variety_store|@category_shopping|@shop": "",
-"shop-video|@shop": "",
-"shop-video_games|@shop": "",
-"tourism-wilderness_hut|@category_hotel": "",
-"tourism-gallery|@category_tourism": "",
-"tourism-theme_park|@category_tourism|@category_children": "",
-"boundary-national_park|@category_tourism": "",
-"leisure-nature_reserve|@category_tourism": "",
-"natural-cape": "",
-"natural-geyser": "",
-"natural-glacier|@category_tourism": "",
-"highway-ford": "",
-"leisure-marina": "",
-"leisure-indoor_play": "",
-"piste:type-downhill|piste:type-nordic": "",
-"amenity-events_venue": "",
-"shop-chocolate|@category_food|@shop": "",
-"shop-coffee|@category_food|@shop": "",
-"shop-fabric|@shop": "",
-"shop-money_lender": "",
-"shop-music|@shop": "",
-"shop-musical_instrument|@shop": "",
-"shop-tea|@shop": "",
-"shop-telecommunication|@shop": "",
-"shop-antiques|@category_shopping|@shop|@category_secondhand": "",
-"shop-art|@category_shopping|@shop": "",
-"shop-baby_goods|@category_children|@shop": "",
-"shop-bag|@category_shopping|@shop": "",
-"shop-cheese|@category_food|@shop": "",
-"shop-dairy|@category_food|@shop": "",
-"shop-electrical|@shop": "",
-"shop-fishing|@shop": "",
-"shop-interior_decoration|@shop": "",
-"shop-lighting|@shop": "",
-"shop-lottery|@gambling": "",
-"shop-medical_supply|@shop": "",
-"shop-nutrition_supplements|@shop": "",
-"shop-paint|@shop": "",
-"shop-perfumery|@category_shopping|@shop": "",
-"shop-sewing|@shop": "",
-"shop-storage_rental": "",
-"shop-tobacco|@shop": "",
-"shop-trade|@shop": "",
-"shop-watches|@category_shopping|@shop": "",
-"shop-wholesale|@shop": "",
-"leisure-track": "",
-"leisure-bandstand": "",
-"power-plant": "",
-"power-generator-wind": "",
-"shop-auction|@category_secondhand": "",
-"shop-collector|@category_shopping|@category_secondhand": "",
-"man_made-cairn": "",
-"wheelchair-yes": "",
-"amenity-social_facility": "",
-"social_facility-soup_kitchen": "",
-"social_facility-food_bank": "",
-"amenity-food_sharing": "",
-"amenity-give_box": "",
-"leisure-sports_hall": "",
-"amenity-arts_centre|@category_tourism": "",
-"amenity-prison": "",
-"amenity-exhibition_centre": "",
-"shop-bathroom_furnishing|@shop": "",
-"shop-bed|@shop": "",
-"shop-boutique|@shop": "",
-"amenity-food_court": "",
-"shop-curtain|@shop": "",
-"shop-gas|@shop": "",
-"shop-pet_grooming": "",
-"shop-hifi|@shop": "",
-"amenity-conference_centre": "",
-"shop-herbalist|@shop": "",
-"shop-appliance|@shop": "",
-"shop-agrarian|@shop": "",
-"shop-fashion_accessories|@shop": "",
-"amenity-waste_transfer_station": "",
-"shop-carpet|@shop": "",
-"shop-craft|@shop": "",
-"shop-pasta|@shop": "",
-"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "",
-"amenity-luggage_locker": "",
-"office-security": "",
-"building-guardhouse": ""
-}

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",

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Мусорная корзина",

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",

data/mapcss-mapping.csv

@@ -302,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.
@@ -403,14 +403,15 @@ place|farm;294;
 deprecated:boundary|administrative|11:04.2024;[boundary=administrative][admin_level=11];x;name;int_name;295;
 waterway|weir;296;
 highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
-railway|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;
+# 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;
@@ -510,7 +511,8 @@ railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int
 highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397;
 railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398;
 railway|rail|tourism;[railway=rail][usage=tourism][!service];;name;int_name;399;
-railway|disused|tunnel;[railway=disused][tunnel?],[railway=abandoned][tunnel?];;name;int_name;400;
+# TODO: its a mismapping likely, if there is a tunnel structure still, then it should be railway=disused.
+railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400;
 area:highway|living_street;401;
 piste:type|sled;402;
 leisure|beach_resort;403;
@@ -1191,7 +1193,7 @@ shop|tyres;1064;
 craft|beekeeper;1065;
 amenity|car_wash;1066;
 amenity|veterinary;1067;
-amenity|charging_station;[amenity=charging_station];;name;int_name;1068;
+amenity|charging_station;1068;
 amenity|childcare;1069;
 craft|blacksmith;1070;
 amenity|bicycle_parking;1071;

data/styles/default/include/Basemap.mapcss

@@ -559,9 +559,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;}

data/styles/default/include/Icons.mapcss

@@ -2399,28 +2399,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;}

data/styles/default/include/Roads.mapcss

@@ -1217,14 +1217,14 @@ line|z13-[railway=subway][bridge?]::bridgewhite,
 line|z13-[railway=light_rail][bridge?]::bridgewhite,
 line|z15-[railway=preserved][bridge?]::bridgewhite,
 line|z16-[railway=miniature][bridge?]::bridgewhite,
-line|z16-[railway=disused][bridge?]::bridgewhite,
+line|z16-[railway=abandoned][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z16-[railway=rail][bridge?]::bridgeblack,
 line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
 line|z16-[railway=miniature][bridge?]::bridgeblack,
-line|z16-[railway=disused][bridge?]::bridgeblack,
+line|z16-[railway=abandoned][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 
 /* 9.1 RAIL 11-22 ZOOM */
@@ -1375,11 +1375,11 @@ line|z18-[railway=light_rail][!tunnel]::dash,
 
 line|z15-[railway=preserved],
 line|z16-[railway=miniature],
-line|z16-[railway=disused],
+line|z16-[railway=abandoned],
 {width: 1.6;dashes: 6.3,6.3;}
 
 line|z15-[railway=construction],
-line|z16-[railway=abandoned],
+line|z16-[railway=disused],
 {width: 1;dashes: 1.8,5.4;}
 
 line|z17-[railway=turntable],
@@ -1434,21 +1434,21 @@ line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
 line|z16[railway=miniature][bridge?]::bridgewhite,
-line|z16[railway=disused][bridge?]::bridgewhite,
+line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
 line|z17[railway=miniature][bridge?]::bridgewhite,
-line|z17[railway=disused][bridge?]::bridgewhite,
+line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
 line|z18-[railway=miniature][bridge?]::bridgewhite,
-line|z18-[railway=disused][bridge?]::bridgewhite,
+line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}
 
 line|z16[railway=rail][bridge?]::bridgeblack,
@@ -1456,21 +1456,21 @@ line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
 line|z16[railway=miniature][bridge?]::bridgeblack,
-line|z16[railway=disused][bridge?]::bridgeblack,
+line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
 line|z17[railway=miniature][bridge?]::bridgeblack,
-line|z17[railway=disused][bridge?]::bridgeblack,
+line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
 line|z18-[railway=miniature][bridge?]::bridgeblack,
-line|z18-[railway=disused][bridge?]::bridgeblack,
+line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}
 
 /* 9.4 Monorail 14-22 ZOOM */

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                            # area z16- (also has icon z16-, caption(optional) z16-)
-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-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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, 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-)

data/styles/default/include/priorities_3_FG.prio.txt

@@ -295,10 +295,10 @@ highway-track-tunnel                                # line z15- (also has line::
 highway-construction                                # line z13- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z16-
+railway-abandoned-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z15-
 railway-disused                                     # line z16-
-railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-disused-tunnel                              # line z16-
 railway-miniature                                   # line z16-
 railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-miniature-tunnel                            # line z16-
@@ -354,7 +354,7 @@ highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (al
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
@@ -391,7 +391,7 @@ highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (al
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)

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-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
-=== 3752
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
-
+shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3751
-
-amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 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-)
@@ -1651,13 +1641,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
 
@@ -1701,23 +1691,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-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
-# === -6248
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
-
+# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6249
-
-# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -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-)

data/styles/outdoors/include/Roads.mapcss

@@ -559,18 +559,18 @@ line|z13-[railway=abandoned],
 
 line|z13-[railway=preserved],
 line|z13-[railway=miniature],
-line|z13-[railway=disused]
+line|z13-[railway=abandoned]
 {width: 1.6; dashes: 6.3,6.3;}
 line|z16-[railway=preserved],
 line|z16-[railway=miniature],
-line|z16-[railway=disused]
+line|z16-[railway=abandoned]
 {width: 2.2; dashes: 8,8;}
 
 line|z13-[railway=construction],
-line|z13-[railway=abandoned]
+line|z13-[railway=disused]
 {width: 1; dashes: 1.8,5.5;}
 line|z16-[railway=construction],
-line|z16-[railway=abandoned]
+line|z16-[railway=disused]
 {width: 1.7; dashes: 2.5,7;}
 
 line|z12[railway=rail][tunnel?],

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                            # area z16- (also has icon z16-, caption(optional) z16-)
-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-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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, 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-)

data/styles/outdoors/include/priorities_3_FG.prio.txt

@@ -297,10 +297,10 @@ highway-track-tunnel                                # line z11- (also has line::
 highway-construction                                # line z11- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z13-
+railway-abandoned-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-abandoned-tunnel                            # line z13-
 railway-construction                                # line z13-
 railway-disused                                     # line z13-
-railway-disused-bridge                              # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-disused-tunnel                              # line z13-
 railway-miniature                                   # line z13-
 railway-miniature-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-miniature-tunnel                            # line z13-
@@ -356,7 +356,7 @@ highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (al
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
+railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
@@ -393,7 +393,7 @@ highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (al
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
+railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)

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-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
-=== 3752
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
-
+shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
-=== 3751
-
-amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 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-)
@@ -1654,13 +1644,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
 
@@ -1704,23 +1694,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-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
-# === -6248
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
-
+# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
-# === -6249
-
-# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -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-)

data/styles/vehicle/include/Basemap.mapcss

@@ -350,10 +350,9 @@ area|z13-[highway=services],
 area|z13-[highway=rest_area],
 area|z13-[landuse=garages],
 
-area|z15-[amenity=recycling][recycling_type=centre],
-area|z15-[amenity=fuel],
 area|z15-[amenity=charging_station][motorcar?],
-area|z16-[amenity=charging_station],
+area|z15-[amenity=fuel],
+area|z15-[amenity=recycling][recycling_type=centre],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
 area|z17-[amenity=motorcycle_parking],

data/styles/vehicle/include/Icons.mapcss

@@ -630,28 +630,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|z14-[amenity=charging_station][motorcar?][!capacity],
-node|z16-[amenity=charging_station][motorcycle?],
+node|z14-[amenity=charging_station][motorcar?][capacity=1],
-node|z16-[amenity=charging_station][bicycle?],
+node|z14-[amenity=charging_station][motorcar?][capacity=2],
-node|z16-[amenity=charging_station][motorcar=not],
 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;}

data/styles/vehicle/include/Roads.mapcss

@@ -743,7 +743,7 @@ line|z14-[railway=subway][bridge?]::bridgewhite,
 line|z14-[railway=light_rail][bridge?]::bridgewhite,
 line|z16-[railway=preserved][bridge?]::bridgewhite,
 line|z16-[railway=miniature][bridge?]::bridgewhite,
-line|z16-[railway=disused][bridge?]::bridgewhite,
+line|z16-[railway=abandoned][bridge?]::bridgewhite,
 line|z16-[railway=tram][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;}
 line|z16-[railway=rail][bridge?]::bridgeblack,
@@ -751,7 +751,7 @@ line|z16-[railway=subway][bridge?]::bridgeblack,
 line|z16-[railway=light_rail][bridge?]::bridgeblack,
 line|z16-[railway=preserved][bridge?]::bridgeblack,
 line|z16-[railway=miniature][bridge?]::bridgeblack,
-line|z16-[railway=disused][bridge?]::bridgeblack,
+line|z16-[railway=abandoned][bridge?]::bridgeblack,
 line|z16-[railway=tram][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;}
 
@@ -915,11 +915,11 @@ line|z19-[railway=light_rail][!tunnel]::dash,
 
 line|z16-[railway=preserved],
 line|z16-[railway=miniature],
-line|z16-[railway=disused]
+line|z16-[railway=abandoned]
 {width: 1.6;dashes: 6.3,6.3;}
 
 line|z16-[railway=construction],
-line|z16-[railway=abandoned]
+line|z16-[railway=disused]
 {width: 1;dashes: 1.8,5.4;}
 
 line|z17-[railway=turntable],
@@ -954,21 +954,21 @@ line|z16[railway=subway][bridge?]::bridgewhite,
 line|z16[railway=light_rail][bridge?]::bridgewhite,
 line|z16[railway=preserved][bridge?]::bridgewhite,
 line|z16[railway=miniature][bridge?]::bridgewhite,
-line|z16[railway=disused][bridge?]::bridgewhite,
+line|z16[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 1.6;}
 line|z17[railway=rail][bridge?]::bridgewhite,
 line|z17[railway=subway][bridge?]::bridgewhite,
 line|z17[railway=light_rail][bridge?]::bridgewhite,
 line|z17[railway=preserved][bridge?]::bridgewhite,
 line|z17[railway=miniature][bridge?]::bridgewhite,
-line|z17[railway=disused][bridge?]::bridgewhite,
+line|z17[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 2.3;}
 line|z18-[railway=rail][bridge?]::bridgewhite,
 line|z18-[railway=subway][bridge?]::bridgewhite,
 line|z18-[railway=light_rail][bridge?]::bridgewhite,
 line|z18-[railway=preserved][bridge?]::bridgewhite,
 line|z18-[railway=miniature][bridge?]::bridgewhite,
-line|z18-[railway=disused][bridge?]::bridgewhite,
+line|z18-[railway=abandoned][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}
 
 line|z16[railway=rail][bridge?]::bridgeblack,
@@ -976,21 +976,21 @@ line|z16[railway=subway][bridge?]::bridgeblack,
 line|z16[railway=light_rail][bridge?]::bridgeblack,
 line|z16[railway=preserved][bridge?]::bridgeblack,
 line|z16[railway=miniature][bridge?]::bridgeblack,
-line|z16[railway=disused][bridge?]::bridgeblack,
+line|z16[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 2.2;}
 line|z17[railway=rail][bridge?]::bridgeblack,
 line|z17[railway=subway][bridge?]::bridgeblack,
 line|z17[railway=light_rail][bridge?]::bridgeblack,
 line|z17[railway=preserved][bridge?]::bridgeblack,
 line|z17[railway=miniature][bridge?]::bridgeblack,
-line|z17[railway=disused][bridge?]::bridgeblack,
+line|z17[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 3;}
 line|z18-[railway=rail][bridge?]::bridgeblack,
 line|z18-[railway=subway][bridge?]::bridgeblack,
 line|z18-[railway=light_rail][bridge?]::bridgeblack,
 line|z18-[railway=preserved][bridge?]::bridgeblack,
 line|z18-[railway=miniature][bridge?]::bridgeblack,
-line|z18-[railway=disused][bridge?]::bridgeblack,
+line|z18-[railway=abandoned][bridge?]::bridgeblack,
 {casing-width-add: 4.4;}
 
 /* 9.4 Monorail 14-22 ZOOM */

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                            # area z16- (also has icon z16-, caption(optional) z16-)
-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-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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
 amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-vehicle_inspection                          # area z17- (also has icon z17-)

data/styles/vehicle/include/priorities_3_FG.prio.txt

@@ -272,10 +272,10 @@ highway-track-no-access                             # line z16-
 
 highway-construction                                # line z13-
 railway-abandoned                                   # line z16-
+railway-abandoned-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
+railway-abandoned-tunnel                            # line z16-
 railway-construction                                # line z16-
 railway-disused                                     # line z16-
-railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-disused-tunnel                              # line z16-
 railway-miniature                                   # line z16-
 railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-miniature-tunnel                            # line z16-
@@ -297,7 +297,7 @@ highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (al
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
@@ -324,7 +324,7 @@ highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (al
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)

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                            # 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
@@ -540,6 +529,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-)
@@ -793,28 +785,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                          # 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
@@ -1077,6 +1058,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-)

docs/INSTALL.md

@@ -21,7 +21,11 @@ Clone the repository including all submodules (see [Special cases options](#spec
 
 Follow the instructions for your OS, and afterwards the repository is prepared to build a CoMaps app!
 
-### Linux
+## Setting up to your OS of development
+
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">Linux</span></summary>
+
 Clone the repository
 ```bash
 git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/comaps.git
@@ -41,7 +45,11 @@ cd comaps
 
 If you plan to publish the app privately in stores check [special options](#special-cases-options).
 
-### Windows
+</details>
+
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">Windows</span></summary>
+  
 You need to have [Git for Windows](https://git-scm.com/download/win) installed and Git bash available in the PATH.
 
 It's necessary to enable symlink support:
@@ -69,7 +77,11 @@ For _Windows 10_:  You should be able to build the project by following either o
 **Setup 2: Using Visual Studio Developer Command Prompt**
 Install the [Visual Studio Developer Command Prompt](https://docs.microsoft.com/en-us/visualstudio/ide/reference/command-prompt-powershell?view=vs-2022) (make sure to choose the latest MSVC x64/x86 build tool and Windows 10/11 SDK as individual components while installing Visual Studio).
 
-### macOS
+</details>
+
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">macOS</span></summary>
+
 Install required build dependencies and Xcode
 1. Install Xcode Command Line Tools
 2. Install [Xcode](https://apps.apple.com/app/xcode/id497799835?mt=12) from the App Store
@@ -93,8 +105,10 @@ git clone --recurse-submodules --shallow-submodules https://codeberg.org/comaps/
 cd comaps
 ./configure.sh
 ```
+</details>
 
-### Special cases options
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">Special cases options</span></summary> 
 
 If you're only doing a one-off build or your internet bandwidth or disk space is limited, add following options to the `git clone` command:
 
@@ -114,7 +128,11 @@ It'll seamlessly replace the squashed first "Organic Maps sources as of 02.04.20
 The `om-historic.git` repo is ~1Gb only as various historic blobs, bundled 3rd-party deps, etc. were removed from it.
 If you really need them (e.g. to build a very old app version) then refer to full organicmaps.git repo please.
 
-## Android app
+</details>
+
+## Develop for:
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">Android app</span></summary> 
 
 ### Preparing
 
@@ -199,9 +217,10 @@ To enable logging in case of crashes, after installing a debug version, run:
 ```bash
 adb shell pm grant app.organicmaps.debug android.permission.READ_LOGS
 ```
+</details>
 
-
+<details open>
-### Android Auto Development
+  <summary><span style="font-size: 1.5em; font-weight: bold;">Android Auto</span></summary>
 
 Android Auto can be developed and tested without having a physical device by using [Desktop Head Unit (DHU)](https://developer.android.com/training/cars/testing/dhu). Go to Android Studio > Tools -> SDK Manager -> SDK Tools and enable "Android Auto Desktop Head Unit".
 
@@ -349,8 +368,10 @@ Example of command line for running system tracing:
 ```
 ./record_android_trace -a app.organicmaps.debug -o trace_file.perfetto-trace -t 30s -b 64mb sched freq idle am wm gfx view binder_driver hal dalvik camera input res memory
 ```
+</details>
 
-## iOS app
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">iOS app</span></summary>
 
 ### Preparing
 
@@ -401,7 +422,11 @@ Select "CoMaps" product scheme.
 
 Compile and run the project ("Product" → "Run").
 
-### CarPlay
+</details>
+
+<details open>
+  <summary><span style="font-size: 1.5em; font-weight: bold;">CarPlay</span></summary>
+
 To test CarPlay, simply select "I/O" → "External Displays" → "CarPlay" in the Simulator
 
 ### Spoofing GPS
@@ -411,6 +436,8 @@ To select an Apple predetermined track or specific custom location, choose "Feat
 
 To simulate a custom GPX track use `python3 tools/python/ios_simulator_load_gpx.py <path to your gpx>` which is a wrapper for `xcrun simctl location`. Default values are 60 km/h and 0.1s update intervals, but can be customized
 
+</details>
+
 ## Desktop app
 
 See [install_desktop](INSTALL_DESKTOP.md) to install and build Desktop app for Linux and Mac OS

generator/generator_tests/osm_type_test.cpp

@@ -2896,8 +2896,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
       {{"place", "state", "USA"}, {{"place", "state"}, {"is_in", "USA"}}},
       {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country", "USA"}}},
       {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country_code", "us"}}},
-      {{"railway", "disused", "bridge"}, {{"railway", "disused"}, {"bridge", "any_value"}}},
+      {{"railway", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}},
-      {{"railway", "disused", "tunnel"}, {{"railway", "disused"}, {"tunnel", "any_value"}}},
+      {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}},
       {{"railway", "funicular", "bridge"}, {{"railway", "funicular"}, {"bridge", "any_value"}}},
       {{"railway", "funicular", "tunnel"}, {{"railway", "funicular"}, {"tunnel", "any_value"}}},
       {{"railway", "light_rail", "bridge"}, {{"railway", "light_rail"}, {"bridge", "any_value"}}},

generator/osm2type.cpp

@@ -351,11 +351,6 @@ private:
 // - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
 void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
 {
-  auto const isChargingStation = [](auto const & lhs, auto const & rhs)
-  {
-    return lhs.size() > 1 && rhs.size() > 1 && lhs.at(1) == "charging_station" && rhs.at(1) == "charging_station" && lhs.at(0) == "amenity" && rhs.at(0) == "amenity";
-  };
-
   auto const equalPrefix = [](auto const & lhs, auto const & rhs)
   {
     size_t const prefixSz = std::min(lhs.size(), rhs.size());
@@ -374,11 +369,8 @@ void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
     return lhs < rhs;
   };
 
-  auto const isEqual = [&equalPrefix, &isChargingStation](auto const & lhs, auto const & rhs)
+  auto const isEqual = [&equalPrefix](auto const & lhs, auto const & rhs)
   {
-    if (isChargingStation(lhs, rhs))
-      return false;
-    
     if (equalPrefix(lhs, rhs))
     {
       // Keep longest type only, so return equal is true.

generator/road_access_generator.cpp

@@ -57,8 +57,6 @@ TagMapping const kMotorCarTagMapping = {
     {OsmElement::Tag("motorcar", "private"), RoadAccess::Type::Private},
     {OsmElement::Tag("motorcar", "destination"), RoadAccess::Type::Destination},
     {OsmElement::Tag("motorcar", "permit"), RoadAccess::Type::Permit},
-    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Destination},
-    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Destination},
 };
 
 TagMapping const kMotorVehicleTagMapping = {
@@ -79,6 +77,8 @@ TagMapping const kVehicleTagMapping = {
     {OsmElement::Tag("vehicle", "private"), RoadAccess::Type::Private},
     {OsmElement::Tag("vehicle", "destination"), RoadAccess::Type::Destination},
     {OsmElement::Tag("vehicle", "permit"), RoadAccess::Type::Permit},
+    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
+    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
 };
 
 TagMapping const kCarBarriersTagMapping = {
@@ -136,6 +136,8 @@ TagMapping const kDefaultTagMapping = {
     {OsmElement::Tag("access", "agricultural"), RoadAccess::Type::Private},
     {OsmElement::Tag("access", "forestry"), RoadAccess::Type::Private},
     {OsmElement::Tag("locked", "yes"), RoadAccess::Type::Locked},
+    {OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
+    {OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
 };
 
 // Removed secondary, tertiary from car list. Example https://www.openstreetmap.org/node/8169922700

iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm

@@ -32,7 +32,7 @@ NSDate * _Nullable ParseDateString(NSString * _Nullable dateString) {
     dateFormatter = [[NSDateFormatter alloc] init];
     dateFormatter.dateFormat = @"yyyy-MM-dd";
     dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-    dateFormatter.timeZone = [NSTimeZone localTimeZone];
+    dateFormatter.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
   });
   
   return [dateFormatter dateFromString:dateString];

iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings

@@ -43,10 +43,9 @@
 "type.leisure.adult_gaming_centre" = "Spielhalle für Erwachsene";
 "type.leisure.amusement_arcade" = "Spielhalle für Unterhaltungsspiele";
 "type.amenity.charging_station" = "Ladestation";
-"type.amenity.charging_station.motorcar" = "Autos";
+"type.amenity.charging_station.bicycle" = "Fahrrad-Ladestation";
-"type.amenity.charging_station.motorcycle" = "Motorräder";
+"type.amenity.charging_station.motorcar" = "Kfz-Ladestation";
-"type.amenity.charging_station.bicycle" = "Fahrräder";
+"type.amenity.charging_station.motorcar.small" = "Kfz-Ladestation";
-"type.amenity.charging_station.small" = "Begrenzte Kapazität";
 "type.amenity.childcare" = "Kindertagesstätte";
 "type.amenity.cinema" = "Kino";
 "type.leisure.bowling_alley" = "Bowlingbahn";

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -48,10 +48,9 @@
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
 "type.amenity.charging_station" = "Charging Station";
-"type.amenity.charging_station.motorcar" = "Cars";
+"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
-"type.amenity.charging_station.motorcycle" = "Motorcycles";
+"type.amenity.charging_station.motorcar" = "Car Charging Station";
-"type.amenity.charging_station.bicycle" = "Bicycles";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
-"type.amenity.charging_station.small" = "Limited Capacity";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -55,10 +55,9 @@
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
 "type.amenity.charging_station" = "Charging Station";
-"type.amenity.charging_station.motorcar" = "Cars";
+"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
-"type.amenity.charging_station.motorcycle" = "Motorcycles";
+"type.amenity.charging_station.motorcar" = "Car Charging Station";
-"type.amenity.charging_station.bicycle" = "Bicycles";
+"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
-"type.amenity.charging_station.small" = "Limited Capacity";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
@@ -1025,11 +1024,11 @@
 "type.public_transport.platform" = "Platform";
 "type.railway" = "Railway";
 "type.railway.abandoned" = "Abandoned Railway";
+"type.railway.abandoned.bridge" = "Abandoned Railway Bridge";
+"type.railway.abandoned.tunnel" = "Abandoned Railway Tunnel";
 "type.railway.construction" = "Railway Construction";
 "type.railway.crossing" = "Railway Crossing";
 "type.railway.disused" = "Disused Railway";
-"type.railway.disused.bridge" = "Disused Railway Bridge";
-"type.railway.disused.tunnel" = "Disused Railway Tunnel";
 "type.railway.funicular" = "Funicular";
 "type.railway.funicular.bridge" = "Funicular Bridge";
 "type.railway.funicular.tunnel" = "Funicular Tunnel";

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -5120,7 +5120,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2026.01.01;
+				MARKETING_VERSION = 2025.06.01;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5155,7 +5155,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2026.01.01;
+				MARKETING_VERSION = 2025.06.01;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5213,7 +5213,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2026.01.01;
+				MARKETING_VERSION = 2025.06.01;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug.widgetextension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5243,7 +5243,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2026.01.01;
+				MARKETING_VERSION = 2025.06.01;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.widgetextension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift

@@ -85,28 +85,10 @@ class OpeningHoursViewController: UIViewController {
         }
 
         if let checkDate = self.openingHoursCheckDate, self.expanded {
-          let dateString: String
+          let checkDateFormatter = RelativeDateTimeFormatter()
-                
+          checkDateFormatter.unitsStyle = .spellOut
-          // Check if the date is strictly "Today" or "Yesterday"
+          checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
-          if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
+          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
-            // Case 1: Today/Yesterday -> Use "today" / "yesterday"
-            // Can be replaced by Date.RelativeFormatStyle with iOS 18+
-            let checkDateFormatter = DateFormatter()
-            checkDateFormatter.dateStyle = .medium
-            checkDateFormatter.timeStyle = .none
-            checkDateFormatter.doesRelativeDateFormatting = true
-          
-            let rawString = checkDateFormatter.string(from: checkDate)
-            // Lowercase first letter: "Today" -> "today"
-            dateString = rawString.prefix(1).lowercased() + rawString.dropFirst()
-          } else {
-            // Case 2: Older -> Use "2 years ago"
-            let relativeCheckDateFormatter = RelativeDateTimeFormatter()
-            relativeCheckDateFormatter.unitsStyle = .spellOut
-            dateString = relativeCheckDateFormatter.localizedString(for: checkDate, relativeTo: Date())
-          }
-
-          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"), dateString)
 
           NSLayoutConstraint.activate([self.checkDateLabelTopLayoutConstraint])
           NSLayoutConstraint.activate([self.checkDateLabelBottomLayoutConstraint])

iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift

@@ -458,29 +458,11 @@ class PlacePageInfoViewController: UIViewController {
     setupOpenWithAppView()
 
     if let checkDate = placePageInfoData.checkDate {
-      let dateString: String
+      let checkDateFormatter = RelativeDateTimeFormatter()
-        
+      checkDateFormatter.unitsStyle = .spellOut
-      // Check if the date is strictly "Today" or "Yesterday"
+      checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
-      if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
+      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
-        // Case 1: Today/Yesterday -> Use "today" / "yesterday"
+        checkDateLabel.isHidden = false
-        // Can be replaced by Date.RelativeFormatStyle with iOS 18+
-        let checkDateFormatter = DateFormatter()
-        checkDateFormatter.dateStyle = .medium
-        checkDateFormatter.timeStyle = .none
-        checkDateFormatter.doesRelativeDateFormatting = true
-          
-        let rawString = checkDateFormatter.string(from: checkDate)
-        // Lowercase first letter: "Today" -> "today"
-        dateString = rawString.prefix(1).lowercased() + rawString.dropFirst()
-      } else {
-        // Case 2: Older -> Use "2 years ago"
-        let relativeCheckDateFormatter = RelativeDateTimeFormatter()
-        relativeCheckDateFormatter.unitsStyle = .spellOut
-        dateString = relativeCheckDateFormatter.localizedString(for: checkDate, relativeTo: Date())
-      }
-        
-      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"), dateString)
-      checkDateLabel.isHidden = false
       NSLayoutConstraint.activate([checkDateLabelLayoutConstraint])
     } else {
       checkDateLabel.text = String()

libs/indexer/feature_data.cpp

@@ -191,26 +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 (isChargingStationChecker(t1) && isChargingStationChecker(t2))
-    {
-      if (isChargingStationSmallChecker(t1) && !isChargingStationSmallChecker(t2))
-        return false;
-      else if (!isChargingStationSmallChecker(t1) && isChargingStationSmallChecker(t2))
-        return true;
-      
-      uint8_t const t1Level = ftype::GetLevel(t1);
-      uint8_t const t2Level = ftype::GetLevel(t2);
-      if (t1Level == 2 && t2Level != 2)
-        return true;
-      else if (t1Level != 2 && t2Level == 2)
-        return false;
-    }
-      
     int const p1 = getPriority(t1);
     int const p2 = getPriority(t2);
     if (p1 != p2)
@@ -420,13 +403,6 @@ void FeatureParams::SetRwSubwayType(char const * cityName)
 
 FeatureParams::TypesResult FeatureParams::FinishAddingTypesEx()
 {
-  auto const & cl = classif();
-  auto charingStation = cl.GetTypeByPath({"amenity", "charging_station"});
-  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;

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(2 /* level */)
-{
-  Classificator const & c = classif();
-  m_types.push_back(c.GetTypeByPath({"amenity", "charging_station"}));
-}
-
-IsCharingStationCarChecker::IsCharingStationCarChecker() : ftypes::BaseChecker(3 /* level */)
-{
-  Classificator const & c = classif();
-  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();

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();

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;

libs/map/bookmark_helpers.cpp

@@ -87,7 +87,6 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
 
     {"amenity-charging_station", {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}},
 

libs/map/search_mark.cpp

@@ -229,7 +229,6 @@ private:
         {{"amenity", "fuel"}, SearchMarkType::Fuel},
         {{"amenity", "charging_station"}, 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},

libs/routing/road_access_serialization.hpp

@@ -458,7 +458,7 @@ private:
     positionsAccessConditional.clear();
 
     auto openingHoursDeserializer = GetOpeningHoursSerDesForRouting();
-    auto const size = ReadPrimitiveFromSource<uint64_t>(src);
+    auto const size = ReadPrimitiveFromSource<size_t>(src);
 
     positionsAccessConditional.reserve(size);
     uint32_t prevFeatureId = 0;