[android] Add arrow icon in search before distance

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

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

@@ -1044,11 +1044,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (isFullscreen())
       setFullscreen(false);
 
-    if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION)
-    {
-      // Calls onMyPositionModeChanged(PENDING_POSITION).
-      LocationState.nativeSwitchToNextMode();
-    }
+    // Calls onMyPositionModeChanged(PENDING_POSITION).
+    LocationState.nativeStartPendingPositionMode();
 
     MapObject startPoint = MwmApplication.from(this).getLocationHelper().getMyPosition();
     RoutingController.get().prepare(startPoint, endPoint);
@@ -1196,7 +1193,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (mOnmapDownloader != null)
       mOnmapDownloader.onResume();
 
-    mNavigationController.refresh();
+    mNavigationController.refresh(getApplicationContext(), Framework.nativeGetRouteFollowingInfo());
     refreshLightStatusBar();
 
     MwmApplication.from(this).getSensorHelper().addListener(this);
@@ -2016,8 +2013,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     {
       final boolean hasFineLocationPermission = LocationUtils.checkFineLocationPermission(this);
 
-      if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION)
-        LocationState.nativeSwitchToNextMode();
+      LocationState.nativeStartPendingPositionMode();
 
       if (requestedForRecording && hasFineLocationPermission)
         startTrackRecording();
