[editor] Add public_transport=platform and bus=yes to bus_stop

Signed-off-by: map-per <map-per@gmx.de>

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",
+            "b+sr+Latn",
             "sv",
             "sw",
+            "ta",
             "th",
             "tr",
             "uk",

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

@@ -114,7 +114,6 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onCreate(@NonNull LifecycleOwner owner)
   {
     Logger.d(TAG);
-    Framework.nativeSetCarScreenMode(true);
     mSensorsManager = new CarSensorsManager(getCarContext());
     mDisplayManager = MwmApplication.from(getCarContext()).getDisplayManager();
     mDisplayManager.addListener(DisplayType.Car, this);
@@ -160,7 +159,6 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
     mDisplayManager.removeListener(DisplayType.Car);
-    Framework.nativeSetCarScreenMode(false);
   }
 
   private void init()

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

@@ -53,7 +53,6 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
   public void onResume()
   {
     super.onResume();
-    refreshTimetables();
   }
 
   private void initViews(View view)

android/app/src/main/java/app/organicmaps/util/Utils.java

@@ -184,20 +184,6 @@ public class Utils
     }
   }
 
-  public static void showFacebookPage(Activity activity)
-  {
-    try
-    {
-      // Exception is thrown if we don't have installed Facebook application.
-      getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
-    }
-    catch (final Exception e)
-    {
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_HTTP)));
-    }
-  }
-
   public static void openUrl(@NonNull Context context, @Nullable String url)
   {
     if (TextUtils.isEmpty(url))

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

@@ -287,13 +287,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/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-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/cpp/app/organicmaps/sdk/Framework.cpp

@@ -1490,12 +1490,6 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv
   g_framework->Set3dMode(allow3d, allow3dBuildings);
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCarScreenMode(JNIEnv * env, jclass, jboolean enabled)
-{
-  if (g_framework)
-    frm()->SetCarScreenMode(static_cast<bool>(enabled));
-}
-
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
 {
   bool enabled;

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -280,8 +280,6 @@ public class Framework
 
   public static native void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);
 
-  public static native void nativeSetCarScreenMode(boolean enabled);
-
   public static native boolean nativeGetAutoZoomEnabled();
 
   public static native void nativeSetAutoZoomEnabled(boolean enabled);

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -9,7 +9,6 @@ import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Handler;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresPermission;
@@ -17,9 +16,6 @@ import androidx.annotation.UiThread;
 import androidx.core.content.ContextCompat;
 import androidx.core.location.GnssStatusCompat;
 import androidx.core.location.LocationManagerCompat;
-
-import org.chromium.base.ObserverList;
-
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
@@ -29,8 +25,7 @@ import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
-
+import org.chromium.base.ObserverList;
-import java.util.HashMap;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -61,12 +56,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   private Handler mHandler;
   private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;
 
-  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
-  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
-  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
-  private double mTimeAtLastProviderChange = Double.NaN;
-  private String mCurrentProvider = null;
-
   @NonNull
   private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
     @Override
@@ -198,6 +187,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -211,80 +201,20 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    updateProviderDecision(location);
+    if (mSavedLocation != null)
-    if (mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider()))
     {
-      Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      return;
+      {
+        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
+        return;
+      }
     }
 
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
-
     mSavedLocation = location;
     mMyPosition = null;
     notifyLocationUpdated();
   }
 
-  private void updateProviderDecision(Location location)
-  {
-    if (Double.isNaN(mTimeAtLastProviderChange))
-      mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
-
-    String provider = location.getProvider();
-
-    Integer cnt = mProviderLocationCounts.getOrDefault(provider, 0);
-    Float avg = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
-
-    if (cnt == null || avg == null)
-    {
-      mProviderLocationCounts.clear();
-      mProviderAccuracyMeans.clear();
-      return;
-    }
-
-    int count = cnt;
-    float average = avg;
-
-    float accuracy = location.getAccuracy();
-    int newCount = count + 1;
-    float newAverage = (count * average + accuracy) / newCount;
-
-    mProviderLocationCounts.put(provider, newCount);
-    mProviderAccuracyMeans.put(provider, newAverage);
-
-    double currentTime = location.getElapsedRealtimeNanos();
-    double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
-
-    if (timeDiff > INTERVAL_PROVIDER_DECISION)
-    {
-      mCurrentProvider = getMinAccuracyProvider();
-      Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
-      mTimeAtLastProviderChange = currentTime;
-      mProviderLocationCounts.clear();
-      mProviderAccuracyMeans.clear();
-    }
-  }
-
-  private String getMinAccuracyProvider()
-  {
-    String minAccuracyProvider = null;
-    float minAccuracy = Float.MAX_VALUE;
-    for (String p : mProviderAccuracyMeans.keySet())
-    {
-      Float pAcc = mProviderAccuracyMeans.get(p);
-      if (pAcc == null)
-        continue;
-      float pAccuracy = pAcc;
-
-      if (pAccuracy < minAccuracy)
-      {
-        minAccuracy = pAccuracy;
-        minAccuracyProvider = p;
-      }
-    }
-    return minAccuracyProvider;
-  }
-
   // Used by GoogleFusedLocationProvider.
   @SuppressWarnings("unused")
   @Override

