[android] Use dark background in the editor

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

android/app/build.gradle

@@ -256,17 +256,18 @@ 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",
@@ -276,11 +277,16 @@ android {
             "fi",
             "fr",
             "fr-rCA",
-            "iw",
+            "gl",
+            "gsw",
+            "he",
             "hi",
             "hu",
+            "id",
             "in",
+            "is",
             "it",
+            "iw",
             "ja",
             "kw",
             "ko",
@@ -289,16 +295,20 @@ android {
             "mr",
             "mt",
             "nb",
+            "nb-rNO",
             "nl",
             "pl",
             "pt",
             "pt-rBR",
             "ro",
             "ru",
+            "sl",
             "sk",
-            "sr",
+            "sr-rCyrl",
+            "sr-rLatn",
             "sv",
             "sw",
+            "ta",
             "th",
             "tr",
             "uk",

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

@@ -132,7 +132,6 @@ 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;
 
@@ -712,7 +711,6 @@ 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,6 +237,7 @@ 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,11 +1,15 @@
 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;
@@ -21,6 +25,7 @@ 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
   {
@@ -34,6 +39,8 @@ 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<>();
 
@@ -68,6 +75,12 @@ 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,6 +1,7 @@
 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;
@@ -140,8 +141,13 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
   private void updateMapLanguageCodeSummary()
   {
     final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
-    pref.setSummary(locale.getDisplayLanguage());
+    String mapLanguageCode = MapLanguageCode.getMapLanguageCode();
+    if (mapLanguageCode.equals(DEFAULT_LANG_CODE)) {
+      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(), getTheme()) {
+    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
       @Override
       public void onAttachedToWindow()
       {

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="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>

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

@@ -8,7 +8,6 @@
   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/button_new_item.xml

@@ -8,7 +8,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp"
     tools:showIn="@layout/item_charging_sockets">

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

@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
+    android:background="?attr/colorSurfaceContainerHigh"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
@@ -430,7 +431,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         android:text="@string/editor_business_vacant_button"/>
@@ -441,7 +441,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_base"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         tools:text="Reset my changes"/>

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

@@ -2,10 +2,10 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?windowBackgroundForced"
+  android:background="?attr/colorSurfaceContainerHigh"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar

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

@@ -10,13 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="?attr/colorSurfaceContainerHigh"
+        android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?cardBackground"
             android:scrollbars="vertical" />
 
     </FrameLayout>

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/fragment_timetable.xml

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?windowBackgroundForced"
+    android:background="?attr/colorSurfaceContainerHigh"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,14 +19,13 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="?cardBackground"/>
+    android:background="?attr/colorSurfaceContainerHigh"/>/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="?clickableBackground"
     android:gravity="center_vertical"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_time_advanced"
@@ -35,7 +34,7 @@
     android:textColor="?colorSecondary" />
 
   <include
-    layout="@layout/shadow_bottom"
+    layout="@layout/item_divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_above="@id/tv__mode_switch"/>

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

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced">
+  android:background="?attr/colorSurfaceContainerHigh">>
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -17,8 +17,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      style="@style/MwmWidget.M3.Editor.CardView">
 
       <LinearLayout
         android:id="@+id/examples"

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

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
+  android:background="?attr/colorSurfaceContainerHigh"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

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

@@ -6,7 +6,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp">
 

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

@@ -21,5 +21,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/edit_socket_info_tooltip"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_marginBottom="@dimen/margin_quarter"/>
 </LinearLayout>

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="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>

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

@@ -4,6 +4,7 @@
   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/position_chooser.xml

@@ -15,15 +15,8 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-      <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"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:title="@string/editor_add_select_location">
     </com.google.android.material.appbar.MaterialToolbar>
 
   <com.google.android.material.textview.MaterialTextView

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

@@ -4,5 +4,5 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:scrollbars="vertical"/>

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

@@ -15,6 +15,7 @@
   <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,8 +797,10 @@
     <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 -->

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

@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>

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

@@ -98,16 +98,6 @@
     <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,8 +143,7 @@
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="titleTextColor">@color/text_light</item>
     <item name="buttonGravity">center_vertical</item>
   </style>
 
@@ -169,9 +168,7 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
-    <item name="android:background">@android:color/transparent</item>
-  </style>
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
 
   <style name="MwmWidget.TextView.Item">
     <item name="android:layout_width">match_parent</item>
@@ -242,10 +239,6 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
-  <style name="MwmWidget.FrameLayout.BookmarkCategories">
-    <item name="android:background">?windowBackgroundForced</item>
-  </style>
-
   <style name="MwmWidget.Counter">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
@@ -290,13 +283,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?cardBackground</item>
+    <item name="backgroundTint">?colorSurfaceContainerLow</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?cardBackground</item>
+    <item name="android:background">?colorSurfaceContainerLow</item>
     <item name="behavior_hideable">false</item>
   </style>
 

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

@@ -278,10 +278,6 @@
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
-
-  <style name="PopupMenu" parent="ThemeOverlay.Material3">
-    <item name="android:popupBackground">?windowBackgroundForced</item>
-  </style>
     <!-- Theme required to apply M3 dialog style on preference screen -->
     <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="dialogCornerRadius">28dp</item>

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

@@ -7,6 +7,7 @@
     <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" />
@@ -21,11 +22,16 @@
     <locale android:name="fi" />
     <locale android:name="fr" />
     <locale android:name="fr-CA" />
-    <locale android:name="iw" />
+    <locale android:name="gl" />
+    <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" />
@@ -34,16 +40,20 @@
     <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" />
+    <locale android:name="sr-Cyrl" />
+    <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,9 +43,10 @@
     <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">Fahrrad-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrräder</string>
+    <string name="type.amenity.charging_station.motorcycle">Motorräder</string>
+    <string name="type.amenity.charging_station.motorcar">Autos</string>
+    <string name="type.amenity.charging_station.small">Begrenzte Kapazität</string>
     <string name="type.amenity.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,9 +53,10 @@
     <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">Bicycle Charging Station</string>
-    <string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
-    <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
+    <string name="type.amenity.charging_station.bicycle">Bicycles</string>
+    <string name="type.amenity.charging_station.motorcycle">Motorcycles</string>
+    <string name="type.amenity.charging_station.motorcar">Cars</string>
+    <string name="type.amenity.charging_station.small">Limited Capacity</string>
     <string name="type.amenity.childcare">Nursery</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.amenity.studio">Media Studio</string>
@@ -931,11 +932,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,7 +331,9 @@
 "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": "Fahrrad aufladen",
+"amenity-charging_station-bicycle|@charging_station": "5Fahrradladestation|Fahrrad aufladen|E-Bike aufladen|Fahrrad laden|E-Bike laden",
+"amenity-charging_station-motorcycle|@charging_station": "6Motorradladestation|Motorrad aufladen|Motorrad laden",
+"amenity-charging_station-motorcar|@charging_station": "4Autoladestation|5Autoladegerät|Auto aufladen|Auto laden",
 "amenity-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",
@@ -516,7 +518,6 @@
 "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,10 +353,11 @@
 "man_made-observatory": "4Observatory",
 "amenity-veterinary": "4Veterinary Doctor|3Veterinary|vet|veterinarian",
 "amenity-animal_shelter": "6Animal Shelter",
-"@charging_station": "4Charging Station|charging",
+"@charging_station": "4Charging Station|charging|charger",
 "amenity-charging_station|@charging_station": "",
-"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging",
-"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
+"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging Station|Bicycle Charging|Bike Charging",
+"amenity-charging_station-motorcycle|@charging_station": "5Motorcycle Charging Station|Motorcycle Charging|Motorbike Charging",
+"amenity-charging_station-motorcar|@charging_station": "3Car Charging Station|Motorcar Charging|Car Charging",
 "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|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-charging_station-motorcar|@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|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
+"amenity-charging_station-motorcar|@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 +1,543 @@
-{}
+{
+"@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|amenity-charging_station-motorcar-small|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
+"amenity-charging_station-motorcar|@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|amenity-charging_station-motorcar-small|@charging_station": "4Автозарядка",
+"amenity-charging_station-motorcar|@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|amenity-charging_station-motorcar-small|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
+"amenity-charging_station-motorcar|@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|motorcar|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2];;name;int_name;201;
+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;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
 # ~250K usages.
@@ -403,15 +403,14 @@ 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;
-# 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;
+railway|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;
 man_made|lighthouse;299;
-deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult
+amenity|charging_station|motorcycle;[amenity=charging_station][motorcycle?];;name;int_name;300;
 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?];;name;int_name;305;
+amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?],[amenity=charging_station][motorcar?];;name;int_name;305;
 natural|saddle;306;
 mountain_pass;[mountain_pass];;name;int_name;307;
 highway|raceway;308;
@@ -420,7 +419,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;
-deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path
+amenity|charging_station|carless;[amenity=charging_station][motorcar=not],[amenity=charging_station][motorcar=no];;name;int_name;314;
 aeroway|gate;315;
 # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
 railway|preserved;316;
@@ -511,8 +510,7 @@ 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;
-# 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;
+railway|disused|tunnel;[railway=disused][tunnel?],[railway=abandoned][tunnel?];;name;int_name;400;
 area:highway|living_street;401;
 piste:type|sled;402;
 leisure|beach_resort;403;
@@ -1193,7 +1191,7 @@ shop|tyres;1064;
 craft|beekeeper;1065;
 amenity|car_wash;1066;
 amenity|veterinary;1067;
-amenity|charging_station;1068;
+amenity|charging_station;[amenity=charging_station];;name;int_name;1068;
 amenity|childcare;1069;
 craft|blacksmith;1070;
 amenity|bicycle_parking;1071;

data/styles/default/dark/colors.mapcss

@@ -162,22 +162,11 @@
 @path: #944A12;
 @path_expert: #523E33;
 @bridleway: #2B2827;
-@motorway0_border: #7A4006;
-@motorway1_border: #784606;
-@trunk0_border: #794D11;
-@trunk1_border: #79511D;
-@primary0_border: #7A5C2A;
-@primary1_border: #7C5E24;
-@primary2_border: #7C622F;
-@secondary0_border: #7F6730;
-@secondary1_border: #7F6B3C;
-@minor_road_border: #b2b2b2;
 
 /* 5.2 Bridges */
 
 @bridge_background: #2C2C1A;
 @bridge_casing: #505050;
-@bridge_minor_road_border: #393928;
 
 /* 5.3 Tunnels */
 

data/styles/default/include/Basemap.mapcss

@@ -559,8 +559,9 @@ area|z15-[amenity=marketplace],
 area|z15-[office=diplomatic],
 area|z15-[amenity=vehicle_inspection],
 area|z15-[amenity=car_wash],
-area|z15-[amenity=charging_station][motorcar?],
 area|z15-[amenity=fuel],
+area|z15-[amenity=charging_station][motorcar?],
+area|z16-[amenity=charging_station],
 area|z15-[amenity=motorcycle_parking],
 area|z15-[amenity=bicycle_parking],
 {fill-opacity: 1; fill-color: @general_area;}

data/styles/default/include/Icons.mapcss

@@ -2399,18 +2399,28 @@ 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],
-node|z16-[amenity=charging_station],
-{icon-image: charging-point-m.svg;}
+{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?],
 {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

@@ -35,9 +35,7 @@
   8.7 Footway 15-22 ZOOM
   8.8 Steps 15-22 ZOOM
   8.9 Bridleway 14-22 ZOOM
-  8.10 Major road borders
-  8.11 Minor road borders
-  8.12 Runway 12-22 ZOOM
+  8.10 Runway 12-22 ZOOM
 9.RAIL 11-22 ZOOM
   9.1 RAIL 11-22 ZOOM
   9.2 Rail tunnel 14-22 ZOOM
@@ -1139,420 +1137,7 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite
 line|z17-[highway=bridleway][bridge?]::bridgeblack
 {casing-width-add: 1;}
 
-
-/* 8.10 Major road borders */
-
-line|z6-9[highway=motorway]::border,
-line|z6-9[highway=trunk]::border,
-{color: @trunk0_border; opacity: 1;}
-
-line|z10-13[highway=motorway]::border,
-line|z10-13[highway=motorway_link]::border,
-{color: @motorway0_border; opacity: 1;}
-
-line|z10-13[highway=trunk]::border,
-line|z10-13[highway=trunk_link]::border,
-{color: @trunk1_border; opacity: 1;}
-
-line|z14-[highway=motorway]::border,
-line|z14-[highway=motorway_link]::border,
-{color: @motorway1_border; opacity: 1;}
-
-line|z14-[highway=trunk]::border,
-line|z14-[highway=trunk_link]::border,
-{color: @trunk1_border; opacity: 1;}
-
-line|z8-10[highway=primary]::border,
-{color: @primary0_border; opacity: 1;}
-line|z11-13[highway=primary]::border,
-line|z11-13[highway=primary_link]::border,
-{color: @primary1_border; opacity: 1;}
-line|z14-[highway=primary]::border,
-line|z14-[highway=primary_link]::border,
-{color: @primary2_border; opacity: 1;}
-
-line|z10-13[highway=secondary]::border,
-line|z13[highway=secondary_link]::border,
-{color: @secondary0_border; opacity: 1;}
-line|z14-[highway=secondary]::border,
-line|z14-[highway=secondary_link]::border,
-{color: @secondary1_border; opacity: 1;}
-
-/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
-
-line|z10[highway=motorway]::border,
-{width: 3.6;}
-line|z11[highway=motorway]::border,
-{width: 4.0;}
-line|z12[highway=motorway]::border,
-{width: 4.6;}
-line|z13[highway=motorway]::border,
-{width: 5.0;}
-line|z14[highway=motorway]::border,
-{width: 5.4;}
-line|z15[highway=motorway]::border,
-{width: 6.6;}
-line|z16[highway=motorway]::border,
-{width: 8.8;}
-line|z17[highway=motorway]::border,
-{width: 10.0;}
-line|z18[highway=motorway]::border,
-{width: 13.0;}
-line|z19-[highway=motorway]::border,
-{width: 17.0;}
-
-line|z6[highway=motorway]::border,
-line|z6[highway=trunk]::border,
-{width: 0;}
-line|z7[highway=motorway]::border,
-line|z7[highway=trunk]::border,
-{width: 0;}
-line|z8[highway=motorway]::border,
-line|z8[highway=trunk]::border,
-{width: 1.7;}
-line|z9[highway=motorway]::border,
-line|z9[highway=trunk]::border,
-{width: 1.8;}
-line|z10[highway=trunk]::border,
-{width: 3.2;}
-line|z11[highway=trunk]::border,
-{width: 3.5;}
-line|z12[highway=trunk]::border,
-{width: 4.0;}
-line|z13[highway=trunk]::border,
-{width: 4.6;}
-line|z14[highway=trunk]::border,
-{width: 5.0;}
-line|z15[highway=trunk]::border,
-{width: 5.8;}
-line|z16[highway=trunk]::border,
-{width: 7.2;}
-line|z17[highway=trunk]::border,
-{width: 9.2;}
-line|z18[highway=trunk]::border,
-{width: 12;}
-line|z19-[highway=trunk]::border,
-{width: 14.5;}
-
-line|z10[highway=motorway_link]::border,
-line|z10[highway=trunk_link]::border,
-{width: 0;}
-line|z11[highway=motorway_link]::border,
-line|z11[highway=trunk_link]::border,
-{width: 1.6;}
-line|z12[highway=motorway_link]::border,
-line|z12[highway=trunk_link]::border,
-{width: 1.9;}
-line|z13[highway=motorway_link]::border,
-line|z13[highway=trunk_link]::border,
-{width: 2.4;}
-line|z14[highway=motorway_link]::border,
-line|z14[highway=trunk_link]::border,
-{width: 3.7;}
-line|z15[highway=motorway_link]::border,
-line|z15[highway=trunk_link]::border,
-{width: 4.7;}
-line|z16[highway=motorway_link]::border,
-line|z16[highway=trunk_link]::border,
-{width: 6.1;}
-line|z17[highway=motorway_link]::border,
-line|z17[highway=trunk_link]::border,
-{width: 7.7;}
-line|z18[highway=motorway_link]::border,
-line|z18[highway=trunk_link]::border,
-{width: 10.5;}
-line|z19-[highway=motorway_link]::border,
-line|z19-[highway=trunk_link]::border,
-{width: 12.7;}
-
-line|z8[highway=primary]::border,
-{width: 0;}
-line|z9[highway=primary]::border,
-{width: 0;}
-line|z10[highway=primary]::border,
-{width: 2.3;}
-line|z11[highway=primary]::border,
-{width: 3.3;}
-line|z12[highway=primary]::border,
-{width: 3.7;}
-line|z13[highway=primary]::border,
-{width: 4.0;}
-line|z14[highway=primary]::border,
-{width: 4.8;}
-line|z15[highway=primary]::border,
-{width: 5.4;}
-line|z16[highway=primary]::border,
-{width: 6.4;}
-line|z17[highway=primary]::border,
-{width: 8;}
-line|z18[highway=primary]::border,
-{width: 11;}
-line|z19-[highway=primary]::border,
-{width: 13;}
-
-line|z11[highway=primary_link]::border,
-{width: 0;}
-line|z12[highway=primary_link]::border,
-{width: 0;}
-line|z13[highway=primary_link]::border,
-{width: 1.8;}
-line|z14[highway=primary_link]::border,
-{width: 2.3;}
-line|z15[highway=primary_link]::border,
-{width: 3.5;}
-line|z16[highway=primary_link]::border,
-{width: 4.2;}
-line|z17[highway=primary_link]::border,
-{width: 5.7;}
-line|z18[highway=primary_link]::border,
-{width: 7.4;}
-line|z19-[highway=primary_link]::border,
-{width: 9.2;}
-
-line|z10[highway=secondary]::border,
-{width: 1.9;}
-line|z11[highway=secondary]::border,
-{width: 3.2;}
-line|z12[highway=secondary]::border,
-{width: 3.5;}
-line|z13[highway=secondary]::border,
-{width: 3.7;}
-line|z14[highway=secondary]::border,
-{width: 4.2;}
-line|z15[highway=secondary]::border,
-{width: 4.8;}
-line|z16[highway=secondary]::border,
-{width: 6;}
-line|z17[highway=secondary]::border,
-{width: 7.6;}
-line|z18[highway=secondary]::border,
-{width: 10.4;}
-line|z19-[highway=secondary]::border,
-{width: 12.6;}
-
-line|z13[highway=secondary_link]::border,
-{width: 1.8;}
-line|z14[highway=secondary_link]::border,
-{width: 2.3;}
-line|z15[highway=secondary_link]::border,
-{width: 3.5;}
-line|z16[highway=secondary_link]::border,
-{width: 4.2;}
-line|z17[highway=secondary_link]::border,
-{width: 5.7;}
-line|z18[highway=secondary_link]::border,
-{width: 7.4;}
-line|z19-[highway=secondary_link]::border,
-{width: 9.2;}
-
-
-/* 8.11 Minor road borders */
-
-line|z11-[highway=tertiary]::border,
-line|z14-[highway=tertiary_link]::border,
-line|z11-[highway=unclassified]::border,
-line|z12-[highway=residential]::border,
-line|z12-[highway=road]::border,
-line|z12-[highway=living_street]::border,
-line|z13-[highway=pedestrian]::border,
-line|z13-[highway=ford]::border,
-line|z15-[highway=service]::border,
-line|z15-[highway=service][service=busway]::border,
-line|z15-[highway=busway]::border,
-line|z15-[highway=footway]::border,
-line|z15-[highway=ladder]::border,
-line|z15-[highway=steps]::border,
-{color: @minor_road_border; opacity: 0.1;}
-
-line|z11-[highway=tertiary][bridge?]::border,
-line|z14-[highway=tertiary_link][bridge?]::border,
-line|z11-[highway=unclassified][bridge?]::border,
-line|z12-[highway=residential][bridge?]::border,
-line|z12-[highway=road][bridge?]::border,
-line|z12-[highway=living_street][bridge?]::border,
-line|z13-[highway=pedestrian][bridge?]::border,
-line|z15-[highway=service][bridge?]::border,
-line|z15-[highway=service][service=busway][bridge?]::border,
-line|z15-[highway=busway][bridge?]::border,
-line|z15-[highway=footway][bridge?]::border,
-line|z15-[highway=steps][bridge?]::border,
-{color: @bridge_minor_road_border; opacity: 1; linecap: butt}
-
-/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
-
-line|z11[highway=tertiary]::border,
-{width: 1.7;}
-line|z12[highway=tertiary]::border,
-{width: 2.1;}
-line|z13[highway=tertiary]::border,
-{width: 2.3;}
-line|z14[highway=tertiary]::border,
-{width: 3.7;}
-line|z15[highway=tertiary]::border,
-{width: 4.8;}
-line|z16[highway=tertiary]::border,
-{width: 6;}
-line|z17[highway=tertiary]::border,
-{width: 7.6;}
-line|z18[highway=tertiary]::border,
-{width: 10.4;}
-line|z19-[highway=tertiary]::border,
-{width: 12.6;}
-
-line|z14[highway=tertiary_link]::border,
-{width: 2.3;}
-line|z15[highway=tertiary_link]::border,
-{width: 3.5;}
-line|z16[highway=tertiary_link]::border,
-{width: 4.2;}
-line|z17[highway=tertiary_link]::border,
-{width: 5.7;}
-line|z18[highway=tertiary_link]::border,
-{width: 7.4;}
-line|z19-[highway=tertiary_link]::border,
-{width: 9.2;}
-
-line|z11[highway=unclassified]::border,
-{width: 0;}
-line|z12[highway=unclassified]::border,
-{width: 0;}
-line|z13[highway=unclassified]::border,
-{width: 1.9;}
-line|z14[highway=unclassified]::border,
-{width: 3.3;}
-line|z15[highway=unclassified]::border,
-{width: 4.2;}
-line|z16[highway=unclassified]::border,
-{width: 5.2;}
-line|z17[highway=unclassified]::border,
-{width: 7;}
-line|z18[highway=unclassified]::border,
-{width: 9;}
-line|z19-[highway=unclassified]::border,
-{width: 11;}
-
-line|z12[highway=residential]::border,
-line|z12[highway=road]::border,
-line|z12[highway=living_street]::border,
-{width: 0;}
-line|z13[highway=residential]::border,
-line|z13[highway=road]::border,
-line|z13[highway=living_street]::border,
-{width: 0;}
-line|z14[highway=residential]::border,
-line|z14[highway=road]::border,
-line|z14[highway=living_street]::border,
-{width: 2.1;}
-line|z15[highway=residential]::border,
-line|z15[highway=road]::border,
-line|z15[highway=living_street]::border,
-{width: 3.4;}
-line|z16[highway=residential]::border,
-line|z16[highway=road]::border,
-line|z16[highway=living_street]::border,
-{width: 4.2;}
-line|z17[highway=residential]::border,
-line|z17[highway=road]::border,
-line|z17[highway=living_street]::border,
-{width: 5.7;}
-line|z18[highway=residential]::border,
-line|z18[highway=road]::border,
-line|z18[highway=living_street]::border,
-{width: 7.4;}
-line|z19-[highway=residential]::border,
-line|z19-[highway=road]::border,
-line|z19-[highway=living_street]::border,
-{width: 9.2;}
-
-line|z13[highway=pedestrian]::border,
-line|z13[highway=ford]::border,
-{width: 0;dashes: 4,1;}
-line|z14[highway=pedestrian]::border,
-line|z14[highway=ford]::border,
-{width: 2.1;dashes: 6,1.3;}
-line|z15[highway=pedestrian]::border,
-line|z15[highway=ford]::border,
-{width: 3;dashes: 8,1.5;}
-line|z16[highway=pedestrian]::border,
-line|z16[highway=ford]::border,
-{width: 3.4;dashes: 8,1.5;}
-line|z17[highway=pedestrian]::border,
-line|z17[highway=ford]::border,
-{width: 4;dashes: 9,1.8;}
-line|z18[highway=pedestrian]::border,
-line|z18[highway=ford]::border,
-{width: 5;dashes: 11,2.3;}
-line|z19-[highway=pedestrian]::border,
-line|z19-[highway=ford]::border,
-{width: 6;dashes: 13,2.7;}
-
-line|z15[highway=service]::border,
-line|z15[highway=service][service=busway]::border,
-line|z15[highway=busway]::border,
-{width: 1.7;}
-line|z15[highway=service][service=driveway]::border,
-{width: 0;}
-line|z16[highway=service]::border,
-line|z16[highway=service][service=busway]::border,
-line|z16[highway=busway]::border,
-{width: 2.1;}
-line|z17[highway=service]::border,
-line|z17[highway=service][service=busway]::border,
-line|z17[highway=busway]::border,
-{width: 3;}
-line|z18[highway=service]::border,
-line|z18[highway=service][service=busway]::border,
-line|z18[highway=busway]::border,
-{width: 4;}
-line|z19-[highway=service]::border,
-line|z19-[highway=service][service=busway]::border,
-line|z19-[highway=busway]::border,
-{width: 5;}
-
-line|z15[highway=footway]::border,
-{width: 2; dashes: 5,1.5;}
-line|z16[highway=footway]::border,
-{width: 3; dashes: 5,1.5;}
-line|z17[highway=footway]::border,
-{width: 3.4; dashes: 6,1.8;}
-line|z18[highway=footway]::border,
-{width: 4.2; dashes: 8,2.3;}
-line|z19-[highway=footway]::border,
-{width: 5.2; dashes: 10,2.7;}
-
-line|z15[highway=footway][bicycle=designated]::border,
-{width: 2; dashes: 6,9;}
-line|z16[highway=footway][bicycle=designated]::border,
-{width: 3; dashes: 8,10;}
-line|z17[highway=footway][bicycle=designated]::border,
-{width: 3.4; dashes: 10,11;}
-line|z18[highway=footway][bicycle=designated]::border,
-{width: 4.2; dashes: 15,15;}
-line|z19-[highway=footway][bicycle=designated]::border,
-{width: 5.2; dashes: 20,20;}
-
-/* Don't display sidewalks and pedestrian crossings on z15. */
-line|z15[highway=footway][footway=sidewalk]::border,
-line|z15[highway=footway][footway=crossing]::border,
-{width: 0;}
-
-line|z15[highway=ladder]::border,
-line|z15[highway=steps]::border,
-{width: 3.4; dashes: 1.5,1.3;}
-line|z16[highway=ladder]::border,
-line|z16[highway=steps]::border,
-{width: 5; dashes: 1.8,1.6;}
-line|z17-[highway=ladder]::border,
-line|z17-[highway=steps]::border,
-{width: 7; dashes: 2.5,2.2;}
-line|z18[highway=ladder]::border,
-line|z18[highway=steps]::border,
-{width: 9; dashes: 3.2,2.8;}
-line|z19-[highway=ladder]::border,
-line|z19-[highway=steps]::border,
-{width: 11; dashes: 4,3.5;}
-
-/* 8.12 Runway 12-22 ZOOM */
+/* 8.10 Runway 12-22 ZOOM */
 
 line|z12-[aeroway=runway],
 line|z14-[aeroway=taxiway],
@@ -1632,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=abandoned][bridge?]::bridgewhite,
+line|z16-[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z16-[railway=disused][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 
 /* 9.1 RAIL 11-22 ZOOM */
@@ -1790,11 +1375,11 @@ line|z18-[railway=light_rail][!tunnel]::dash,
 
 line|z15-[railway=preserved],
 line|z16-[railway=miniature],
-line|z16-[railway=abandoned],
+line|z16-[railway=disused],
 {width: 1.6;dashes: 6.3,6.3;}
 
 line|z15-[railway=construction],
-line|z16-[railway=disused],
+line|z16-[railway=abandoned],
 {width: 1;dashes: 1.8,5.4;}
 
 line|z17-[railway=turntable],
@@ -1849,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=abandoned][bridge?]::bridgewhite,
+line|z16[railway=disused][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=abandoned][bridge?]::bridgewhite,
+line|z17[railway=disused][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=abandoned][bridge?]::bridgewhite,
+line|z18-[railway=disused][bridge?]::bridgewhite,
 {casing-width-add: 3.5;}
 
 line|z16[railway=rail][bridge?]::bridgeblack,
@@ -1871,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=abandoned][bridge?]::bridgeblack,
+line|z16[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z17[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z18-[railway=disused][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,8 +85,12 @@ 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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-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-)
@@ -97,8 +101,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
-highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -111,7 +115,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
 === 170
 
-highway-footway-area                                # area z14- (also has line z15-, line::border z15-, pathtext z15-)
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

@@ -45,10 +45,10 @@ power-line                                          # line z19- (also has line::
 power-line::dash                                    # line::dash z19- (also has line z19-)
 === 340
 
-highway-ladder                                      # line z15- (also has line::border z15-, icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -73,23 +73,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320
 
-highway-motorway                                    # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310
 
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
 railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
@@ -104,7 +104,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z16- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290
 
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 289
 
 railway-rail-branch                                 # line z11- (also has line::dash z16-)
@@ -127,88 +127,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
 # === 279
 
-highway-secondary                                   # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has line::border z13-, pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-area                                # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z16- (also has line z11-)
@@ -227,11 +227,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221
 
-highway-footway-bicycle                             # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-)
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
 highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
 === 220
 
-highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-)
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
 highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
 === 219
 
@@ -264,23 +264,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
 # === 209
 
-highway-ford                                        # line z13- (also has line::border z14-, icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199
 
 highway-bridleway                                   # line z14- (also has pathtext z15-)
 highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway                                     # line z15- (also has line::border z15-, pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has line::border z15-, pathtext z15-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
+highway-footway-crossing                            # line z16-
 highway-path                                        # line z15- (also has pathtext z15-)
 highway-path-difficult                              # line z15- (also has pathtext z15-)
 highway-path-expert                                 # line z15- (also has pathtext z15-)
@@ -290,15 +290,15 @@ highway-track-area                                  # line z15- (also has pathte
 highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-track-no-access                             # line z15- (also has pathtext z15-)
 highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 190
+=== 180
 
 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-
@@ -306,173 +306,55 @@ railway-preserved                                   # line z15-
 railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z15-
 railway-turntable                                   # line z17-
-=== 180
+=== 160
 
-highway-footway-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16- (also has line::border z16-)
-highway-footway-tunnel                              # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-path-horse                                  # line z15- (also has pathtext z15-)
 highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 170
+=== 155
 
 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 169
+=== 154
 
 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 168
-
-highway-motorway::border                            # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
-highway-trunk::border                               # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
-=== 163
-
-highway-primary::border                             # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
-=== 162
-
-highway-secondary::border                           # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
-=== 161
-
-highway-motorway_link::border                       # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
-highway-trunk_link::border                          # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
-=== 160
-
-highway-primary_link::border                        # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
-=== 159
-
-highway-secondary_link::border                      # line::border z13- (also has line z13-, pathtext z16-)
-=== 158
-
-highway-motorway-bridge::border                     # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge::border                        # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-=== 157
-
-highway-primary-bridge::border                      # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 156
-
-highway-secondary-bridge::border                    # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-=== 155
-
-highway-motorway_link-bridge::border                # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::border                   # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 154
-
-highway-primary_link-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
-highway-secondary_link-bridge::border               # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-=== 152
-
-highway-motorway-tunnel::border                     # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel::border                        # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-=== 151
-
-highway-primary-tunnel::border                      # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-=== 150
-
-highway-secondary-tunnel::border                    # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 149
-
-highway-motorway_link-tunnel::border                # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel::border                   # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 148
-
-highway-primary_link-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 147
-
-highway-secondary_link-tunnel::border               # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
-=== 146
-
-highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
-highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
-highway-service::border                             # line::border z15- (also has line z15-, pathtext z16-)
-highway-service-area::border                        # line::border z15- (also has line z15-, pathtext z16-)
-highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
-highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
-highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
-highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
-highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
-=== 145
-
-highway-footway::border                             # line::border z15- (also has line z15-, pathtext z15-)
-highway-footway-area::border                        # line::border z15- (also has line z15-, area z14-, pathtext z15-)
-highway-footway-bicycle::border                     # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-)
-highway-footway-crossing::border                    # line::border z16- (also has line z16-)
-highway-footway-sidewalk::border                    # line::border z16- (also has line z16-)
-highway-ford::border                                # line::border z14- (also has line z13-, icon z16-, pathtext z16-)
-highway-ladder::border                              # line::border z15- (also has line z15-, icon z17-, pathtext z17-)
-highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-steps::border                               # line::border z15- (also has line z15-, pathtext z16-)
-=== 144
-
-highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-service-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-=== 143
-
-highway-footway-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-steps-bridge::border                        # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-=== 142
-
-highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
-highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
-highway-service-tunnel::border                      # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
-highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
-=== 141
-
-highway-footway-tunnel::border                      # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
-highway-steps-tunnel::border                        # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
-=== 140
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
-railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+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-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-)
@@ -485,31 +367,31 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 135
+=== 150
 
 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
-railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+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-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-)
@@ -522,14 +404,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 130
+=== 140
 
 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 120
+=== 130
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z14- (also has pathtext z15-)
@@ -543,30 +425,30 @@ piste:type-hike                                     # line z15- (also has pathte
 piste:type-nordic                                   # line z14- (also has pathtext z15-)
 piste:type-skitour                                  # line z14- (also has pathtext z15-)
 piste:type-sled                                     # line z14- (also has pathtext z15-)
-=== 110
+=== 120
 
 building:part                                       # area z16-
-=== 100
+=== 110
 
 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z14- (also has pathtext z16-)
 natural-earth_bank                                  # line z14-
-=== 90
+=== 100
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 80
+=== 90
 
 man_made-cutline                                    # line z14-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 70
+=== 80
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z16-
-=== 60
+=== 70
 
 isoline-step_10                                     # line z15- (also has pathtext z17-)
 isoline-step_100                                    # line z12- (also has pathtext z14-)
@@ -574,7 +456,7 @@ isoline-step_1000                                   # line z11- (also has pathte
 isoline-step_50                                     # line z14- (also has pathtext z16-)
 isoline-step_500                                    # line z11- (also has pathtext z12-)
 isoline-zero                                        # line z15- (also has pathtext z17-)
-=== 50
+=== 60
 
 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
@@ -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,13 +424,23 @@ 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                            # icon z16- (also has caption(optional) z16-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
+amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3752
+
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3751
+
+amenity-charging_station                            # 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-)
@@ -581,14 +591,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200
 
 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z13-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -600,10 +610,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150
 
-highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
@@ -635,46 +645,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z15- (also has line z13-)
@@ -683,14 +693,14 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 === 2953
 
 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z15- (also has line z15-, line::border z15-)
-highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z15- (also has line z15-)
+highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
+highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -707,7 +717,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900
 
-highway-ford                                        # icon z16- and pathtext z16- (also has line z13-, line::border z14-)
+highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
 natural-rock                                        # icon z17- (also has caption(optional) z17-)
 === 2850
 
@@ -723,9 +733,9 @@ highway-path-horse                                  # pathtext z15- (also has li
 highway-path-tunnel                                 # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
-highway-steps                                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z16- (also has line z15-)
+highway-steps-bridge                                # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z15- (also has line z15-)
@@ -735,12 +745,12 @@ highway-track-no-access                             # pathtext z15- (also has li
 highway-track-tunnel                                # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
 
-highway-service                                     # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z15-)
+highway-service-area                                # pathtext z16- (also has line z15-)
+highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line(casing) z15-, line z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z14-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z14-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z14-)
@@ -823,9 +833,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z13-)
-highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -892,9 +902,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
-highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1162,7 +1172,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-, line::border z15-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1641,13 +1651,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
 
@@ -1691,13 +1701,23 @@ 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                          # caption(optional) z16- (also has icon z16-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
+# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6248
+
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6249
+
+# amenity-charging_station                          # 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/default/light/colors.mapcss

@@ -161,22 +161,11 @@
 @path: #8E4E1D;
 @path_expert: #3D2617;
 @bridleway: #3D361E;
-@motorway0_border: #C26E00;
-@motorway1_border: #D87A00;
-@trunk0_border: #DA8816;
-@trunk1_border: #DA8F2B;
-@primary0_border: #DDA546;
-@primary1_border: #E1A93A;
-@primary2_border: #E1AF4E;
-@secondary0_border: #E6BA51;
-@secondary1_border: #E6C068;
-@minor_road_border: #000000;
 
 /* 5.2 Bridges */
 
 @bridge_background: #FCF1DE;
 @bridge_casing: #E1D4BE;
-@bridge_minor_road_border: #E3D9C8;
 
 /* 5.3 Tunnels */
 

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

data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt

@@ -78,6 +78,7 @@ 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-)
@@ -85,9 +86,12 @@ 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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-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-)
@@ -97,8 +101,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
-highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -111,7 +115,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z13-, caption(optional) z14-)
 === 170
 