@@ -2140,11 +2136,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     Logger.i(LOCATION_TAG, "Location resolution has been granted, restarting location");
-    if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION)
-    {
-      // Calls onMyPositionModeChanged(PENDING_POSITION).
-      LocationState.nativeSwitchToNextMode();
-    }
+
+    // Calls onMyPositionModeChanged(PENDING_POSITION).
+    LocationState.nativeStartPendingPositionMode();
   }
 
   /**

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

@@ -114,6 +114,7 @@ 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);
@@ -159,6 +160,7 @@ 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/routing/NavigationController.java

@@ -1,7 +1,10 @@
 package app.organicmaps.routing;
 
+import static androidx.core.content.ContextCompat.getString;
 import static app.organicmaps.sdk.util.Utils.dimen;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -13,6 +16,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
@@ -58,6 +62,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
   private final NavMenu mNavMenu;
   View.OnClickListener mOnSettingsClickListener;
+  private final SharedPreferences sharedPreferences;
+  private final boolean speedLimitEnabled;
 
   private void addWindowsInsets(@NonNull View topFrame)
   {
@@ -72,6 +78,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
   public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
                               NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
   {
+    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+    speedLimitEnabled = sharedPreferences.getBoolean(getString(activity, R.string.pref_speedlimit),true);
     mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);
 
     mFrame = activity.findViewById(R.id.navigation_frame);
@@ -97,6 +105,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
     mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
+    if (speedLimitEnabled)
+    {
+        UiUtils.show(mSpeedLimit);
+        UiUtils.show(mCurrentSpeed);
+    }
+    else
+    {
+        UiUtils.hide(mSpeedLimit);
+        UiUtils.hide(mCurrentSpeed);
+    }
 
     View mTopbar = topFrame.findViewById(R.id.statutbar);
     ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
@@ -136,7 +154,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -144,7 +163,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -205,9 +225,22 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNavMenu.collapseNavBottomSheet();
   }
 
-  public void refresh()
+  public void refresh(Context context, RoutingInfo info)
   {
-    mNavMenu.refreshTts();
+      mNavMenu.refreshTts();
+      if (speedLimitEnabled != sharedPreferences.getBoolean(getString(context, R.string.pref_speedlimit),true)) {
+          if (speedLimitEnabled)
+          {
+              UiUtils.show(mSpeedLimit);
+              UiUtils.show(mCurrentSpeed);
+              updateSpeedWidgets(info);
+          }
+          else
+          {
+              UiUtils.hide(mSpeedLimit);
+              UiUtils.hide(mCurrentSpeed);
+          }
+      }
   }
 
   @Override

android/app/src/main/res/drawable/ic_follow_16dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="16dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M 20.215 3.79 L 2.215 11.32 L 2.215 12.29 L 9.055 14.95 L 11.715 21.79 L 12.675 21.79 Z"/>
+</vector>

android/app/src/main/res/drawable/ic_speed.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?iconTint">
+  <path
+      android:pathData="M418,620q24,24 62,23.5t56,-27.5l224,-336 -336,224q-27,18 -28.5,55t22.5,61ZM480,160q59,0 113.5,16.5T696,226l-76,48q-33,-17 -68.5,-25.5T480,240q-133,0 -226.5,93.5T160,560q0,42 11.5,83t32.5,77h552q23,-38 33.5,-79t10.5,-85q0,-36 -8.5,-70T766,420l48,-76q30,47 47.5,100T880,554q1,57 -13,109t-41,99q-11,18 -30,28t-40,10L204,800q-21,0 -40,-10t-30,-28q-26,-45 -40,-95.5T80,560q0,-83 31.5,-155.5t86,-127Q252,223 325,191.5T480,160ZM487,473Z"
+      android:fillColor="#FFFFFF"/>
+</vector>

android/app/src/main/res/drawable/ic_track_recording_off.xml

@@ -3,8 +3,9 @@
   android:width="74dp"
   android:height="57dp"
   android:viewportWidth="74"
-  android:viewportHeight="57">
+  android:viewportHeight="57"
+  android:tint="?iconTint">
   <path
-    android:fillColor="#757575"
+    android:fillColor="#FFFFFF"
     android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
 </vector>

android/app/src/main/res/drawable/ic_track_recording_on.xml

@@ -6,7 +6,7 @@
   android:viewportHeight="80">
     <path
       android:pathData="m4.858,10.076c0,-5.523 4.477,-10 10,-10h60c5.523,0 10,4.477 10,10v60c0,5.523 -4.477,10 -10,10h-60c-5.523,0 -10,-4.477 -10,-10z"
-      android:fillColor="@color/active_track_recording"
+      android:fillColor="@color/base_red"
       android:fillAlpha="0.78" />
     <path
       android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -65,9 +66,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_alignParentEnd="true"
+    android:gravity="center_vertical"
     android:layout_alignBaseline="@id/region"
     android:layout_below="@id/description"
     android:textAppearance="@style/MwmTextAppearance.Body3"
+    app:drawableStartCompat="@drawable/ic_follow_16dp"
+    app:drawableTint="?colorSecondary"
     android:textColor="?colorSecondary"
     tools:text="500 km"/>
 </RelativeLayout>

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

@@ -12,7 +12,7 @@
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
     app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
-    android:layout_marginBottom="@dimen/margin_eighth"
+    android:layout_marginBottom="@dimen/margin_eighth_plus"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"

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

@@ -927,4 +927,6 @@
     <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
     <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
     <string name="pref_maplanguage_local">Langue locale</string>
+    <string name="pref_speedlimit_title">Compteur de vitesse</string>
+    <string name="pref_speedlimit_summary">Affichage de la vitesse durant la navigation</string>
 </resources>

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

@@ -8,6 +8,7 @@
 
   <!-- margins -->
   <dimen name="margin_eighth">2dp</dimen>
+  <dimen name="margin_eighth_plus">3dp</dimen>
   <dimen name="margin_quarter">4dp</dimen>
   <dimen name="margin_quarter_plus">6dp</dimen>
   <dimen name="margin_half">8dp</dimen>

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

@@ -45,6 +45,7 @@
   <string name="pref_power" translatable="false">pref_power</string>
   <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
   <string name="pref_advanced" translatable="false">pref_advanced</string>
+  <string name="pref_speedlimit" translatable="false">pref_speedlimit</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

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

@@ -975,4 +975,6 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <string name="pref_speedlimit_title">Speed limit</string>
+    <string name="pref_speedlimit_summary">Show speed limit during navigation</string>
 </resources>

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

@@ -143,6 +143,14 @@
         <extra android:name="from" android:value="settings" />
       </intent>
     </PreferenceScreen>
+    <SwitchPreferenceCompat
+        android:key="@string/pref_speedlimit"
+        android:title="@string/pref_speedlimit_title"
+        android:summary="@string/pref_speedlimit_summary"
+        android:defaultValue="true"
+        android:widgetLayout="@layout/preference_switch"
+        app:singleLineTitle="true"
+        app:icon="@drawable/ic_speed"/>
   </androidx.preference.PreferenceCategory>
 
   <PreferenceCategory

android/sdk/src/main/assets/countries_meta.txt

@@ -0,0 +1 @@
+../../../../../data/countries_meta.txt

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

@@ -696,6 +696,12 @@ void Framework::SwitchMyPositionNextMode()
   m_work.SwitchMyPositionNextMode();
 }
 
+void Framework::StartPendingPositionMode()
+{
+  ASSERT(IsDrapeEngineCreated(), ());
+  m_work.StartPendingPositionMode();
+}
+
 void Framework::SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor)
 {
   m_guiPositions[widget] = gui::Position(m2::PointF(x, y), anchor);
@@ -1490,6 +1496,12 @@ 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/cpp/app/organicmaps/sdk/Framework.hpp

@@ -169,6 +169,7 @@ public:
   void SetMyPositionModeListener(location::TMyPositionModeChanged const & fn);
   location::EMyPositionMode GetMyPositionMode() const;
   void SwitchMyPositionNextMode();
+  void StartPendingPositionMode();
 
   void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn);
   void SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn const & fn);

android/sdk/src/main/cpp/app/organicmaps/sdk/LocationState.cpp

@@ -31,6 +31,14 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeGet
   return g_framework->GetMyPositionMode();
 }
 
+//  public static void nativeStartFindingPosition();
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeStartPendingPositionMode(JNIEnv * env,
+                                                                                              jclass clazz)
+{
+  ASSERT(g_framework, ());
+  g_framework->StartPendingPositionMode();
+}
+
 //  public static void nativeSetListener(ModeChangeListener listener);
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz,
                                                                                          jobject listener)

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

@@ -280,6 +280,8 @@ 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,6 +9,7 @@ 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;
@@ -16,6 +17,9 @@ 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;
@@ -25,7 +29,8 @@ 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
 {
@@ -56,6 +61,12 @@ 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
@@ -187,7 +198,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -201,20 +211,80 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    if (mSavedLocation != null)
+    updateProviderDecision(location);
+    if (mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider()))
     {
-      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      {
-        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
-        return;
-      }
+      Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+      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/location/LocationState.java

@@ -42,6 +42,7 @@ public final class LocationState
   public static native void nativeSwitchToNextMode();
   @Value
   private static native int nativeGetMode();
+  public static native void nativeStartPendingPositionMode();
 
   public static native void nativeSetListener(@NonNull ModeChangeListener listener);
   public static native void nativeRemoveListener();

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

@@ -81,20 +81,6 @@ 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)

data/countries_meta.txt

@@ -1,9 +1,9 @@
 {
 "World": {
- "languages": ["int_name", "en", "default"]
+ "languages": []
 },
 "WorldCoasts": {
- "languages": ["int_name", "en", "default"]
+ "languages": []
 },
 "Abkhazia": {
  "languages": ["ab", "ru"]

data/fonts/whitelist.txt

@@ -22,3 +22,6 @@ Bengali /system/fonts/NotoSansBengali-Regular.ttf
 Bengali fonts/00_NotoSansBengali-Regular.ttf
 Hebrew /system/fonts/NotoSansHebrew-Regular.ttf
 Hebrew fonts/00_NotoSansHebrew-Regular.ttf
+Latin_Extended_Additional /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
+Latin_Extended_Additional /system/fonts/Roboto-Medium.ttf
+Latin_Extended_Additional fonts/07_roboto_medium.ttf

data/styles/cycling/dark/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");

data/styles/cycling/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/cycling/include/Basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/cycling/include/Basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/cycling/include/Icons.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");

data/styles/cycling/include/Subways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");

data/styles/cycling/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

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

@@ -1,258 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-by-size geometry: background areas rendered below BG-top and everything else.
-# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
-# So effectively priority values of BG-by-size areas are not used at the moment.
-# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
-# Keep them in a logical importance order please.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
-=== 250
-
-amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious                                   # area z13-
-=== 240
-
-amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
-=== 230
-
-landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
-=== 220
-
-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
-=== 200
-
-amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
-leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
-leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
-=== 190
-
-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-)
-landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
-=== 180
-
-amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
-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-, 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-)
-leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
-office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
-tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
-tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
-tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
-=== 170
-
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
-leisure-track-area                                  # area z15- (also has caption z16-)
-=== 160
-
-aeroway-terminal                                    # area z14- (also has caption z15-)
-=== 150
-
-leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
-=== 140
-
-landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
-=== 130
-
-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
-=== 120
-
-area:highway-footway                                # area z14- (also has caption z15-)
-area:highway-living_street                          # area z14-
-area:highway-pedestrian                             # area z14- (also has caption z15-)
-public_transport-platform                           # area z16- (also has caption z17-)
-railway-platform                                    # area z16- (also has caption z16-)
-=== 110
-
-amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
-amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
-amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-=== 100
-
-natural-wetland                                     # area z11- (also has caption z16-)
-natural-wetland-bog                                 # area z11- (also has caption z16-)
-natural-wetland-fen                                 # area z11- (also has caption z16-)
-natural-wetland-mangrove                            # area z11- (also has caption z16-)
-natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-reedbed                             # area z11- (also has caption z16-)
-natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
-natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
-natural-wetland-swamp                               # area z11- (also has caption z16-)
-natural-wetland-tidalflat                           # area z11- (also has caption z16-)
-=== 90
-
-landuse-farmyard                                    # area z10- (also has caption z15-)
-=== 81
-
-landuse-allotments                                  # area z12- (also has caption z15-)
-landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
-landuse-orchard                                     # area z12- (also has caption z15-)
-landuse-recreation_ground                           # area z12- (also has caption z15-)
-landuse-village_green                               # area z12-
-landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
-natural-scree                                       # area z11-
-natural-shingle                                     # area z12-
-=== 80
-
-landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
-=== 70
-
-landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
-=== 60
-
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
-landuse-construction                                # area z13- (also has caption z15-)
-landuse-industrial                                  # area z13- (also has caption z15-)
-landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z13- (also has caption z15-)
-man_made-wastewater_plant                           # area z13- (also has caption z15-)
-man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
-power-generator                                     # area z13- (also has icon z17-)
-power-generator-gas                                 # area z13- (also has icon z17-)
-power-generator-hydro                               # area z13- (also has icon z17-)
-power-generator-solar                               # area z13-
-power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
-power-plant                                         # area z13- (also has icon z17-)
-power-plant-coal                                    # area z13- (also has icon z17-)
-power-plant-gas                                     # area z13- (also has icon z17-)
-power-plant-hydro                                   # area z13- (also has icon z17-)
-power-plant-solar                                   # area z13- (also has icon z17-)
-power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
-=== 50
-
-amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
-=== 40
-
-aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
-aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z13-
-landuse-retail                                      # area z13- (also has caption z16-)
-leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
-natural-beach                                       # area z10- (also has caption z15-)
-natural-beach-gravel                                # area z10- (also has caption z15-)
-natural-beach-sand                                  # area z10- (also has caption z15-)
-natural-desert                                      # area z1- (also has caption z14-)
-natural-glacier                                     # area z1-
-natural-sand                                        # area z1- (also has caption z15-)
-=== 30
-
-natural-land                                        # area z1-
-place-islet                                         # area z10- (also has caption z14-)
-=== 20
-
-natural-coastline                                   # area z1-
-=== 10

data/styles/cycling/include/priorities_2_BG-top.prio.txt

@@ -1,46 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-top geometry: background lines and areas that should be always below foreground ones
-# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
-# because ordering by size doesn't always work with e.g. water mapped over a forest,
-# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
-# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
-# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
-# are displayed above layer=0 BG-top.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-landuse-basin                                       # area z12-
-landuse-reservoir                                   # area z12- (also has caption z10-)
-landuse-salt_pond                                   # area z1-
-natural-water                                       # area z1- (also has caption z10-)
-natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z13- (also has caption z17-)
-natural-water-drain                                 # area z13- (also has caption z17-)
-natural-water-lake                                  # area z1- (also has caption z10-)
-natural-water-lock                                  # area z1- (also has caption z10-)
-natural-water-moat                                  # area z1- (also has caption z17-)
-natural-water-pond                                  # area z1- (also has caption z10-)
-natural-water-reservoir                             # area z1- (also has caption z10-)
-natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z12- (also has caption z17-)
-waterway-dock                                       # area z1-
-=== 20
-
-natural-strait                                      # line z13- (also has caption z13-)
-waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z13-
-waterway-drain                                      # line z13-
-waterway-fish_pass                                  # line z13- (also has pathtext z13-)
-waterway-river                                      # line z10- (also has pathtext z11-)
-waterway-stream                                     # line z13- (also has pathtext z13-)
-waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
-waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
-=== 10

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

@@ -1,481 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
-# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
-# is layer=-10 (as tunnels should be visibile over landcover and water).
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-=== 380
-
-aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-=== 370
-
-historic-citywalls                                  # line z14- (also has pathtext z16-)
-=== 360
-
-power-line                                          # line z19- (also has line::dash z19-)
-=== 350
-
-power-line::dash                                    # line::dash z19- (also has line z19-)
-=== 340
-
-highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
-hwtag-oneway::arrows                                # line::arrows z15-
-waterway-weir                                       # line z14- (also has pathtext z15-)
-=== 330
-
-barrier-city_wall                                   # line z14- (also has pathtext z16-)
-barrier-fence                                       # line z16-
-barrier-guard_rail                                  # line z17-
-barrier-hedge                                       # line z16-
-barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
-railway-funicular                                   # line z12-
-railway-funicular-bridge                            # line z12-
-railway-funicular-tunnel                            # line z12-
-railway-monorail                                    # line z14-
-railway-monorail-bridge                             # line z14-
-railway-monorail-tunnel                             # line z14-
-railway-narrow_gauge                                # line z15-
-railway-narrow_gauge-bridge                         # line z15-
-railway-narrow_gauge-tunnel                         # line z15-
-railway-tram                                        # line z13-
-railway-tram-bridge                                 # line z13-
-railway-tram-tunnel                                 # line z13-
-=== 320
-
-highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-world_level                                 # line z4-9
-highway-world_towns_level                           # line z6-9
-=== 310
-
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, 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 pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
-railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
-railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
-railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-main::dash                             # line::dash z16- (also has line z10-)
-railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
-railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
-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-, pathtext z10-, shield::shield z10-)
-# === 289
-
-railway-rail-branch                                 # line z11- (also has line::dash z16-)
-railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-highspeed                              # line z10- (also has line::dash z16-)
-railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-main                                   # line z10- (also has line::dash z16-)
-railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
-railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
-railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
-=== 280
-
-# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
-# === 279
-
-highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 270
-
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
-# === 269
-
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
-=== 250
-
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
-# === 249
-
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
-=== 230
-
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
-# === 229
-
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 228
-
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, 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 pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 226
-
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
-# === 225
-
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
-=== 224
-
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
-=== 223
-
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
-=== 222
-
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, 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-)
-railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-service::dash                          # line::dash z17- (also has line z16-)
-railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
-railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
-railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
-railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
-railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
-railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
-railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
-railway-subway::dash                                # line::dash z16- (also has line z13-)
-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::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-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
-railway-light_rail                                  # line z13- (also has line::dash z16-)
-railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail                                        # line z11- (also has line::dash z16-)
-railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service                                # line z16- (also has line::dash z17-)
-railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
-railway-rail-spur                                   # line z15- (also has line::dash z17-)
-railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
-railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
-railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-utility                                # line z13- (also has line::dash z17-)
-railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
-railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
-railway-subway                                      # line z13- (also has line::dash z16-)
-railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-=== 210
-
-# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
-# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
-# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
-# === 209
-
-highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
-=== 200
-
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, 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 pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
-highway-path                                        # line z15- (also has pathtext z15-)
-highway-path-difficult                              # line z15- (also has pathtext z15-)
-highway-path-expert                                 # line z15- (also has pathtext z15-)
-highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z15- (also has pathtext z15-)
-highway-track-area                                  # line z15- (also has pathtext z15-)
-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-)
-=== 180
-
-highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
-railway-abandoned                                   # 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-
-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-
-=== 160
-
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-path-horse                                  # line z15- (also has pathtext z15-)
-highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 153
-
-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::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::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
-highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
-railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
-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-)
-=== 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::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::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
-highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
-railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
-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-)
-=== 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-)
-=== 130
-
-piste:type-connection                               # line z15-
-piste:type-downhill                                 # line z14- (also has pathtext z15-)
-piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
-piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
-piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
-piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
-piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
-piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z15- (also has pathtext z15-)
-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-)
-=== 120
-
-building:part                                       # area z16-
-=== 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-
-=== 100
-
-boundary-administrative-2                           # line z2-
-boundary-administrative-3                           # line z4
-boundary-administrative-4                           # line z5-
-=== 90
-
-man_made-cutline                                    # line z14-
-route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
-
-aeroway-runway                                      # line z12-
-aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z16-
-=== 70
-
-isoline-step_10                                     # line z15- (also has pathtext z17-)
-isoline-step_100                                    # line z12- (also has pathtext z14-)
-isoline-step_1000                                   # line z11- (also has pathtext z11-)
-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-)
-=== 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-)
-waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
-=== 30
-
-landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
-landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-=== 25
-
-amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
-boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
-=== 20
-
-piste:type-snow_park                                # area z14- (also has caption z15-)
-=== 15
-
-man_made-bridge                                     # area z14-
-=== 10

data/styles/cycling/include/ways.mapcss

@@ -1,42 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
-
-
-line|z13[highway=cycleway]
-{width: 2.0;}
-line|z14[highway=cycleway],
-{width: 2.2;}
-line|z15[highway=cycleway],
-{width: 2.5;}
-line|z16[highway=cycleway],
-{width: 3;}
-line|z17[highway=cycleway],
-{width: 3.4;}
-line|z18[highway=cycleway],
-{width: 4.2;}
-line|z19-[highway=cycleway],
-{width: 5.2;}
-
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.5;}
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 2.2;}
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 2;}
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{width: 2.8;}
-
-line|z15[highway=footway][bicycle=designated]::cycleline,
-{width: 1.7;}
-line|z16[highway=footway][bicycle=designated]::cycleline,
-{width: 1.8;}
-line|z17[highway=footway][bicycle=designated]::cycleline,
-{width: 2.1;}
-line|z18[highway=footway][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=footway][bicycle=designated]::cycleline,
-{width: 3.0;}

data/styles/cycling/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");

data/styles/cycling/light/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");

data/styles/cycling/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/default/dark/colors.mapcss

@@ -162,11 +162,19 @@
 @path: #944A12;
 @path_expert: #523E33;
 @bridleway: #2B2827;
+@motorway1_border: #784606;
+@trunk1_border: #79511D;
+@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/style.mapcss

@@ -1,9 +1,134 @@
 @import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #FFFFFF;
+  GuiText-opacity: 0.7;
+  MyPositionAccuracy-color: #FFFFFF;
+  MyPositionAccuracy-opacity: 0.06;
+  Selection-color: #FFFFFF;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #FFB94B;
+  RoutePedestrian-opacity: 0.7;
+  RouteBicycle-color: #FF4B8C;
+  RouteBicycle-opacity: 0.7;
+  RouteRuler-color: #924ab5;
+  RouteRuler-opacity: 0.7;
+  RoutePreview-color: #FFFFFF;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #055FCD;
+  RouteArrowsMaskCar-opacity: 0.3;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #FF4B8C;
+  RouteArrowsMaskBicycle-opacity: 0.5;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #41C8FF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #FF9800;
+  TrackCarSpeed-color: #FFCA28;
+  TrackPlaneSpeed-color: #FFF5A0;
+  TrackUnknownDistance-color: #969696;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
+  TrafficTempBlock-color: #232323;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #C4C4C4;
+  TrafficArrowDark-color: #191919;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldWhiteBackground-color: #999999;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #B58E1B;
+  PoiHotelTextOutline-color: #000000;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #888888;
+  RouteMarkPrimaryTextOutline-color: #000000;
+  RouteMarkSecondaryText-color: #888888;
+  RouteMarkSecondaryTextOutline-color: #000000;
+  TransitMarkPrimaryText-color: #888888;
+  TransitMarkPrimaryTextOutline-color: #000000;
+  TransitMarkSecondaryText-color: #888888;
+  TransitMarkSecondaryTextOutline-color: #000000;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #888888;
+  TransitStopInnerMarker-color: #000000;
+  LocalAdsPrimaryText-color: #888888;
+  LocalAdsPrimaryTextOutline-color: #000000;
+  LocalAdsSecondaryText-color: #888888;
+  LocalAdsSecondaryTextOutline-color: #000000;
+  TransitBackground-color: #000000;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #B8B8B8;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}

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

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0562 .4152)"><path d="m7.76536687 1.02582924 2.91781373 1.20859801c.4900562.20298792.8794043.59233606 1.0823922 1.08239221l1.208598 2.91781372c.2029879.49005615.2029879 1.04067751 0 1.5307337l-1.208598 2.91781362c-.2029879.4900562-.5923361.8794044-1.0823922 1.0823923l-2.91781376 1.208598c-.49005615.2029879-1.04067751.2029879-1.53073369 0l-2.91781366-1.208598c-.49005618-.2029879-.87940432-.592336-1.08239223-1.0823922l-1.20859802-2.91781373c-.2029879-.49005617-.2029879-1.04067755.00000001-1.53073373l1.208598-2.91781368c.20298791-.49005618.59233603-.8794043 1.0823922-1.0823922l2.9178137-1.20859802c.49005617-.2029879 1.04067755-.2029879 1.53073372 0z" fill="#181715"/><path d="m7.57402516 1.48776901 2.91781374 1.20859801c.3675421.15224093.6595532.44425202.8117941.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781374c-.1522409.3675421-.444252.6595532-.8117941.8117941l-2.91781374 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.444252-.81179415-.8117941l-1.20859801-2.91781374c-.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

@@ -1,6 +1,6 @@
 /* ~~~~ CONTENT OF BASEMAP ~~~~~
 
-1.BASICS
+1.Z-INDEX of BASEMAP
 2.LAND
 3.BOUNDARY
   3.1 Countries
@@ -28,35 +28,6 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
-
-/* 1. BASICS */
-
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}
-
-
 /* 2.LAND */
 
 area|z0-[natural=coastline],