android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java

@@ -22,9 +22,6 @@ public final class Constants
     public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
     public static final String BLUESKY = "https://bsky.app/profile/comaps.app";
     public static final String PIXELFED = "https://pixelfed.social/comaps";
-    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
-    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
-
     public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";
 
     public static final String COPYRIGHT = "file:///android_asset/copyright.html";
@@ -36,13 +33,6 @@ public final class Constants
     private Url() {}
   }
 
-  public static class Package
-  {
-    public static final String FB_PACKAGE = "com.facebook.katana";
-
-    private Package() {}
-  }
-
   public static class Vendor
   {
     public static final String HUAWEI = "HUAWEI";

android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java

@@ -81,6 +81,20 @@ public class LocationUtils
     return location.getAccuracy() > 0.0f;
   }
 
+  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
+  {
+    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
+      return false;
+
+    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
+    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
+      return true;
+
+    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
+    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
+    return newLocation.getAccuracy() < lastAccuracy;
+  }
+
   public static boolean areLocationServicesTurnedOn(@NonNull Context context)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)

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.bicycle">Fahrräder</string>
-    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
+    <string name="type.amenity.charging_station.motorcycle">Motorräder</string>
-    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</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.bicycle">Bicycles</string>
-    <string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
+    <string name="type.amenity.charging_station.motorcycle">Motorcycles</string>
-    <string name="type.amenity.charging_station.motorcar.small">Car Charging Point</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-bicycle|@charging_station": "4Bicycle Charging Station|Bicycle Charging|Bike Charging",
-"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
+"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/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

@@ -74,7 +74,7 @@ landuse|residential;15;
 # Unpaved paths and trails (e.g. unpaved highway=footway are converted into paths,
 # while segregated shared paths into footway + cycleway, see osm2type.cpp).
 highway|path;16;
-highway|bus_stop;17;
+highway|bus_stop;[highway=bus_stop][public_transport=platform][bus=yes],[highway=bus_stop];;;;17;
 # ~4M usages.
 highway|footway|sidewalk;[highway=footway][footway=sidewalk];;name;int_name;18;
 place|locality;19;
@@ -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|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;
-railway|abandoned|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|disused|tunnel;[railway=disused][tunnel?],[railway=abandoned][tunnel?];;name;int_name;400;
-railway|abandoned|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/dark/symbols/subway-vienna-m.svg

@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g>
- <circle cx="12" cy="12" r="12" fill="#fff" opacity=".4"/>
+  <circle cx="12" cy="12" r="12" fill="#FFF" opacity=".4"/>
- <circle cx="12" cy="12" r="11" fill="#0d3c73"/>
+  <circle cx="12" cy="12" r="11" fill="#0D3C73"/>
- <path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#e7ecf1"/>
+  <path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF" opacity=".6"/>
+ </g>
 </svg>

data/styles/default/dark/symbols/subway-vienna-s.svg

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
-<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g>
- <g stroke-width=".75">
+  <circle cx="9" cy="9" r="9" fill="#FFF" opacity=".4"/>
-  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".4"/>
+  <circle cx="9" cy="9" r="8" fill="#0D3C73"/>
-  <circle cx="9" cy="9" r="8.25" fill="#0d3c73"/>
+  <path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF" opacity=".6"/>
-  <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#e7ecf1"/>
  </g>
 </svg>

data/styles/default/dark/symbols/tree-special-m.svg

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#181715" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#202510" fill-rule="evenodd"/></g></svg>

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

@@ -70,7 +70,6 @@ node|z14-[natural=geyser],
 node|z16-[natural=beach],
 area|z14-[natural=bare_rock],
 node|z17-[natural=rock],