-highway-footway-area                                # area z14- (also has line z11-, line::border z15-, pathtext z13-)
+highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

@@ -47,10 +47,10 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
-highway-ladder                                      # line z12- (also has line::border z15-, icon z16-, pathtext z17-)
-highway-steps                                       # line z12- (also has line::border z15-, pathtext z13-)
-highway-steps-bridge                                # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-steps-tunnel                                # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
+highway-steps                                       # line z12- (also has pathtext z13-)
+highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -75,23 +75,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320
 
-highway-motorway                                    # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310
 
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z15- (also has line z10-)
 railway-rail-branch-bridge::dash                    # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z15- (also has line z10-, line(casing) z14-)
@@ -106,7 +106,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z15- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290
 
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 289
 
 railway-rail-branch                                 # line z10- (also has line::dash z15-)
@@ -129,88 +129,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-)
 # === 279
 
-highway-secondary                                   # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has line::border z13-, pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-highway-service                                     # line z13- (also has line::border z15-, pathtext z16-)
-highway-service-area                                # line z13- (also has line::border z15-, pathtext z16-)
-highway-service-bridge                              # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-tunnel                              # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z13- (also has pathtext z16-)
+highway-service-area                                # line z13- (also has pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z13- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z13-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z15- (also has line z10-)
@@ -229,11 +229,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221
 