data/styles/default/include/Icons.mapcss

@@ -22,6 +22,7 @@
  6.1 Craft
 7.CAR
  7.1 Parking
+8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -69,6 +70,7 @@ node|z14-[natural=geyser],
 node|z16-[natural=beach],
 area|z14-[natural=bare_rock],
 node|z17-[natural=rock],
+node|z17-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
 
 node|z13-[natural=peak][!name],
@@ -205,7 +207,9 @@ 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],
+node|z17-[natural=tree][name],
+{icon-image: tree-special-m.svg;}
+node|z18-[natural=tree][!name],
 {icon-image: tree-m.svg;}
 
 node|z18-[xmas:feature=tree],
@@ -2535,4 +2539,8 @@ node|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}
 
 node|z18-[amenity=parking_space][parking_space=disabled],
-{icon-image: parking-disabled-m.svg;}
+{icon-image: parking-disabled-m.svg;}
+
+/* 8. Colored Labels */
+
+@import("../../default/include/Icons_Label_Colors.mapcss");

data/styles/default/include/Roads.mapcss

@@ -35,7 +35,9 @@
   8.7 Footway 15-22 ZOOM
   8.8 Steps 15-22 ZOOM
   8.9 Bridleway 14-22 ZOOM
-  8.10 Runway 12-22 ZOOM
+  8.10 Major road borders
+  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
@@ -137,17 +139,17 @@ line|z12[highway=motorway],
 line|z13[highway=motorway],
 {width: 4.0;}
 line|z14[highway=motorway],
-{width: 4.4;}
+{width: 3.4;}
 line|z15[highway=motorway],
-{width: 5.6;}
+{width: 4.6;}
 line|z16[highway=motorway],