-node|z18-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
 
 node|z13-[natural=peak][!name],
@@ -207,9 +206,7 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
-node|z18-[natural=tree][name],
+node|z18-[natural=tree],
-{icon-image: tree-special-m.svg;}
-node|z18-[natural=tree][!name],
 {icon-image: tree-m.svg;}
 
 node|z18-[xmas:feature=tree],
@@ -2402,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_station-small-m.svg;}
-{icon-image: charging-point-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?][capacity?],
+node|z14[amenity=charging_station][motorcar?],
-{icon-image: charging-station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging-station-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][capacity?],
 {text-offset: 1;font-size: 10;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
 {icon-min-distance: 20;}

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -103,6 +103,7 @@ node[tourism=wilderness_hut],
 node[amenity=dojo],
 node[leisure=dance],
 node[leisure=fitness_centre],
+node[leisure=miniature_golf],
 node[leisure=sports_centre],
 node[leisure=stadium],
 {text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}

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.10 Runway 12-22 ZOOM
-  8.11 Minor road borders
-  8.12 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 Runway 12-22 ZOOM */
-/* 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 */
 
 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-area                             # area z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, 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-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, 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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, 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                                    # line z6- (also has 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-bridge                             # line z6- (also has 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-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has 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-bridge                                # line z6- (also has 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-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-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
-# highway-trunk-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-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has 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-bridge                              # line z8- (also has 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-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                                   # line z10- (also has 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-bridge                            # line z10- (also has 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-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                                    # line z11- (also has 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-bridge                             # line z11- (also has 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-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z13-, line(casing) z16-, 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-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext 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                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, 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::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z14-, line(casing) z16-, 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 line::border z14-, pathtext z14-)
+highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, 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-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# 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                               # line z10- (also has 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-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::border z11-, line(casing) z13-, 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 line::border z11-, 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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z11-, line(casing) z13-, 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-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-, line::border z11-, 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                                # line z11- (also has 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-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::border z13-, line(casing) 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                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z13-, line(casing) z16-, 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-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z14-, line(casing) z16-, 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                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, 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::border z15-, line(casing) z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has line::border z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line::border z15-, line(casing) z15-, 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-, line::border z14-, pathtext z18-)
+# 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-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z15-, line::border 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-ford                                        # line z13- (also has icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, 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 line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, 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                                     # line z15- (also has pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has line::border z15-, pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+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-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16- (also has line::border z16-)
+highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+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-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::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+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::border z11-, line::bridgeblack z14-, 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-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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+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::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+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::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+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::border z14-, line::bridgeblack z16-, pathtext z14-)
+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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+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::border z13-, line::bridgeblack z14-, pathtext z16-)
+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::border z15-, line::bridgeblack z15-, 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::border z15-, line::bridgeblack z17-, 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::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield 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::border z14-, line::bridgeblack z14-, pathtext z18-)
+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-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::border z11-, line::bridgeblack z14-, 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::border z13-, line::bridgeblack z14-, pathtext z13-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-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 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-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::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+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::border z11-, line::bridgewhite z14-, 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-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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+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::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+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::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+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::border z14-, line::bridgewhite z16-, pathtext z14-)
+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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+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::border z13-, line::bridgewhite z14-, pathtext z16-)
+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::border z15-, line::bridgewhite z15-, 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::border 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::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield 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::border z14-, line::bridgewhite z14-, pathtext z18-)
+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-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::border z11-, line::bridgewhite z14-, 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::border z13-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-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 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                                    # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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-, line::border z8-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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-, line::border z8-)
+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::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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                                     # pathtext z10- (also has shield::shield z10-, line z8-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) 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                               # pathtext z10- (also has shield::shield z10-, line z10-)
-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-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::border z11-, line(casing) z13-)
+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-, line::border z11-)
+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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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::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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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-, line::border z11-)
+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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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                                # pathtext z11- (also has shield::shield z11-, line z11-)
-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-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::border z13-, line(casing) 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                                   # pathtext z10- (also has shield::shield z12-, line z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) z16-)
+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-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
+=== 3752
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
+
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3751
+
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 3750
 
+amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3749
+
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-adana                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-algiers                     # icon z16- (also has caption(optional) z17-)
@@ -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                                  # pathtext z14- (also has line z13-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z16-)
+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                                # pathtext z13- (also has line z11-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) z16-)
+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                                 # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+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::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z14-, line(casing) z16-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) z16-)
+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::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) 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::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::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) 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::shield                           # shield::shield z12- (also has pathtext z10-, line 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-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::border z10-, line(casing) z16-)
+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::shield                            # shield::shield z13- (also has pathtext z12-, line 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-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::border z11-, line(casing) z16-)
+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::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-area::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-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z14-, line(casing) z16-)
+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                                     # pathtext z15- (also has line z15-)
-highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
+highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite 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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite 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::border z14-, line(casing) z16-)
+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                                       # pathtext z16- (also has line z15-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite 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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+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                                     # pathtext z16- (also has line z15-)
-highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite 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-, line::border z16-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) 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                               # pathtext z14- (also has line z12-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+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                                      # pathtext z16- (also has line z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) 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-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
+# === -6248
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
+
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6249
+
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6250
 
+# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6251
+
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-adana                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-algiers                   # caption(optional) z17- (also has icon z16-)
@@ -2436,7 +2456,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18- (also has caption(optional) z18-)
+natural-tree                                        # icon z18-
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2474,7 +2494,6 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
-# natural-tree                                      # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (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/default/light/symbols/subway-vienna-m.svg

@@ -1,2 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
+ <g>
+  <circle cx="12" cy="12" r="12" fill="#FFF" opacity=".6"/>
+  <circle cx="12" cy="12" r="11" fill="#1565C0"/>
+  <path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF"/>
+ </g>
+</svg>

data/styles/default/light/symbols/subway-vienna-s.svg

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
-<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g>
- <g stroke-width=".75">
+  <circle cx="9" cy="9" r="9" fill="#FFF" opacity=".6"/>
-  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
+  <circle cx="9" cy="9" r="8" fill="#1565C0"/>
-  <circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
+  <path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF"/>
-  <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#fff"/>
  </g>
 </svg>

data/styles/default/light/symbols/tree-special-m.svg

@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#f5eada" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></g></svg>

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-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+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-area                             # area z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, 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-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
-highway-steps                                       # line z12- (also has line::border z15-, pathtext z13-)
+highway-steps                                       # line z12- (also has pathtext z13-)
-highway-steps-bridge                                # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, 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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, 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                                    # line z6- (also has 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-bridge                             # line z6- (also has 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-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has 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-bridge                                # line z6- (also has 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-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-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
-# highway-trunk-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-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has 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-bridge                              # line z8- (also has 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-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                                   # line z10- (also has 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-bridge                            # line z10- (also has 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-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                                    # line z11- (also has 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-bridge                             # line z11- (also has 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-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z13-, line(casing) z16-, 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-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext 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                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, 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::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z14-, line(casing) z16-, 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 line::border z14-, pathtext z14-)
+highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, 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-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# 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                               # line z10- (also has 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-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::border z11-, line(casing) z13-, 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 line::border z11-, 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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z11-, line(casing) z13-, 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-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-, line::border z11-, 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                                # line z11- (also has 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-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::border z13-, line(casing) 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                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z13-, line(casing) z16-, 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-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, 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::border z14-, line(casing) z16-, 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                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, 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::border z15-, line(casing) z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z13- (also has line::border z15-, pathtext z16-)
+highway-service                                     # line z13- (also has pathtext z16-)
-highway-service-area                                # line z13- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z13- (also has pathtext z16-)
-highway-service-bridge                              # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z13- (also has line::border z15-, line(casing) z15-, 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-, line::border z14-, pathtext z18-)
+# 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-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z13-, line::border 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-ford                                        # line z13- (also has icon z14-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, 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 line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, 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                                     # line z11- (also has pathtext z13-)
-highway-footway-area                                # line z11- and area z14- (also has line::border z15-, pathtext z13-)
+highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+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-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13- (also has line::border z16-)
+highway-footway-sidewalk                            # line z13-
-highway-footway-tunnel                              # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext 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-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::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+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::border z11-, line::bridgeblack z14-, 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-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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+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::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+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::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+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::border z14-, line::bridgeblack z16-, pathtext z14-)
+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::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+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::border z13-, line::bridgeblack z14-, pathtext z16-)
+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::border z15-, line::bridgeblack z15-, 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::border z15-, line::bridgeblack z17-, pathtext z13-)
+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::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield 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::border z14-, line::bridgeblack z14-, pathtext z18-)
+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-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::border z11-, line::bridgeblack z14-, 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::border z13-, line::bridgeblack z14-, pathtext z13-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
+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-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::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+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::border z11-, line::bridgewhite z14-, 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-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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+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::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+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::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+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::border z14-, line::bridgewhite z16-, pathtext z14-)
+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::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+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::border z13-, line::bridgewhite z14-, pathtext z16-)
+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::border z15-, line::bridgewhite z15-, 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::border z15-, line::bridgewhite z15-, pathtext z13-)
+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::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield 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::border z14-, line::bridgewhite z14-, pathtext z18-)
+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-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::border z11-, line::bridgewhite z14-, 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::border z13-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
+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                                    # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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-, line::border z8-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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-, line::border z8-)
+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::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
+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::border z8-, line(casing) z12-)
+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                                     # pathtext z10- (also has shield::shield z10-, line z8-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) 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                               # pathtext z10- (also has shield::shield z10-, line z10-)
-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-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::border z11-, line(casing) z13-)
+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-, line::border z11-)
+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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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::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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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-, line::border z11-)
+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::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z13-)
+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                                # pathtext z11- (also has shield::shield z11-, line z11-)
-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-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::border z13-, line(casing) 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                                   # pathtext z10- (also has shield::shield z12-, line z10-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) z16-)
+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-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-)
+=== 3752
-shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
+
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3751
+
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 3750
 
+amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
+=== 3749
+
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-adana                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-algiers                     # icon z16- (also has caption(optional) z17-)
@@ -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                                  # pathtext z14- (also has line z13-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z11-, line(casing) z16-)
+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                                # pathtext z13- (also has line z11-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) z16-)
+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                                 # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+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::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z14-, line(casing) z16-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z13-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) z16-)
+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::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z10-, line(casing) 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::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::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z13-, line(casing) 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::shield                           # shield::shield z12- (also has pathtext z10-, line 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-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::border z10-, line(casing) z16-)
+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::shield                            # shield::shield z13- (also has pathtext z12-, line 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-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::border z11-, line(casing) z16-)
+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::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-area::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-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+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::border z14-, line(casing) z16-)
+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                                     # pathtext z13- (also has line z11-)
-highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
+highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite 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::border z14-, line(casing) z16-)
+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                                       # pathtext z13- (also has line z12-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+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::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+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                                     # pathtext z16- (also has line z13-)
-highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z13-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) 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                               # pathtext z14- (also has line z12-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+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                                      # pathtext z16- (also has line z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) 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-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-)
+# === -6248
-# shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
+
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6249
+
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6250
 
+# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
+# === -6251
+
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-adana                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-algiers                   # caption(optional) z17- (also has icon z16-)
@@ -2442,7 +2462,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18- (also has caption(optional) z18-)
+natural-tree                                        # icon z18-
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2480,7 +2500,6 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
-# natural-tree                                      # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)

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|z15-[amenity=charging_station][motorcar?],
-node|z14-[amenity=charging_station][motorcar?][capacity=1],
+node|z16-[amenity=charging_station][motorcycle?],
-node|z14-[amenity=charging_station][motorcar?][capacity=2],
+node|z16-[amenity=charging_station][bicycle?],
+node|z16-[amenity=charging_station][motorcar=not],
 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-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", "disused", "bridge"}, {{"railway", "disused"}, {"bridge", "any_value"}}},
-      {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "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.

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h

@@ -59,7 +59,6 @@ NS_SWIFT_NAME(FrameworkHelper)
 + (void)updatePlacePageData;
 + (void)updateAfterDeleteBookmark;
 + (int)currentZoomLevel;
-+ (void)setCarScreenMode:(BOOL)enabled;
 
 @end
 

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm

@@ -241,8 +241,4 @@
   return [[ElevationProfileData alloc] initWithElevationInfo:GetFramework().GetTrackRecordingElevationInfo()];
 }
 
-+ (void)setCarScreenMode:(BOOL)enabled {
-  GetFramework().SetCarScreenMode(enabled);
-}
-
 @end

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/Classes/CarPlay/CarPlayService.swift

@@ -62,8 +62,6 @@ final class CarPlayService: NSObject {
       toWindow: window,
       isCarplayActivated: true
     )
-      
-    FrameworkHelper.setCarScreenMode(true)
   }
 
   private var savedInterfaceController: CPInterfaceController?
@@ -128,7 +126,6 @@ final class CarPlayService: NSObject {
         isCarplayActivated: false
       )
     }