-highway-footway-bicycle                             # line z11- (also has line::border z15-, line::cycleline z13-, pathtext z13-)
+highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
 highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 === 220
 
-highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, line::border z15-, pathtext z13-)
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
 highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
 === 219
 
@@ -266,23 +266,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z12-, line::dash z16-)
 # === 209
 
-highway-ford                                        # line z13- (also has line::border z14-, icon z14-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has icon z14-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199
 
 highway-bridleway                                   # line z11- (also has pathtext z13-)
 highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway                                     # line z11- (also has line::border z15-, pathtext z13-)
-highway-footway-area                                # line z11- and area z14- (also has line::border z15-, pathtext z13-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+highway-footway                                     # line z11- (also has pathtext z13-)
+highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
+highway-footway-crossing                            # line z16-
 highway-path                                        # line z11- (also has pathtext z13-)
 highway-path-difficult                              # line z11- (also has pathtext z13-)
 highway-path-expert                                 # line z11- (also has pathtext z13-)
@@ -292,15 +292,15 @@ highway-track-area                                  # line z11- (also has pathte
 highway-track-bridge                                # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-track-no-access                             # line z11- (also has pathtext z13-)
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 190
+=== 180
 
 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-
@@ -308,173 +308,55 @@ railway-preserved                                   # line z13-
 railway-preserved-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z13-
 railway-turntable                                   # line z17-