-{width: 7.8;}
+{width: 6.8;}
 line|z17[highway=motorway],
-{width: 9.0;}
+{width: 8.0;}
 line|z18[highway=motorway],
-{width: 12.0;}
+{width: 11.0;}
 line|z19-[highway=motorway],
-{width: 16.0;}
+{width: 15.0;}
 
 line|z6[highway=motorway],
 line|z6[highway=trunk],
@@ -170,17 +172,17 @@ line|z12[highway=trunk],
 line|z13[highway=trunk],
 {width: 3.6;}
 line|z14[highway=trunk],
-{width: 4.0;}
+{width: 3.0;}
 line|z15[highway=trunk],
-{width: 4.8;}
+{width: 3.8;}
 line|z16[highway=trunk],
-{width: 6.2;}
+{width: 5.2;}
 line|z17[highway=trunk],
-{width: 8.2;}
+{width: 7.2;}
 line|z18[highway=trunk],
-{width: 11;}
+{width: 10;}
 line|z19-[highway=trunk],
-{width: 13.5;}
+{width: 12.5;}
 
 line|z10[highway=motorway_link],
 line|z10[highway=trunk_link]
@@ -196,22 +198,22 @@ line|z13[highway=trunk_link]
 {width: 1.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{width: 2.7;}
+{width: 1.7;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{width: 3.7;}
+{width: 2.7;}
 line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
-{width: 5.1;}
+{width: 4.1;}
 line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
-{width: 6.7;}
+{width: 5.7;}
 line|z18[highway=motorway_link],
 line|z18[highway=trunk_link]
-{width: 9.5;}
+{width: 8.5;}
 line|z19-[highway=motorway_link],
 line|z19-[highway=trunk_link]
-{width: 11.7;}
+{width: 10.7;}
 
 /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */
 
@@ -300,23 +302,23 @@ line|z9[highway=primary],
 line|z10[highway=primary],
 {width: 1.8;}
 line|z11[highway=primary],
-{width: 2.3;}
+{width: 1.3;}
 line|z12[highway=primary],
-{width: 2.7;}
+{width: 1.7;}
 line|z13[highway=primary],
-{width: 3.0;}
+{width: 2.0;}
 line|z14[highway=primary],
-{width: 3.8;}
+{width: 2.8;}
 line|z15[highway=primary],
-{width: 4.4;}
+{width: 3.4;}
 line|z16[highway=primary],
-{width: 5.4;}
+{width: 4.4;}
 line|z17[highway=primary],
-{width: 7;}
+{width: 6;}
 line|z18[highway=primary],
-{width: 10;}
+{width: 9;}
 line|z19-[highway=primary],
-{width: 12;}
+{width: 11;}
 
 
 line|z11[highway=primary_link],
@@ -328,15 +330,15 @@ line|z13[highway=primary_link],
 line|z14[highway=primary_link],
 {width: 1.8;}
 line|z15[highway=primary_link],
-{width: 2.5;}
+{width: 1.5;}
 line|z16[highway=primary_link],
-{width: 3.2;}
+{width: 2.2;}
 line|z17[highway=primary_link],
-{width: 4.7;}
+{width: 3.7;}
 line|z18[highway=primary_link],
-{width: 6.4;}
+{width: 5.4;}
 line|z19-[highway=primary_link],
-{width: 8.2;}
+{width: 7.2;}
 
 /* 4.2 Primary tunnel 14-22 ZOOM */
 
@@ -394,38 +396,38 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 line|z10[highway=secondary],
 {width: 1.4;}
 line|z11[highway=secondary],
-{width: 2.2;}
+{width: 1.2;}
 line|z12[highway=secondary],
-{width: 2.5;}
+{width: 1.5;}
 line|z13[highway=secondary],
-{width: 2.7;}
+{width: 1.7;}
 line|z14[highway=secondary],
-{width: 3.2;}
+{width: 2.2;}
 line|z15[highway=secondary],
-{width: 3.8;}
+{width: 2.8;}
 line|z16[highway=secondary],
-{width: 5;}
+{width: 4;}
 line|z17[highway=secondary],
-{width: 6.6;}
+{width: 5.6;}
 line|z18[highway=secondary],
-{width: 9.4;}
+{width: 8.4;}
 line|z19-[highway=secondary],
-{width: 11.6;}
+{width: 10.6;}
 
 line|z13[highway=secondary_link],
 {width: 1.3;}
 line|z14[highway=secondary_link],
 {width: 1.8;}
 line|z15[highway=secondary_link],
-{width: 2.5;}
+{width: 1.5;}
 line|z16[highway=secondary_link],
-{width: 3.2;}
+{width: 2.2;}
 line|z17[highway=secondary_link],
-{width: 4.7;}
+{width: 3.7;}
 line|z18[highway=secondary_link],
-{width: 6.4;}
+{width: 5.4;}
 line|z19-[highway=secondary_link],
-{width: 8.2;}
+{width: 7.2;}
 
 /* 5.2 Secondary tunnel 16-22 ZOOM */
 
@@ -1137,7 +1139,329 @@ 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|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|z11-13[highway=primary]::border,
+{color: @primary1_border; opacity: 1;}
+line|z14-[highway=primary]::border,
+line|z15-[highway=primary_link]::border,
+{color: @primary2_border; opacity: 1;}
+
+line|z11-13[highway=secondary]::border,
+{color: @secondary0_border; opacity: 1;}
+line|z14-[highway=secondary]::border,
+line|z15-[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|z14[highway=motorway]::border,
+{width: 4.4;}
+line|z15[highway=motorway]::border,
+{width: 5.6;}
+line|z16[highway=motorway]::border,
+{width: 7.8;}
+line|z17[highway=motorway]::border,
+{width: 9.0;}
+line|z18[highway=motorway]::border,
+{width: 12.0;}
+line|z19-[highway=motorway]::border,
+{width: 16.0;}
+
+line|z14[highway=trunk]::border,
+{width: 4.0;}
+line|z15[highway=trunk]::border,
+{width: 4.8;}
+line|z16[highway=trunk]::border,
+{width: 6.2;}
+line|z17[highway=trunk]::border,
+{width: 8.2;}
+line|z18[highway=trunk]::border,
+{width: 11;}
+line|z19-[highway=trunk]::border,
+{width: 13.5;}
+
+line|z14[highway=motorway_link]::border,
+line|z14[highway=trunk_link]::border,
+{width: 2.2;}
+line|z15[highway=motorway_link]::border,
+line|z15[highway=trunk_link]::border,
+{width: 3.7;}
+line|z16[highway=motorway_link]::border,
+line|z16[highway=trunk_link]::border,
+{width: 5.1;}
+line|z17[highway=motorway_link]::border,
+line|z17[highway=trunk_link]::border,
+{width: 6.7;}
+line|z18[highway=motorway_link]::border,
+line|z18[highway=trunk_link]::border,
+{width: 9.5;}
+line|z19-[highway=motorway_link]::border,
+line|z19-[highway=trunk_link]::border,
+{width: 11.7;}
+
+line|z11[highway=primary]::border,
+{width: 1.8;}
+line|z12[highway=primary]::border,
+{width: 2.2;}
+line|z13[highway=primary]::border,
+{width: 3.0;}
+line|z14[highway=primary]::border,
+{width: 3.8;}
+line|z15[highway=primary]::border,
+{width: 4.4;}
+line|z16[highway=primary]::border,
+{width: 5.4;}
+line|z17[highway=primary]::border,
+{width: 7;}
+line|z18[highway=primary]::border,
+{width: 10;}
+line|z19-[highway=primary]::border,
+{width: 12;}
+
+line|z15[highway=primary_link]::border,
+{width: 2;}
+line|z16[highway=primary_link]::border,
+{width: 3.2;}
+line|z17[highway=primary_link]::border,
+{width: 4.7;}
+line|z18[highway=primary_link]::border,
+{width: 6.4;}
+line|z19-[highway=primary_link]::border,
+{width: 8.2;}
+
+line|z11[highway=secondary]::border,
+{width: 1.7;}
+line|z12[highway=secondary]::border,
+{width: 2;}
+line|z13[highway=secondary]::border,
+{width: 2.2;}
+line|z14[highway=secondary]::border,
+{width: 3.2;}
+line|z15[highway=secondary]::border,
+{width: 3.8;}
+line|z16[highway=secondary]::border,
+{width: 5;}
+line|z17[highway=secondary]::border,
+{width: 6.6;}
+line|z18[highway=secondary]::border,
+{width: 9.4;}
+line|z19-[highway=secondary]::border,
+{width: 11.6;}
+
+line|z15[highway=secondary_link]::border,
+{width: 2;}
+line|z16[highway=secondary_link]::border,
+{width: 3.2;}
+line|z17[highway=secondary_link]::border,
+{width: 4.7;}
+line|z18[highway=secondary_link]::border,
+{width: 6.4;}
+line|z19-[highway=secondary_link]::border,
+{width: 8.2;}
+
+
+/* 8.11 Minor road borders */
+
+line|z11-[highway=tertiary]::border,
+line|z14-[highway=tertiary_link]::border,
+line|z13-[highway=unclassified]::border,
+line|z14-[highway=residential]::border,
+line|z14-[highway=road]::border,
+line|z14-[highway=living_street]::border,
+line|z14-[highway=pedestrian]::border,
+line|z14-[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|z13-[highway=unclassified][bridge?]::border,
+line|z14-[highway=residential][bridge?]::border,
+line|z14-[highway=road][bridge?]::border,
+line|z14-[highway=living_street][bridge?]::border,
+line|z14-[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|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|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|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],

data/styles/default/include/defaults_new.mapcss

@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}

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

@@ -101,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-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
 highway-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-)
@@ -115,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-, pathtext z15-)
+highway-footway-area                                # area z14- (also has line z15-, line::border 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 icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+highway-ladder                                      # line z15- (also has line::border z15-, icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
 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 pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line::border z14-, 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-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line::border z11-, 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-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z11-, 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 pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has line::border z15-, pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
 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::cycleline z15-, pathtext z15-)