-    FrameworkHelper.setCarScreenMode(false)
   }
 
   @objc func destroy() {
@@ -626,32 +623,22 @@ extension CarPlayService: CarPlayRouterListener {
 extension CarPlayService: LocationModeListener {
   func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) {
     currentPositionMode = mode
-    
+    guard let rootMapTemplate = rootMapTemplate,
-    // make sure we have a rootMapTemplate
+      let info = rootMapTemplate.userInfo as? MapInfo,
-    guard let rootMapTemplate = rootMapTemplate else {
+      info.type == CPConstants.TemplateType.main else {
-      return
-    }
-    
-    // exit if we're navigating
-    guard let info = rootMapTemplate.userInfo as? MapInfo,
-              info.type == CPConstants.TemplateType.main else {
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
         return
     }
     switch mode {
     case .follow, .followAndRotate:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .notFollow:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .pendingPosition, .notFollowNoPosition:
       rootMapTemplate.leadingNavigationBarButtons = []
-      MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
     }
   }
 }

iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift

@@ -5,7 +5,6 @@ final class MapTemplateBuilder {
     case startPanning
     case zoomIn
     case zoomOut
-    case myPositionMode
   }
   enum BarButtonType {
     case dismissPaning
@@ -70,10 +69,7 @@ final class MapTemplateBuilder {
     let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
       FrameworkHelper.zoomMap(.out)
     }
-    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+    mapTemplate.mapButtons = [panningButton, zoomInButton, zoomOutButton]
-      FrameworkHelper.switchMyPositionMode()
-    }
-    mapTemplate.mapButtons = [myPositionModeButton, panningButton, zoomInButton, zoomOutButton]
     
     let settingsButton = buildBarButton(type: .settings) { _ in
       let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
@@ -103,10 +99,7 @@ final class MapTemplateBuilder {
     let panningButton = buildMapButton(type: .startPanning) { _ in
       mapTemplate.showPanningInterface(animated: true)
     }
-    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
+    mapTemplate.mapButtons = [panningButton]
-      FrameworkHelper.switchMyPositionMode()
-    }
-    mapTemplate.mapButtons = [myPositionModeButton, panningButton]
     setupMuteAndRedirectButtons(template: mapTemplate)
     let endButton = buildBarButton(type: .endRoute) { _ in
       CarPlayService.shared.cancelCurrentTrip()
@@ -124,28 +117,6 @@ final class MapTemplateBuilder {
     mapTemplate.leadingNavigationBarButtons = [destinationButton]
   }
   
-  class func updateMyPositionModeButton(mapTemplate: CPMapTemplate, newMode: MWMMyPositionMode) {
-    let button = CPMapButton(handler: { _ in
-      FrameworkHelper.switchMyPositionMode()
-    })
-    
-    switch newMode {
-    case .pendingPosition:
-      button.image = UIImage(systemName: "location.fill")
-    case .notFollowNoPosition:
-      button.image = UIImage(systemName: "location")
-    case .notFollow:
-      button.image = UIImage(systemName: "location")
-    case .follow:
-      button.image = UIImage(systemName: "location.fill")
-    case .followAndRotate:
-      button.image = UIImage(systemName: "location.north.line.fill")
-    }
-    if mapTemplate.mapButtons.count > 0 {
-      mapTemplate.mapButtons[0] = button
-    }
-  }
-  
   class func setupRecenterButton(mapTemplate: CPMapTemplate) {
     let recenterButton = buildBarButton(type: .recenter) { _ in
       FrameworkHelper.switchMyPositionMode()
@@ -195,8 +166,6 @@ final class MapTemplateBuilder {
       button.image = UIImage(systemName: "plus")
     case .zoomOut:
       button.image = UIImage(systemName: "minus")
-    case .myPositionMode:
-      button.image = UIImage(systemName: "location")
     }
     // Remove code below once Apple has fixed its issue with the button background
     if #unavailable(iOS 26) {
@@ -207,8 +176,6 @@ final class MapTemplateBuilder {
         button.focusedImage = UIImage(systemName: "plus.circle.fill")
       case .zoomOut:
         button.focusedImage = UIImage(systemName: "minus.circle.fill")
-      case .myPositionMode:
-        button.image = UIImage(systemName: "location.fill")
       }
     }
     return button

iphone/Maps/Core/Theme/Core/ThemeManager.swift

@@ -41,14 +41,13 @@ final class ThemeManager: NSObject {
       }
     }(actualTheme)
 
-    let isCarPlayActive = CarPlayService.shared.isCarplayActivated
+    if Settings.mapAppearance == .light {
-    if !isCarPlayActive, Settings.mapAppearance == .light {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
           FrameworkHelper.setTheme(.vehicleDay)
       } else {
           FrameworkHelper.setTheme(.day)
       }
-    } else if !isCarPlayActive, Settings.mapAppearance == .dark {
+    } else if Settings.mapAppearance == .dark {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
         FrameworkHelper.setTheme(.vehicleNight)
       } else {

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" = "Autos";
-"type.amenity.charging_station.motorcar" = "Kfz-Ladestation";
+"type.amenity.charging_station.motorcycle" = "Motorräder";
-"type.amenity.charging_station.motorcar.small" = "Kfz-Ladestation";
+"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" = "Cars";
-"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcycle" = "Motorcycles";
-"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
+"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" = "Cars";
-"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcycle" = "Motorcycles";
-"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
+"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/Model/Settings.swift

@@ -186,7 +186,7 @@ import AVFoundation
                 return mapAppearance
             }
             
-            return .light
+            return .auto
         }
         set {
             UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapAppearance)

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

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

@@ -175,16 +175,6 @@ void Framework::OnLocationUpdate(GpsInfo const & info)
 #endif
 
   m_routingManager.OnLocationUpdate(rInfo);
-  
-  bool const isRoutingActive = m_routingManager.IsRoutingActive();
-    
-  if (m_wasRoutingActive != isRoutingActive)
-  {
-    m_wasRoutingActive = isRoutingActive;
-      
-    /// State changed (Started OR Stopped) -> Refresh 3D Buildings
-    Refresh3dMode();
-  }
 }
 
 void Framework::OnCompassUpdate(CompassInfo const & info)
@@ -2434,10 +2424,6 @@ void Framework::Allow3dMode(bool allow3d, bool allow3dBuildings)
   if (!m_powerManager.IsFacilityEnabled(power_management::Facility::Buildings3d))
     allow3dBuildings = false;
 
-  /// If we are in CarPlay/AA mode and Navigation is active, force 3D buildings off.
-  if (m_isCarScreenMode && m_routingManager.IsRoutingActive())
-    allow3dBuildings = false;
-
   m_drapeEngine->Allow3dMode(allow3d, allow3dBuildings);
 }
 
@@ -3238,7 +3224,6 @@ void Framework::OnRouteFollow(routing::RouterType type)
   // GetRoutingSettings(type).m_matchRoute to the FollowRoute() instead of |isPedestrianRoute|.
   // |isArrowGlued| parameter fully corresponds to |m_matchRoute| in RoutingSettings.
   m_drapeEngine->FollowRoute(scale, scale3d, enableAutoZoom, !isPedestrianRoute /* isArrowGlued */);
-  Refresh3dMode();
 }
 
 // RoutingManager::Delegate