-=== 180
+=== 160
 
-highway-footway-bridge                              # line z11- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13- (also has line::border z16-)
-highway-footway-tunnel                              # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-sidewalk                            # line z13-
+highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-path-horse                                  # line z11- (also has pathtext z13-)
 highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 170
+=== 155
 
 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-=== 169
+=== 154
 
 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-=== 168
-
-highway-motorway::border                            # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
-highway-trunk::border                               # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
-=== 163
-
-highway-primary::border                             # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
-=== 162
-
-highway-secondary::border                           # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
-=== 161
-
-highway-motorway_link::border                       # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
-highway-trunk_link::border                          # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
-=== 160
-
-highway-primary_link::border                        # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
-=== 159
-
-highway-secondary_link::border                      # line::border z13- (also has line z13-, pathtext z16-)
-=== 158
-
-highway-motorway-bridge::border                     # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge::border                        # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-=== 157
-
-highway-primary-bridge::border                      # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 156
-
-highway-secondary-bridge::border                    # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-=== 155
-
-highway-motorway_link-bridge::border                # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::border                   # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 154
-
-highway-primary_link-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
-highway-secondary_link-bridge::border               # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-=== 152
-
-highway-motorway-tunnel::border                     # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel::border                        # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-=== 151
-
-highway-primary-tunnel::border                      # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-=== 150
-
-highway-secondary-tunnel::border                    # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 149
-
-highway-motorway_link-tunnel::border                # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel::border                   # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 148
-
-highway-primary_link-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 147
-
-highway-secondary_link-tunnel::border               # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
-=== 146
-
-highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
-highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
-highway-service::border                             # line::border z15- (also has line z13-, pathtext z16-)
-highway-service-area::border                        # line::border z15- (also has line z13-, pathtext z16-)
-highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
-highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
-highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
-highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
-highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
-=== 145
-
-highway-footway::border                             # line::border z15- (also has line z11-, pathtext z13-)
-highway-footway-area::border                        # line::border z15- (also has line z11-, area z14-, pathtext z13-)
-highway-footway-bicycle::border                     # line::border z15- (also has line z11-, line::cycleline z13-, pathtext z13-)
-highway-footway-crossing::border                    # line::border z16- (also has line z16-)
-highway-footway-sidewalk::border                    # line::border z16- (also has line z13-)
-highway-ford::border                                # line::border z14- (also has line z13-, icon z14-, pathtext z16-)
-highway-ladder::border                              # line::border z15- (also has line z12-, icon z16-, pathtext z17-)
-highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-steps::border                               # line::border z15- (also has line z12-, pathtext z13-)
-=== 144
-
-highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-service-bridge::border                      # line::border z15- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-=== 143
-
-highway-footway-bridge::border                      # line::border z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-steps-bridge::border                        # line::border z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-=== 142
-
-highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
-highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
-highway-service-tunnel::border                      # line::border z15- (also has line z13-, line(casing) z15-, pathtext z16-)
-highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
-highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
-=== 141
-
-highway-footway-tunnel::border                      # line::border z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
-highway-steps-tunnel::border                        # line::border z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 140
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
-railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
+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-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-)
@@ -487,31 +369,31 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z14- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z12-, line::bridgeblack z16-, line::dash z16-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 135
+=== 150
 
 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
-railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
+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-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-)
@@ -524,14 +406,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z12-, line::bridgewhite z13-, line::dash z16-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 130
+=== 140
 
 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 120
+=== 130
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z12- (also has pathtext z15-)
@@ -545,36 +427,38 @@ piste:type-hike                                     # line z12- (also has pathte
 piste:type-nordic                                   # line z12- (also has pathtext z13-)
 piste:type-skitour                                  # line z12- (also has pathtext z13-)
 piste:type-sled                                     # line z12- (also has pathtext z15-)
-=== 110
+=== 120
 
 building:part                                       # area z16-
-=== 100
+=== 110
 
 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z12- (also has pathtext z14-)
 natural-earth_bank                                  # line z12-
-=== 90
+=== 100
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 80
+=== 90
 
 man_made-cutline                                    # line z13-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 70
+=== 80
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z15-
+=== 70
+
 isoline-step_10                                     # line z15- (also has pathtext z16-)
 isoline-step_100                                    # line z11- (also has pathtext z13-)
 isoline-step_1000                                   # line z10- (also has pathtext z10-)
 isoline-step_50                                     # line z13- (also has pathtext z15-)
 isoline-step_500                                    # line z10- (also has pathtext z11-)
 isoline-zero                                        # line z15- (also has pathtext z15-)