+highway-footway-bicycle                             # line z15- (also has line::border z15-, 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-, pathtext z15-)
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, line::border 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 icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has line::border z14-, icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, 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 pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
+highway-footway                                     # line z15- (also has line::border z15-, pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has line::border z15-, pathtext z15-)
+highway-footway-crossing                            # line z16- (also has line::border z16-)
 highway-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,7 +290,7 @@ 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-)
-=== 180
+=== 190
 
 highway-construction                                # line z13- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -306,54 +306,172 @@ 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-
-=== 160
+=== 180
 
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16- (also has line::border z16-)
+highway-footway-tunnel                              # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-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-)
-=== 155
+=== 170
 
 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::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::border 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::tunnelCasing z17-, pathtext z16-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 154
+=== 169
 
 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::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::border 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::tunnelBackground z17-, pathtext z16-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::border 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 z14- (also has line z6-, pathtext z10-, shield::shield z10-)
+highway-trunk::border                               # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
+=== 163
+
+highway-primary::border                             # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-)
+=== 162
+
+highway-secondary::border                           # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-)
+=== 161
+
+highway-motorway_link::border                       # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+highway-trunk_link::border                          # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+=== 160
+
+highway-primary_link::border                        # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-)
+=== 159
+
+highway-secondary_link::border                      # line::border z15- (also has line z13-, pathtext z16-)
+=== 158
+
+highway-motorway-bridge::border                     # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge::border                        # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+=== 157
+
+highway-primary-bridge::border                      # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 156
+
+highway-secondary-bridge::border                    # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+=== 155
+
+highway-motorway_link-bridge::border                # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::border                   # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 154
+
+highway-primary_link-bridge::border                 # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
+highway-secondary_link-bridge::border               # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+=== 152
+
+highway-motorway-tunnel::border                     # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel::border                        # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+=== 151
+
+highway-primary-tunnel::border                      # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+=== 150
+
+highway-secondary-tunnel::border                    # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 149
+
+highway-motorway_link-tunnel::border                # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel::border                   # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 148
+
+highway-primary_link-tunnel::border                 # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 147
+
+highway-secondary_link-tunnel::border               # line::border z15- (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::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border 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::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z14-, 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::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
 highway-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::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
 railway-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-)
@@ -367,30 +485,30 @@ 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-)
-=== 150
+=== 135
 
 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::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border 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::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z14-, 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::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
 highway-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::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
 railway-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-)
@@ -404,14 +522,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-)
-=== 140
+=== 130
 
 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-)
-=== 130
+=== 120
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z14- (also has pathtext z15-)
@@ -425,30 +543,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-)
-=== 120
+=== 110
 
 building:part                                       # area z16-
-=== 110
+=== 100
 
 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-
-=== 100
+=== 90
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 90
+=== 80
 
 man_made-cutline                                    # line z14-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
+=== 70
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z16-
-=== 70
+=== 60
 
 isoline-step_10                                     # line z15- (also has pathtext z17-)
 isoline-step_100                                    # line z12- (also has pathtext z14-)
@@ -456,7 +574,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-)
-=== 60
+=== 50
 
 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-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, 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-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, 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-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
@@ -591,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-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
 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-)
@@ -610,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-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
@@ -645,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-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z15-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
 === 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-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z15- (also has line z13-)
@@ -693,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-)
-highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
+highway-footway                                     # pathtext z15- (also has line z15-, line::border z15-)
+highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
+highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -717,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-)
+highway-ford                                        # icon z16- and pathtext z16- (also has line z13-, line::border z14-)
 natural-rock                                        # icon z17- (also has caption(optional) z17-)
 === 2850
 
@@ -733,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-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z15- (also has line z15-)
@@ -745,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-)
-highway-service-area                                # pathtext z16- (also has line z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-service                                     # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 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-)
@@ -833,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-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
 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-)
@@ -902,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-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1171,7 +1171,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-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-, line::border 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-)
@@ -2460,7 +2460,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-
+natural-tree                                        # icon z17- (also has caption(optional) z17-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2499,6 +2499,7 @@ 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) z17- (also has icon z17-)
 # 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,11 +161,19 @@
 @path: #8E4E1D;
 @path_expert: #3D2617;
 @bridleway: #3D361E;
+@motorway1_border: #D87A00;
+@trunk1_border: #DA8F2B;
+@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/style.mapcss

@@ -1,9 +1,134 @@
 @import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #4D4D4D;
+  GuiText-opacity: 0.86;
+  MyPositionAccuracy-color: #000000;
+  MyPositionAccuracy-opacity: 0.08;
+  Selection-color: #1E96F0;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #9B2300;
+  RouteTrafficG1-color: #E82705;
+  RouteTrafficG2-color: #E82705;
+  RouteTrafficG3-color: #FFE500;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #1D339E;
+  RoutePedestrian-opacity: 0.8;
+  RouteBicycle-color: #9C27B0;
+  RouteBicycle-opacity: 0.8;
+  RouteRuler-color: #66347F;
+  RouteRuler-opacity: 0.9;
+  RoutePreview-color: #000000;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.3;
+  RouteFirstSegmentArrowsMaskCar-color: #033B80;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #033B80;
+  RouteArrowsMaskCar-opacity: 0.2;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #9C27B0;
+  RouteArrowsMaskBicycle-opacity: 0.2;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #50AAFF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #1D339E;
+  TrackCarSpeed-color: #7C8EDE;
+  TrackPlaneSpeed-color: #A8B7ED;
+  TrackUnknownDistance-color: #616161;
+  TrafficG0-color: #7E1712;
+  TrafficG1-color: #E42300;
+  TrafficG2-color: #E42300;
+  TrafficG3-color: #FCDE00;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #39962E;
+  TrafficG5-color: #39962E;
+  TrafficTempBlock-color: #525252;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #FFFFFF;
+  TrafficArrowDark-color: #473635;
+  TrafficOutline-color: #E8E6DC;
+  RoadShieldBlackText-color: #000000;
+  RoadShieldWhiteText-color: #FFFFFF;
+  RoadShieldUKYellowText-color: #FFD400;
+  RoadShieldWhiteBackground-color: #FFFFFF;
+  RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldRedBackground-color: #E63534;
+  RoadShieldOrangeBackground-color: #FFBE00;
+  PoiHotelTextOutline-color: #FFFFFF;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #000000;
+  RouteMarkPrimaryTextOutline-color: #FFFFFF;
+  RouteMarkSecondaryText-color: #000000;
+  RouteMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitMarkPrimaryText-color: #000000;
+  TransitMarkPrimaryTextOutline-color: #FFFFFF;
+  TransitMarkSecondaryText-color: #000000;
+  TransitMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #FFFFFF;
+  TransitStopInnerMarker-color: #FFFFFF;
+  LocalAdsPrimaryText-color: #000000;
+  LocalAdsPrimaryTextOutline-color: #FFFFFF;
+  LocalAdsSecondaryText-color: #000000;
+  LocalAdsSecondaryTextOutline-color: #FFFFFF;
+  TransitBackground-color: #FFFFFF;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #000000;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}

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

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0562 .4152)"><path d="m7.76536687 1.02582924 2.91781373 1.20859801c.4900562.20298792.8794043.59233606 1.0823922 1.08239221l1.208598 2.91781372c.2029879.49005615.2029879 1.04067751 0 1.5307337l-1.208598 2.91781362c-.2029879.4900562-.5923361.8794044-1.0823922 1.0823923l-2.91781376 1.208598c-.49005615.2029879-1.04067751.2029879-1.53073369 0l-2.91781366-1.208598c-.49005618-.2029879-.87940432-.592336-1.08239223-1.0823922l-1.20859802-2.91781373c-.2029879-.49005617-.2029879-1.04067755.00000001-1.53073373l1.208598-2.91781368c.20298791-.49005618.59233603-.8794043 1.0823922-1.0823922l2.9178137-1.20859802c.49005617-.2029879 1.04067755-.2029879 1.53073372 0z" fill="#f5eada"/><path d="m7.57402516 1.48776901 2.91781374 1.20859801c.3675421.15224093.6595532.44425202.8117941.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781374c-.1522409.3675421-.444252.6595532-.8117941.8117941l-2.91781374 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.444252-.81179415-.8117941l-1.20859801-2.91781374c-.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/driving/dark/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");

data/styles/driving/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/driving/include/Basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/driving/include/Basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/driving/include/Icons.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");

data/styles/driving/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

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