@@ -3307,25 +3292,3 @@ void Framework::OnPowerSchemeChanged(power_management::Scheme const actualScheme
   if (actualScheme == power_management::Scheme::EconomyMaximum && GetTrafficManager().IsEnabled())
     GetTrafficManager().SetEnabled(false);
 }
-
-void Framework::SetCarScreenMode(bool enabled)
-{
-  if (m_isCarScreenMode == enabled)
-    return;
-
-  m_isCarScreenMode = enabled;
-
-  bool allow3d, allow3dBuildings;
-  Load3dMode(allow3d, allow3dBuildings);
-  Allow3dMode(allow3d, allow3dBuildings);
-}
-
-void Framework::Refresh3dMode()
-{
-  bool allow3d = true;
-  bool allow3dBuildings = true;
-  
-  /// Load User Preferences and apply logic
-  Load3dMode(allow3d, allow3dBuildings);
-  Allow3dMode(allow3d, allow3dBuildings);
-}

libs/map/framework.hpp

@@ -769,13 +769,4 @@ public:
   // PowerManager::Subscriber override.
   void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override;
   void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override;
-  
-public:
-  /// Call this from iOS/Android when CarPlay/AA session starts/ends
-  void SetCarScreenMode(bool enabled);
-  bool m_isCarScreenMode = false;
-  
-private:
-  void Refresh3dMode();
-  bool m_wasRoutingActive = false;
 };

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