-=== 50
+=== 60
 
 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z12- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
@@ -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,13 +424,23 @@ 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                            # icon z16- (also has caption(optional) z16-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
+amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3752
+
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3751
+
+amenity-charging_station                            # 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-)
@@ -581,14 +591,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200
 
 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z11-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -600,10 +610,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150
 
-highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z12- (also has caption(optional) z14-)
@@ -635,46 +645,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z13- (also has line z11-)
@@ -683,14 +693,14 @@ highway-cycleway-tunnel                             # pathtext z13- (also has li
 === 2953
 
 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z13- (also has line z11-, line::border z15-)
-highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z13- (also has line z11-)
+highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
+highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -707,7 +717,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900
 
-highway-ford                                        # icon z14- and pathtext z16- (also has line z13-, line::border z14-)
+highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
 natural-rock                                        # icon z14- (also has caption(optional) z17-)
 === 2850
 
@@ -723,9 +733,9 @@ highway-path-horse                                  # pathtext z13- (also has li
 highway-path-tunnel                                 # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
-highway-steps                                       # pathtext z13- (also has line z12-, line::border z15-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z13- (also has line z12-)
+highway-steps-bridge                                # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z13- (also has line z11-)
@@ -735,12 +745,12 @@ highway-track-no-access                             # pathtext z13- (also has li
 highway-track-tunnel                                # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
 