@@ -1,258 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-by-size geometry: background areas rendered below BG-top and everything else.
-# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
-# So effectively priority values of BG-by-size areas are not used at the moment.
-# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
-# Keep them in a logical importance order please.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
-=== 250
-
-amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious                                   # area z13-
-=== 240
-
-amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
-=== 230
-
-landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
-=== 220
-
-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
-=== 200
-
-amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
-leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
-leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
-=== 190
-
-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-)
-landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
-=== 180
-
-amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
-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-, 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-)
-leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
-office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
-tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
-tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
-tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
-=== 170
-
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
-leisure-track-area                                  # area z15- (also has caption z16-)
-=== 160
-
-aeroway-terminal                                    # area z14- (also has caption z15-)
-=== 150
-
-leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
-=== 140
-
-landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
-=== 130
-
-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
-=== 120
-
-area:highway-footway                                # area z14- (also has caption z15-)
-area:highway-living_street                          # area z14-
-area:highway-pedestrian                             # area z14- (also has caption z15-)
-public_transport-platform                           # area z16- (also has caption z17-)
-railway-platform                                    # area z16- (also has caption z16-)
-=== 110
-
-amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
-amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
-amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-=== 100
-
-natural-wetland                                     # area z11- (also has caption z16-)
-natural-wetland-bog                                 # area z11- (also has caption z16-)
-natural-wetland-fen                                 # area z11- (also has caption z16-)
-natural-wetland-mangrove                            # area z11- (also has caption z16-)
-natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-reedbed                             # area z11- (also has caption z16-)
-natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
-natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
-natural-wetland-swamp                               # area z11- (also has caption z16-)
-natural-wetland-tidalflat                           # area z11- (also has caption z16-)
-=== 90
-
-landuse-farmyard                                    # area z10- (also has caption z15-)
-=== 81
-
-landuse-allotments                                  # area z12- (also has caption z15-)
-landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
-landuse-orchard                                     # area z12- (also has caption z15-)
-landuse-recreation_ground                           # area z12- (also has caption z15-)
-landuse-village_green                               # area z12-
-landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
-natural-scree                                       # area z11-
-natural-shingle                                     # area z12-
-=== 80
-
-landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
-=== 70
-
-landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
-=== 60
-
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
-landuse-construction                                # area z13- (also has caption z15-)
-landuse-industrial                                  # area z13- (also has caption z15-)
-landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z13- (also has caption z15-)
-man_made-wastewater_plant                           # area z13- (also has caption z15-)
-man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
-power-generator                                     # area z13- (also has icon z17-)
-power-generator-gas                                 # area z13- (also has icon z17-)
-power-generator-hydro                               # area z13- (also has icon z17-)
-power-generator-solar                               # area z13-
-power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
-power-plant                                         # area z13- (also has icon z17-)
-power-plant-coal                                    # area z13- (also has icon z17-)
-power-plant-gas                                     # area z13- (also has icon z17-)
-power-plant-hydro                                   # area z13- (also has icon z17-)
-power-plant-solar                                   # area z13- (also has icon z17-)
-power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
-=== 50
-
-amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
-=== 40
-
-aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
-aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z13-
-landuse-retail                                      # area z13- (also has caption z16-)
-leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
-natural-beach                                       # area z10- (also has caption z15-)
-natural-beach-gravel                                # area z10- (also has caption z15-)
-natural-beach-sand                                  # area z10- (also has caption z15-)
-natural-desert                                      # area z1- (also has caption z14-)
-natural-glacier                                     # area z1-
-natural-sand                                        # area z1- (also has caption z15-)
-=== 30
-
-natural-land                                        # area z1-
-place-islet                                         # area z10- (also has caption z14-)
-=== 20
-
-natural-coastline                                   # area z1-
-=== 10

data/styles/driving/include/priorities_2_BG-top.prio.txt

@@ -1,46 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-top geometry: background lines and areas that should be always below foreground ones
-# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
-# because ordering by size doesn't always work with e.g. water mapped over a forest,
-# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
-# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
-# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
-# are displayed above layer=0 BG-top.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-landuse-basin                                       # area z12-
-landuse-reservoir                                   # area z12- (also has caption z10-)
-landuse-salt_pond                                   # area z1-
-natural-water                                       # area z1- (also has caption z10-)
-natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z13- (also has caption z17-)
-natural-water-drain                                 # area z13- (also has caption z17-)
-natural-water-lake                                  # area z1- (also has caption z10-)
-natural-water-lock                                  # area z1- (also has caption z10-)
-natural-water-moat                                  # area z1- (also has caption z17-)
-natural-water-pond                                  # area z1- (also has caption z10-)
-natural-water-reservoir                             # area z1- (also has caption z10-)
-natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z12- (also has caption z17-)
-waterway-dock                                       # area z1-
-=== 20
-
-natural-strait                                      # line z13- (also has caption z13-)
-waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z13-
-waterway-drain                                      # line z13-
-waterway-fish_pass                                  # line z13- (also has pathtext z13-)
-waterway-river                                      # line z10- (also has pathtext z11-)
-waterway-stream                                     # line z13- (also has pathtext z13-)
-waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
-waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
-=== 10

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

@@ -1,481 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
-# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
-# is layer=-10 (as tunnels should be visibile over landcover and water).
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-=== 380
-
-aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-=== 370
-
-historic-citywalls                                  # line z14- (also has pathtext z16-)
-=== 360
-
-power-line                                          # line z19- (also has line::dash z19-)
-=== 350
-
-power-line::dash                                    # line::dash z19- (also has line z19-)
-=== 340
-
-highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
-hwtag-oneway::arrows                                # line::arrows z15-
-waterway-weir                                       # line z14- (also has pathtext z15-)
-=== 330
-
-barrier-city_wall                                   # line z14- (also has pathtext z16-)
-barrier-fence                                       # line z16-
-barrier-guard_rail                                  # line z17-
-barrier-hedge                                       # line z16-
-barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
-railway-funicular                                   # line z12-
-railway-funicular-bridge                            # line z12-
-railway-funicular-tunnel                            # line z12-
-railway-monorail                                    # line z14-
-railway-monorail-bridge                             # line z14-
-railway-monorail-tunnel                             # line z14-
-railway-narrow_gauge                                # line z15-
-railway-narrow_gauge-bridge                         # line z15-
-railway-narrow_gauge-tunnel                         # line z15-
-railway-tram                                        # line z13-
-railway-tram-bridge                                 # line z13-
-railway-tram-tunnel                                 # line z13-
-=== 320
-
-highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-world_level                                 # line z4-9
-highway-world_towns_level                           # line z6-9
-=== 310
-
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, 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 pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
-railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
-railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
-railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-main::dash                             # line::dash z16- (also has line z10-)
-railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
-railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
-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-, pathtext z10-, shield::shield z10-)
-# === 289
-
-railway-rail-branch                                 # line z11- (also has line::dash z16-)
-railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-highspeed                              # line z10- (also has line::dash z16-)
-railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-main                                   # line z10- (also has line::dash z16-)
-railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
-railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
-railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
-=== 280
-
-# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
-# === 279
-
-highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 270
-
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
-# === 269
-
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
-=== 250
-
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
-# === 249
-
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
-=== 230
-
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
-# === 229
-
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 228
-
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, 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 pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 226
-
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
-# === 225
-
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
-=== 224
-
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
-=== 223
-
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
-=== 222
-
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, 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-)
-railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-service::dash                          # line::dash z17- (also has line z16-)
-railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
-railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
-railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
-railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
-railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
-railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
-railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
-railway-subway::dash                                # line::dash z16- (also has line z13-)
-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::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-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
-railway-light_rail                                  # line z13- (also has line::dash z16-)
-railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail                                        # line z11- (also has line::dash z16-)
-railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service                                # line z16- (also has line::dash z17-)
-railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
-railway-rail-spur                                   # line z15- (also has line::dash z17-)
-railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
-railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
-railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-utility                                # line z13- (also has line::dash z17-)
-railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
-railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
-railway-subway                                      # line z13- (also has line::dash z16-)
-railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-=== 210
-
-# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
-# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
-# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
-# === 209
-
-highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
-=== 200
-
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, 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 pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
-highway-path                                        # line z15- (also has pathtext z15-)
-highway-path-difficult                              # line z15- (also has pathtext z15-)
-highway-path-expert                                 # line z15- (also has pathtext z15-)
-highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z15- (also has pathtext z15-)
-highway-track-area                                  # line z15- (also has pathtext z15-)
-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-)
-=== 180
-
-highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
-railway-abandoned                                   # 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-
-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-
-=== 160
-
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-path-horse                                  # line z15- (also has pathtext z15-)
-highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 153
-
-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::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::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
-highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
-railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
-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-)
-=== 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::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::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
-highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
-railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
-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-)
-=== 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-)
-=== 130
-
-piste:type-connection                               # line z15-
-piste:type-downhill                                 # line z14- (also has pathtext z15-)
-piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
-piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
-piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
-piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
-piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
-piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z15- (also has pathtext z15-)
-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-)
-=== 120
-
-building:part                                       # area z16-
-=== 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-
-=== 100
-
-boundary-administrative-2                           # line z2-
-boundary-administrative-3                           # line z4
-boundary-administrative-4                           # line z5-
-=== 90
-
-man_made-cutline                                    # line z14-
-route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
-
-aeroway-runway                                      # line z12-
-aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z16-
-=== 70
-
-isoline-step_10                                     # line z15- (also has pathtext z17-)
-isoline-step_100                                    # line z12- (also has pathtext z14-)
-isoline-step_1000                                   # line z11- (also has pathtext z11-)
-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-)
-=== 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-)
-waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
-=== 30
-
-landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
-landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-=== 25
-
-amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
-boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
-=== 20
-
-piste:type-snow_park                                # area z14- (also has caption z15-)
-=== 15
-
-man_made-bridge                                     # area z14-
-=== 10

data/styles/driving/include/ways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");

data/styles/driving/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");

data/styles/driving/light/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");

data/styles/driving/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/hiking/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/hiking/include/Subways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");

data/styles/hiking/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

data/styles/hiking/light/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");

data/styles/outdoors/dark/style.mapcss

@@ -1,3 +1,12 @@
+@import("colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
 colors
 {
   GuiText-color: #FFFFFF;
@@ -104,8 +113,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #8C4E39;
-  BookmarkGray-color: #808080;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;

data/styles/outdoors/include/Basemap.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");
+@import("../../default/include/Basemap.mapcss");
 
 
 /* 6.WATER */

data/styles/outdoors/include/Basemap_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");
+@import("../../default/include/Basemap_label.mapcss");
 
 /* Barriers, cliffs */
 

data/styles/outdoors/include/Icons.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
+@import("../../default/include/Icons.mapcss");
 
 
 /* 2. NATURAL */
@@ -31,6 +31,7 @@ node|z15-[natural=hot_spring],
 node|z12-[natural=geyser],
 node|z14-[natural=beach],
 area|z13-[natural=bare_rock][name],
+node|z16-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
 node|z11-[natural=peak][!name],
 area|z13-[natural=bare_rock][!name],
@@ -148,6 +149,11 @@ node|z15-[man_made=water_well][drinking_water=not],
 node|z15-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
+node|z16-[natural=tree][name],
+{icon-image: tree-special-m.svg;}
+node|z18-[natural=tree][!name],
+{icon-image: tree-m.svg;}
+
 
 /* 3.5 Ferry terminal & seamarks */
 

data/styles/outdoors/include/Roads.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
+@import("../../default/include/Roads.mapcss");
 
 
 /* Make all roads more contrast */

data/styles/outdoors/include/Roads_label.mapcss

@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");
+@import("../../default/include/Roads_label.mapcss");
 
 
 line|z13-[highway=track],

data/styles/outdoors/include/Subways.mapcss

@@ -1,2 +1,2 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");
+@import("../../default/include/Subways.mapcss");

data/styles/outdoors/include/defaults_new.mapcss

@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}

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

@@ -101,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-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
 highway-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-)
@@ -115,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-, pathtext z13-)
+highway-footway-area                                # area z14- (also has line z11-, line::border z15-, 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 icon z16-, pathtext z17-)
-highway-steps                                       # line z12- (also has pathtext z13-)
-highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-ladder                                      # line z12- (also has line::border z15-, icon z16-, pathtext z17-)
+highway-steps                                       # line z12- (also has line::border z15-, pathtext z13-)
+highway-steps-bridge                                # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-steps-tunnel                                # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 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 pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line::border z14-, 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-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line::border z11-, 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-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z11-, 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 pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-)
 # === 269
 
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
 === 250
 
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
 # === 249
 
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
+highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
 === 230
 
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
 # === 229
 
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
 # === 227
 
-highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-)
 # === 225
 
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has line::border z15-, pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-)
 === 224
 
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
 === 223
 
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z13- (also has pathtext z16-)
-highway-service-area                                # line z13- (also has pathtext z16-)
-highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z13- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+highway-service                                     # line z13- (also has line::border z15-, pathtext z16-)
+highway-service-area                                # line z13- (also has line::border z15-, pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
+highway-service-tunnel                              # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
 === 222
 
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z13-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-)
 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::cycleline z13-, pathtext z13-)
+highway-footway-bicycle                             # line z11- (also has line::border z15-, 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-, pathtext z13-)
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, line::border z15-, 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 icon z14-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has line::border z14-, icon z14-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
 === 200
 
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, 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 pathtext z13-)
-highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
-highway-footway-crossing                            # line z16-
+highway-footway                                     # line z11- (also has line::border z15-, pathtext z13-)
+highway-footway-area                                # line z11- and area z14- (also has line::border z15-, pathtext z13-)
+highway-footway-crossing                            # line z16- (also has line::border z16-)
 highway-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,7 +292,7 @@ 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-)
-=== 180
+=== 190
 
 highway-construction                                # line z11- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -308,54 +308,172 @@ 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-
-=== 160
+=== 180
 
-highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13-
-highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-bridge                              # line z11- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-sidewalk                            # line z13- (also has line::border z16-)
+highway-footway-tunnel                              # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-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-)
-=== 155
+=== 170
 
 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::tunnelCasing z17-, pathtext z13-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::border z15-, 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::tunnelCasing z17-, pathtext z13-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-=== 154
+=== 169
 
 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::tunnelBackground z17-, pathtext z13-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::border z15-, 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::tunnelBackground z17-, pathtext z13-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::border z15-, 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 z14- (also has line z6-, pathtext z10-, shield::shield z10-)
+highway-trunk::border                               # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
+=== 163
+
+highway-primary::border                             # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-)
+=== 162
+
+highway-secondary::border                           # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-)
+=== 161
+
+highway-motorway_link::border                       # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+highway-trunk_link::border                          # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+=== 160
+
+highway-primary_link::border                        # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-)
+=== 159
+
+highway-secondary_link::border                      # line::border z15- (also has line z13-, pathtext z16-)
+=== 158
+
+highway-motorway-bridge::border                     # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge::border                        # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+=== 157
+
+highway-primary-bridge::border                      # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 156
+
+highway-secondary-bridge::border                    # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+=== 155
+
+highway-motorway_link-bridge::border                # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::border                   # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+=== 154
+
+highway-primary_link-bridge::border                 # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153
 
+highway-secondary_link-bridge::border               # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+=== 152
+
+highway-motorway-tunnel::border                     # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel::border                        # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+=== 151
+
+highway-primary-tunnel::border                      # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+=== 150
+
+highway-secondary-tunnel::border                    # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+=== 149
+
+highway-motorway_link-tunnel::border                # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel::border                   # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+=== 148
+
+highway-primary_link-tunnel::border                 # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+=== 147
+
+highway-secondary_link-tunnel::border               # line::border z15- (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::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border 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::bridgeblack z17-, pathtext z13-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z14-, 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::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
 highway-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::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
 railway-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-)
@@ -369,30 +487,30 @@ 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-)
-=== 150
+=== 135
 
 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::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border 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::bridgewhite z15-, pathtext z13-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z14-, 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::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
 highway-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::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
 railway-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-)
@@ -406,14 +524,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-)
-=== 140
+=== 130
 
 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-)
-=== 130
+=== 120
 
 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z12- (also has pathtext z15-)
@@ -427,38 +545,36 @@ 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-)
-=== 120
+=== 110
 
 building:part                                       # area z16-
-=== 110
+=== 100
 
 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-
-=== 100
+=== 90
 
 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 90
+=== 80
 
 man_made-cutline                                    # line z13-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
+=== 70
 
 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-)
-=== 60
+=== 50
 
 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-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, 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-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, 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-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
@@ -591,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-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
 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-)
@@ -610,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-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z12- (also has caption(optional) z14-)
@@ -645,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-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-)
-highway-secondary_link                              # pathtext z16- (also has line z13-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
+highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z15-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
 === 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-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z13- (also has line z11-)
@@ -693,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-)
-highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
+highway-footway                                     # pathtext z13- (also has line z11-, line::border z15-)
+highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
+highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -717,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-)
+highway-ford                                        # icon z14- and pathtext z16- (also has line z13-, line::border z14-)
 natural-rock                                        # icon z14- (also has caption(optional) z17-)
 === 2850
 
@@ -733,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-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z13- (also has line z12-, line::border z15-)
+highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z13- (also has line z11-)
@@ -745,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-)
-highway-service-area                                # pathtext z16- (also has line z13-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z13-, line::border z15-)
+highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
 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-)
@@ -833,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-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
 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-)
@@ -902,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-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
+highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1172,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 z16- and pathtext z17- (also has line z12-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-, line::border 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-)
@@ -2466,7 +2466,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-
+natural-tree                                        # icon z16- (also has caption(optional) z16-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2505,6 +2505,7 @@ 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) z16- (also has icon z16-)
 # 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/outdoors/light/style.mapcss