-highway-service                                     # pathtext z16- (also has line z13-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z13-)
+highway-service-area                                # pathtext z16- (also has line z13-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z13-, line(casing) z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z12-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z12-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z12-)
@@ -823,9 +833,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z11-)
-highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -892,9 +902,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
-highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1163,7 +1173,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-, line::border z15-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1644,13 +1654,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
 
@@ -1694,13 +1704,23 @@ 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                          # caption(optional) z16- (also has icon z16-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
+# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6248
+
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6249
+
+# amenity-charging_station                          # 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,9 +350,10 @@ area|z13-[highway=services],
 area|z13-[highway=rest_area],
 area|z13-[landuse=garages],
 
-area|z15-[amenity=charging_station][motorcar?],
-area|z15-[amenity=fuel],
 area|z15-[amenity=recycling][recycling_type=centre],
+area|z15-[amenity=fuel],
+area|z15-[amenity=charging_station][motorcar?],
+area|z16-[amenity=charging_station],
 area|z17-[amenity=vehicle_inspection],
 area|z17-[amenity=car_wash],
 area|z17-[amenity=motorcycle_parking],

data/styles/vehicle/include/Icons.mapcss

@@ -630,16 +630,28 @@ node|z17[amenity=fuel],
 node|z18-[amenity=fuel],
 {icon-image: fuel-m.svg;font-size: 14.5;}
 