@@ -1,3 +1,14 @@
+@import("colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+/* TODO: move to a separete base file */
+
 colors
 {
   GuiText-color: #4D4D4D;

data/styles/publictransport/dark/colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");

data/styles/publictransport/dark/style.mapcss

@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");

data/styles/publictransport/include/Basemap.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");

data/styles/publictransport/include/Basemap_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");

data/styles/publictransport/include/Icons.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");

data/styles/publictransport/include/Subways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");

data/styles/publictransport/include/icons_label_colors.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");

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

@@ -1,258 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-by-size geometry: background areas rendered below BG-top and everything else.
-# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
-# So effectively priority values of BG-by-size areas are not used at the moment.
-# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
-# Keep them in a logical importance order please.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
-=== 250
-
-amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious                                   # area z13-
-=== 240
-
-amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
-=== 230
-
-landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
-=== 220
-
-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
-=== 200
-
-amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
-leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
-leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
-=== 190
-
-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-)
-landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
-=== 180
-
-amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
-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-, 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-)
-leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
-office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
-tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
-tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
-tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
-=== 170
-
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
-leisure-track-area                                  # area z15- (also has caption z16-)
-=== 160
-
-aeroway-terminal                                    # area z14- (also has caption z15-)
-=== 150
-
-leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
-=== 140
-
-landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
-=== 130
-
-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
-=== 120
-
-area:highway-footway                                # area z14- (also has caption z15-)
-area:highway-living_street                          # area z14-
-area:highway-pedestrian                             # area z14- (also has caption z15-)
-public_transport-platform                           # area z16- (also has caption z17-)
-railway-platform                                    # area z16- (also has caption z16-)
-=== 110
-
-amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
-amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
-amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-=== 100
-
-natural-wetland                                     # area z11- (also has caption z16-)
-natural-wetland-bog                                 # area z11- (also has caption z16-)
-natural-wetland-fen                                 # area z11- (also has caption z16-)
-natural-wetland-mangrove                            # area z11- (also has caption z16-)
-natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-reedbed                             # area z11- (also has caption z16-)
-natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
-natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
-natural-wetland-swamp                               # area z11- (also has caption z16-)
-natural-wetland-tidalflat                           # area z11- (also has caption z16-)
-=== 90
-
-landuse-farmyard                                    # area z10- (also has caption z15-)
-=== 81
-
-landuse-allotments                                  # area z12- (also has caption z15-)
-landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
-landuse-orchard                                     # area z12- (also has caption z15-)
-landuse-recreation_ground                           # area z12- (also has caption z15-)
-landuse-village_green                               # area z12-
-landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
-natural-scree                                       # area z11-
-natural-shingle                                     # area z12-
-=== 80
-
-landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
-=== 70
-
-landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
-=== 60
-
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
-landuse-construction                                # area z13- (also has caption z15-)
-landuse-industrial                                  # area z13- (also has caption z15-)
-landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z13- (also has caption z15-)
-man_made-wastewater_plant                           # area z13- (also has caption z15-)
-man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
-power-generator                                     # area z13- (also has icon z17-)
-power-generator-gas                                 # area z13- (also has icon z17-)
-power-generator-hydro                               # area z13- (also has icon z17-)
-power-generator-solar                               # area z13-
-power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
-power-plant                                         # area z13- (also has icon z17-)
-power-plant-coal                                    # area z13- (also has icon z17-)
-power-plant-gas                                     # area z13- (also has icon z17-)
-power-plant-hydro                                   # area z13- (also has icon z17-)
-power-plant-solar                                   # area z13- (also has icon z17-)
-power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
-=== 50
-
-amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
-=== 40
-
-aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
-aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z13-
-landuse-retail                                      # area z13- (also has caption z16-)
-leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
-natural-beach                                       # area z10- (also has caption z15-)
-natural-beach-gravel                                # area z10- (also has caption z15-)
-natural-beach-sand                                  # area z10- (also has caption z15-)
-natural-desert                                      # area z1- (also has caption z14-)
-natural-glacier                                     # area z1-
-natural-sand                                        # area z1- (also has caption z15-)
-=== 30
-
-natural-land                                        # area z1-
-place-islet                                         # area z10- (also has caption z14-)
-=== 20
-
-natural-coastline                                   # area z1-
-=== 10

data/styles/publictransport/include/priorities_2_BG-top.prio.txt

@@ -1,46 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-top geometry: background lines and areas that should be always below foreground ones
-# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
-# because ordering by size doesn't always work with e.g. water mapped over a forest,
-# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
-# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
-# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
-# are displayed above layer=0 BG-top.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-landuse-basin                                       # area z12-
-landuse-reservoir                                   # area z12- (also has caption z10-)
-landuse-salt_pond                                   # area z1-
-natural-water                                       # area z1- (also has caption z10-)
-natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z13- (also has caption z17-)
-natural-water-drain                                 # area z13- (also has caption z17-)
-natural-water-lake                                  # area z1- (also has caption z10-)
-natural-water-lock                                  # area z1- (also has caption z10-)
-natural-water-moat                                  # area z1- (also has caption z17-)
-natural-water-pond                                  # area z1- (also has caption z10-)
-natural-water-reservoir                             # area z1- (also has caption z10-)
-natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z12- (also has caption z17-)
-waterway-dock                                       # area z1-
-=== 20
-
-natural-strait                                      # line z13- (also has caption z13-)
-waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z13-
-waterway-drain                                      # line z13-
-waterway-fish_pass                                  # line z13- (also has pathtext z13-)
-waterway-river                                      # line z10- (also has pathtext z11-)
-waterway-stream                                     # line z13- (also has pathtext z13-)
-waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
-waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
-=== 10

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

@@ -1,481 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
-# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
-# is layer=-10 (as tunnels should be visibile over landcover and water).
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-=== 380
-
-aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-=== 370
-
-historic-citywalls                                  # line z14- (also has pathtext z16-)
-=== 360
-
-power-line                                          # line z19- (also has line::dash z19-)
-=== 350
-
-power-line::dash                                    # line::dash z19- (also has line z19-)
-=== 340
-
-highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
-hwtag-oneway::arrows                                # line::arrows z15-
-waterway-weir                                       # line z14- (also has pathtext z15-)
-=== 330
-
-barrier-city_wall                                   # line z14- (also has pathtext z16-)
-barrier-fence                                       # line z16-
-barrier-guard_rail                                  # line z17-
-barrier-hedge                                       # line z16-
-barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
-railway-funicular                                   # line z12-
-railway-funicular-bridge                            # line z12-
-railway-funicular-tunnel                            # line z12-
-railway-monorail                                    # line z14-
-railway-monorail-bridge                             # line z14-
-railway-monorail-tunnel                             # line z14-
-railway-narrow_gauge                                # line z15-
-railway-narrow_gauge-bridge                         # line z15-
-railway-narrow_gauge-tunnel                         # line z15-
-railway-tram                                        # line z13-
-railway-tram-bridge                                 # line z13-
-railway-tram-tunnel                                 # line z13-
-=== 320
-
-highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-world_level                                 # line z4-9
-highway-world_towns_level                           # line z6-9
-=== 310
-
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, 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 pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
-railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
-railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
-railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-main::dash                             # line::dash z16- (also has line z10-)
-railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
-railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
-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-, pathtext z10-, shield::shield z10-)
-# === 289
-
-railway-rail-branch                                 # line z11- (also has line::dash z16-)
-railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-highspeed                              # line z10- (also has line::dash z16-)
-railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-main                                   # line z10- (also has line::dash z16-)
-railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
-railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
-railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
-=== 280
-
-# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
-# === 279
-
-highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 270
-
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
-# === 269
-
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has pathtext z13-)
-highway-unclassified-area                           # line z11- (also has pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
-=== 250
-
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
-# === 249
-
-highway-living_street                               # line z12- (also has pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has pathtext z14-)
-=== 230
-
-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
-# === 229
-
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 228
-
-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, 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 pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 226
-
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
-# === 225
-
-highway-secondary_link                              # line z13- (also has pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
-=== 224
-
-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
-=== 223
-
-highway-busway                                      # line z15- (also has pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has pathtext z16-)
-highway-service-area                                # line z15- (also has pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
-=== 222
-
-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, 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-)
-railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-service::dash                          # line::dash z17- (also has line z16-)
-railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
-railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
-railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
-railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
-railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
-railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
-railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
-railway-subway::dash                                # line::dash z16- (also has line z13-)
-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::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-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
-railway-light_rail                                  # line z13- (also has line::dash z16-)
-railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail                                        # line z11- (also has line::dash z16-)
-railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service                                # line z16- (also has line::dash z17-)
-railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
-railway-rail-spur                                   # line z15- (also has line::dash z17-)
-railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
-railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
-railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-utility                                # line z13- (also has line::dash z17-)
-railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
-railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
-railway-subway                                      # line z13- (also has line::dash z16-)
-railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-=== 210
-
-# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
-# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
-# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
-# === 209
-
-highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
-=== 200
-
-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, 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 pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-crossing                            # line z16-
-highway-path                                        # line z15- (also has pathtext z15-)
-highway-path-difficult                              # line z15- (also has pathtext z15-)
-highway-path-expert                                 # line z15- (also has pathtext z15-)
-highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z15- (also has pathtext z15-)
-highway-track-area                                  # line z15- (also has pathtext z15-)
-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-)
-=== 180
-
-highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
-railway-abandoned                                   # 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-
-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-
-=== 160
-
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-path-horse                                  # line z15- (also has pathtext z15-)
-highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 153
-
-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::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::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
-highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
-railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
-railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
-railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
-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-)
-=== 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::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::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
-highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
-railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
-railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
-railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
-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-)
-=== 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-)
-=== 130
-
-piste:type-connection                               # line z15-
-piste:type-downhill                                 # line z14- (also has pathtext z15-)
-piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
-piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
-piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
-piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
-piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
-piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z15- (also has pathtext z15-)
-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-)
-=== 120
-
-building:part                                       # area z16-
-=== 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-
-=== 100
-
-boundary-administrative-2                           # line z2-
-boundary-administrative-3                           # line z4
-boundary-administrative-4                           # line z5-
-=== 90
-
-man_made-cutline                                    # line z14-
-route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
-
-aeroway-runway                                      # line z12-
-aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z16-
-=== 70
-
-isoline-step_10                                     # line z15- (also has pathtext z17-)
-isoline-step_100                                    # line z12- (also has pathtext z14-)
-isoline-step_1000                                   # line z11- (also has pathtext z11-)
-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-)
-=== 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-)
-waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
-=== 30
-
-landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
-landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-=== 25
-
-amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
-boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
-=== 20
-
-piste:type-snow_park                                # area z14- (also has caption z15-)
-=== 15
-
-man_made-bridge                                     # area z14-
-=== 10

data/styles/publictransport/include/ways.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");

data/styles/publictransport/include/ways_label.mapcss

@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");