-node|z14-[amenity=charging_station][motorcar?][!capacity],
-node|z14-[amenity=charging_station][motorcar?][capacity=1],
-node|z14-[amenity=charging_station][motorcar?][capacity=2],
+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-point-m.svg;}
-
-node|z14-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging-station-m.svg;}
+{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|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=abandoned][bridge?]::bridgewhite,
+line|z16-[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z16-[railway=disused][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=abandoned]
+line|z16-[railway=disused]
 {width: 1.6;dashes: 6.3,6.3;}
 
 line|z16-[railway=construction],
-line|z16-[railway=disused]
+line|z16-[railway=abandoned]
 {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=abandoned][bridge?]::bridgewhite,
+line|z16[railway=disused][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=abandoned][bridge?]::bridgewhite,
+line|z17[railway=disused][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=abandoned][bridge?]::bridgewhite,
+line|z18-[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z16[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z17[railway=disused][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=abandoned][bridge?]::bridgeblack,
+line|z18-[railway=disused][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,8 +33,12 @@ 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-motorcar-small             # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-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-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
+railway-disused-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-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
+railway-disused-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,17 +170,28 @@ 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
@@ -529,9 +540,6 @@ 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-)
@@ -785,17 +793,28 @@ 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
@@ -1058,9 +1077,6 @@ 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-)

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", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}},
-      {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}},
+      {{"railway", "disused", "bridge"}, {{"railway", "disused"}, {"bridge", "any_value"}}},
+      {{"railway", "disused", "tunnel"}, {{"railway", "disused"}, {"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,6 +351,11 @@ 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());
@@ -369,8 +374,11 @@ void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
     return lhs < rhs;
   };
 
-  auto const isEqual = [&equalPrefix](auto const & lhs, auto const & rhs)
+  auto const isEqual = [&equalPrefix, &isChargingStation](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,6 +57,8 @@ 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 = {
@@ -134,8 +136,6 @@ 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 timeZoneWithAbbreviation:@"UTC"];
+    dateFormatter.timeZone = [NSTimeZone localTimeZone];
   });
   
   return [dateFormatter dateFromString:dateString];

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

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

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

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

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

@@ -55,9 +55,10 @@
 "type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
 "type.leisure.amusement_arcade" = "Arcade";
 "type.amenity.charging_station" = "Charging Station";
-"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
-"type.amenity.charging_station.motorcar" = "Car Charging Station";
-"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
+"type.amenity.charging_station.motorcar" = "Cars";
+"type.amenity.charging_station.motorcycle" = "Motorcycles";
+"type.amenity.charging_station.bicycle" = "Bicycles";
+"type.amenity.charging_station.small" = "Limited Capacity";
 "type.amenity.childcare" = "Nursery";
 "type.amenity.cinema" = "Cinema";
 "type.leisure.bowling_alley" = "Bowling Alley";
@@ -1024,11 +1025,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 = 2025.06.01;
+				MARKETING_VERSION = 2026.01.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 = 2025.06.01;
+				MARKETING_VERSION = 2026.01.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 = 2025.06.01;
+				MARKETING_VERSION = 2026.01.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 = 2025.06.01;
+				MARKETING_VERSION = 2026.01.01;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.widgetextension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -85,10 +85,28 @@ class OpeningHoursViewController: UIViewController {
         }
 
         if let checkDate = self.openingHoursCheckDate, self.expanded {
-          let checkDateFormatter = RelativeDateTimeFormatter()
-          checkDateFormatter.unitsStyle = .spellOut
-          checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
-          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
+          let dateString: String
+                
+          // Check if the date is strictly "Today" or "Yesterday"
+          if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
+            // 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,11 +458,29 @@ class PlacePageInfoViewController: UIViewController {
     setupOpenWithAppView()
 
     if let checkDate = placePageInfoData.checkDate {
-      let checkDateFormatter = RelativeDateTimeFormatter()
-      checkDateFormatter.unitsStyle = .spellOut
-      checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
-      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
-        checkDateLabel.isHidden = false
+      let dateString: String
+        
+      // Check if the date is strictly "Today" or "Yesterday"
+      if Calendar.current.isDateInToday(checkDate) || Calendar.current.isDateInYesterday(checkDate) {
+        // 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("existence_confirmed_time_ago"), dateString)
+      checkDateLabel.isHidden = false
       NSLayoutConstraint.activate([checkDateLabelLayoutConstraint])
     } else {
       checkDateLabel.text = String()

libs/indexer/feature_data.cpp

@@ -191,9 +191,26 @@ 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](uint32_t t1, uint32_t t2)
+  std::stable_sort(begin(), end(), [&checker, &getPriority, &isChargingStationChecker, &isChargingStationSmallChecker](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)
@@ -403,6 +420,13 @@ 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,6 +753,30 @@ 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,6 +519,38 @@ 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,12 +121,19 @@ 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,6 +87,7 @@ 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,6 +229,7 @@ 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<size_t>(src);
+    auto const size = ReadPrimitiveFromSource<uint64_t>(src);
 
     positionsAccessConditional.reserve(size);
     uint32_t prevFeatureId = 0;