[Android] Fix small bump on track recording icon

extremely minor, but couldn't unsee it!

Signed-off-by: Harry Bond <me@hbond.xyz>

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

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

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

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

android/app/src/main/java/app/organicmaps/routing/NavigationController.java

@@ -1,10 +1,7 @@
 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;
@@ -16,7 +13,6 @@ 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;
@@ -62,8 +58,6 @@ 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)
   {
@@ -78,8 +72,6 @@ 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);
@@ -105,16 +97,6 @@ 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) -> {
@@ -154,8 +136,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    if (speedLimitEnabled)
-        updateSpeedWidgets(info);
+    updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -163,8 +144,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    if (speedLimitEnabled)
-        updateSpeedWidgets(info);
+    updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -225,22 +205,9 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNavMenu.collapseNavBottomSheet();
   }
 
-  public void refresh(Context context, RoutingInfo info)
+  public void refresh()
   {
-      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);
-          }
-      }
+    mNavMenu.refreshTts();
   }
 
   @Override

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

@@ -1,5 +0,0 @@
-<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

@@ -1,10 +0,0 @@
-<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,9 +3,8 @@
   android:width="74dp"
   android:height="57dp"
   android:viewportWidth="74"
-  android:viewportHeight="57"
-  android:tint="?iconTint">
+  android:viewportHeight="57">
   <path
-    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" />
+    android:fillColor="#757575"
+    android:pathData="m 26.278,8.137 c 3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425 L 25.208,36.215 c -2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048 L 48.119,30.283 c -0.155,-0.32 -0.286,-0.647 -0.394,-0.978 l -4.006,0.001 c -2.787,0 -3.659,-3.825 -1.045,-5.042 L 65.323,13.832 c 2.091,-0.869 4.357,1.392 3.486,3.478 L 58.355,39.913 c -1.219,2.607 -5.053,1.736 -5.053,-1.044 V 34.451 C 52.796,34.329 52.296,34.155 51.808,33.926 L 37.505,48.354 C 33.137,52.76 26.02,52.798 21.604,48.44 17.191,44.082 17.152,36.979 21.52,32.573 L 36.117,17.847 c 1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033 l -9.43,9.516 c 0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 C 8.633,32.629 5,29.002 5,24.538 c 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012 z" />
 </vector>

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

@@ -6,9 +6,9 @@
   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/base_red"
+      android:fillColor="@color/active_track_recording"
       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:pathData="m 33.024,19.508 c 3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333 L 31.879,49.485 c -2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051 L 56.401,43.152 C 56.235,42.81 56.095,42.461 55.979,42.108 l -4.288,0.001 c -2.983,0 -3.916,-4.084 -1.118,-5.383 L 74.814,25.588 c 2.238,-0.928 4.663,1.486 3.731,3.713 L 67.356,53.433 c -1.305,2.783 -5.408,1.854 -5.408,-1.115 V 47.601 C 61.406,47.471 60.871,47.285 60.349,47.04 L 45.04,62.444 C 40.365,67.148 32.747,67.189 28.021,62.536 23.298,57.883 23.256,50.299 27.931,45.595 L 43.554,29.873 c 1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035 l -10.093,10.16 c 0.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.081 z"
       android:fillColor="#ffffff"/>
 </vector>

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

@@ -1,7 +1,6 @@
 <?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"
@@ -66,12 +65,9 @@
     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_plus"
+    android:layout_marginBottom="@dimen/margin_eighth"
     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,6 +927,4 @@
     <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,7 +8,6 @@
 
   <!-- 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,7 +45,6 @@
   <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,6 +975,4 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
-    <string name="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,14 +143,6 @@
         <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

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

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

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

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

@@ -169,7 +169,6 @@ 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,14 +31,6 @@ 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,8 +280,6 @@ public class Framework
 
   public static native void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);
 
-  public static native void nativeSetCarScreenMode(boolean enabled);
-
   public static native boolean nativeGetAutoZoomEnabled();
 
   public static native void nativeSetAutoZoomEnabled(boolean enabled);

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

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

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

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

data/countries_meta.txt

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

data/fonts/whitelist.txt

@@ -22,6 +22,3 @@ 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/default/dark/colors.mapcss

@@ -162,19 +162,11 @@
 @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/symbols/tree-special-m.svg

@@ -1 +0,0 @@
-<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/Icons.mapcss

@@ -70,7 +70,6 @@ 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],
@@ -207,9 +206,7 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
-node|z17-[natural=tree][name],
-{icon-image: tree-special-m.svg;}
-node|z18-[natural=tree][!name],
+node|z18-[natural=tree],
 {icon-image: tree-m.svg;}
 
 node|z18-[xmas:feature=tree],

data/styles/default/include/Roads.mapcss

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

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-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -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-, line::border z15-, pathtext z15-)
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

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

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border 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-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border 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-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border 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-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border 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-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border 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-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border 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-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border 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-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
@@ -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-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z13-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -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-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
@@ -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-, 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-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border 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-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border 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-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z15- (also has line z13-)
@@ -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-, line::border z15-)
-highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z15- (also has line z15-)
+highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
+highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -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-, line::border z14-)
+highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
 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-, line::border z15-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z16- (also has line z15-)
+highway-steps-bridge                                # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z15- (also has line z15-)
@@ -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-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z15-)
+highway-service-area                                # pathtext z16- (also has line z15-)
+highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line(casing) z15-, line z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z14-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z14-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z14-)
@@ -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-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -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-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -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-, line::border z15-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -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 z17- (also has caption(optional) z17-)
+natural-tree                                        # icon z18-
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2499,7 +2499,6 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
-# natural-tree                                      # caption(optional) 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,19 +161,11 @@
 @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/symbols/tree-special-m.svg

@@ -1 +0,0 @@
-<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/outdoors/include/Icons.mapcss

@@ -31,7 +31,6 @@ 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],
@@ -149,11 +148,6 @@ 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/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-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -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-, line::border z15-, pathtext z13-)
+highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160
 

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

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

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

@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800
 
-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border 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-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750
 
-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border 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-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740
 
 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250
 
-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border 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-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200
 
-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border 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-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border 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-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border 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-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
 barrier-border_control                              # icon z12- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700
 
-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border 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-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600
 
 man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
@@ -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-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z11-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -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-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
 amenity-water_point                                 # icon z12- (also has caption(optional) z14-)
@@ -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-, 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-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000
 
-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border 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-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975
 
-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970
 
-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border 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-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z13- (also has line z11-)
@@ -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-, line::border z15-)
-highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z13- (also has line z11-)
+highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
+highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950
 
 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -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-, line::border z14-)
+highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
 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-, line::border z15-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z13- (also has line z12-)
+highway-steps-bridge                                # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
 highway-track                                       # pathtext z13- (also has line z11-)
@@ -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-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z13-)
+highway-service-area                                # pathtext z16- (also has line z13-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z13-, line(casing) z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z12-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z12-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z12-)
@@ -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-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -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-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250
 
 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -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-, line::border z15-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -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 z16- (also has caption(optional) z16-)
+natural-tree                                        # icon z18-
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2505,7 +2505,6 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
-# natural-tree                                      # caption(optional) 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-)

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h

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

iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm

@@ -15,7 +15,7 @@
 + (void)processFirstLaunch:(BOOL)hasLocation {
   auto &f = GetFramework();
   if (!hasLocation)
-    f.StartPendingPositionMode();
+    f.SwitchMyPositionNextMode();
   else
     f.RunFirstLaunchAnimation();
 }
@@ -241,8 +241,4 @@
   return [[ElevationProfileData alloc] initWithElevationInfo:GetFramework().GetTrackRecordingElevationInfo()];
 }
 
-+ (void)setCarScreenMode:(BOOL)enabled {
-  GetFramework().SetCarScreenMode(enabled);
-}
-
 @end

iphone/Maps/Classes/CarPlay/CarPlayService.swift

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

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

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

iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm

@@ -195,7 +195,7 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert";
 
 + (instancetype)disabledLocationAlert {
   MWMVoidBlock action = ^{
-    GetFramework().StartPendingPositionMode();
+    GetFramework().SwitchMyPositionNextMode();
   };
   return [self defaultAlertWithTitle:L(@"dialog_routing_location_turn_on")
                              message:L(@"dialog_routing_location_unknown_turn_on")

iphone/Maps/Core/Settings/MWMSettings.h

@@ -19,6 +19,9 @@ NS_SWIFT_NAME(SettingsBridge)
 + (BOOL)zoomButtonsEnabled;
 + (void)setZoomButtonsEnabled:(BOOL)zoomButtonsEnabled;
 
++ (BOOL)compassCalibrationEnabled;
++ (void)setCompassCalibrationEnabled:(BOOL)compassCalibrationEnabled;
+
 + (MWMTheme)theme;
 + (void)setTheme:(MWMTheme)theme;
 
@@ -38,9 +41,6 @@ NS_SWIFT_NAME(SettingsBridge)
 + (NSString *)mapLanguageCode;
 + (void)setMapLanguageCode:(NSString *)mapLanguageCode;
 
-+ (BOOL)mapLanguageLimitAlternativesToLocal;
-+ (void)setMapLanguageLimitAlternativesToLocal:(BOOL)mapLanguageLimitAlternativesToLocal;
-
 + (BOOL)transliteration;
 + (void)setTransliteration:(BOOL)transliteration;
 

iphone/Maps/Core/Settings/MWMSettings.mm

@@ -12,6 +12,7 @@ namespace
 {
 char const * kAutoDownloadEnabledKey = "AutoDownloadEnabled";
 char const * kZoomButtonsEnabledKey = "ZoomButtonsEnabled";
+char const * kCompassCalibrationEnabledKey = "CompassCalibrationEnabled";
 char const * kMapLanguageCode = "MapLanguageCode";
 char const * kRoutingDisclaimerApprovedKey = "IsDisclaimerApproved";
 
@@ -115,6 +116,18 @@ NSString * const kUDFileLoggingEnabledKey = @"FileLoggingEnabledKey";
   [MWMMapViewControlsManager manager].zoomHidden = !zoomButtonsEnabled;
 }
 
++ (BOOL)compassCalibrationEnabled
+{
+  bool enabled = true;
+  UNUSED_VALUE(settings::Get(kCompassCalibrationEnabledKey, enabled));
+  return enabled;
+}
+
++ (void)setCompassCalibrationEnabled:(BOOL)compassCalibrationEnabled
+{
+  settings::Set(kCompassCalibrationEnabledKey, static_cast<bool>(compassCalibrationEnabled));
+}
+
 + (MWMTheme)theme
 {
   if ([MWMCarPlayService shared].isCarplayActivated) {
@@ -221,20 +234,6 @@ NSString * const kUDFileLoggingEnabledKey = @"FileLoggingEnabledKey";
   }
 }
 
-+ (BOOL)mapLanguageLimitAlternativesToLocal
-{
-  bool enabled = true;
-  UNUSED_VALUE(settings::Get(settings::kMapLanguageLimitAlternativesToLocal, enabled));
-  return enabled;
-}
-
-+ (void)setMapLanguageLimitAlternativesToLocal:(BOOL)mapLanguageLimitAlternativesToLocal
-{
-  settings::Set(settings::kMapLanguageLimitAlternativesToLocal, static_cast<bool>(mapLanguageLimitAlternativesToLocal));
-  auto & f = GetFramework();
-  f.InvalidateRect(f.GetCurrentViewport());
-}
-
 + (BOOL)transliteration { return GetFramework().LoadTransliteration(); }
 + (void)setTransliteration:(BOOL)transliteration
 {

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

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

iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "E-posstuurfout";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompaskalibrering";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Langtik weer op die kaart om die koppelvlak te sien";
 

iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "حدث خطأ في إرسال البريد الإلكتروني";
 
+/* Settings item title */
+"pref_calibration_title" = "معايرة البوصلة";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "اضغط مطولاً على الخريطة مرة أخرى لرؤية الواجهة";
 

iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "E-poçt göndərmə xətası";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompas kalibrlənməsi";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "İnterfeysi görmək üçün yenidən xəritəyə uzun müddət toxunun";
 

iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Памылка пры адпраўцы пошты";
 
+/* Settings item title */
+"pref_calibration_title" = "Каліброўка компаса";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Паўторнае працяглае націсканне верне бачнасць інтэрфейсу";
 

iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Грешка при изпращане на поща";
 
+/* Settings item title */
+"pref_calibration_title" = "Калибриране на компас";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Докоснете отново картата, за да видите интерфейса";
 

iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "S'ha produït un error en enviar el correu";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibratge de la brúixola";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Toqueu llargament el mapa de nou per veure la interfície";
 

iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Chyba při odesílání emailu";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibrace kompasu";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Dlouhým klepnutím na mapu znovu zobrazíte rozhraní";
 

iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Mailforsendelsesfejl";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibrering af kompas";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Tryk længe på kortet igen for at se grænsefladen";
 

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

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Fehler beim E-Mail-Versand";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompass-Kalibrierung";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen";
 
@@ -1092,7 +1095,6 @@
 "edit_track" = "Track bearbeiten";
 "pref_mapappearance_title" = "Kartendarstellung";
 "pref_maplanguage_title" = "Karten-Sprache";
-"limit_map_language_alternatives_to_local" = "Nutzung alternativer Sprachen auf lokale Sprachen begrenzen";
 "transliteration_title_disabled_summary" = "Bei der Nutzung der lokalen Sprache für die Karte ausgeschaltet";
 "pref_maplanguage_local" = "Lokale Sprache";
 "existence_confirmed_time_ago" = "Existenz bestätigt %@";

iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Σφάλμα κατά την αποστολή του e-mail";
 
+/* Settings item title */
+"pref_calibration_title" = "Καλιμπράρισμα πυξίδας";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Πατήστε ξανά παρατεταμένα στο χάρτη για να δείτε το περιβάλλον εργασίας";
 

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

@@ -352,6 +352,9 @@
 /* Alert title */
 "email_error_title" = "Error sending email";
 
+/* Settings item title */
+"pref_calibration_title" = "Compass calibration";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Long-tap on the map again to see the interface";
 
@@ -763,7 +766,6 @@
 "traffic_data_unavailable" = "Traffic data is not available";
 "enable_logging" = "Enable logging";
 "log_file_size" = "Log file size: %@";
-"limit_map_language_alternatives_to_local" = "Limit use of alternative languages to local ones";
 "transliteration_title" = "Transliterate into Latin alphabet";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 

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

@@ -363,6 +363,9 @@
 /* Alert title */
 "email_error_title" = "Error sending email";
 
+/* Settings item title */
+"pref_calibration_title" = "Compass calibration";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Long-tap on the map again to see the interface";
 
@@ -783,7 +786,6 @@
 "traffic_data_unavailable" = "Traffic data is not available";
 "enable_logging" = "Enable logging";
 "log_file_size" = "Log file size: %@";
-"limit_map_language_alternatives_to_local" = "Limit use of alternative languages to local ones";
 "transliteration_title" = "Transliterate into Latin alphabet";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 

iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Error de envío de correo";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibración de la brújula";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Vuelve a pulsar prolongadamente sobre el mapa para ver la interfaz";
 

iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Error de envío de correo";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibración de la brújula";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Vuelva a pulsar prolongadamente sobre el mapa para ver la interfaz";
 

iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Viga teate saatmisel";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompassi kalibreerimine";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Kasutajaliidese nägemiseks vajuta kaarti pikalt";
 

iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Errore bat mezua bidaltzean";
 
+/* Settings item title */
+"pref_calibration_title" = "Iparrorratzaren kalibrazioa";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Sakatu luze berriro mapan interfazea ikusteko";
 

iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "خطا در ارسال ایمیل";
 
+/* Settings item title */
+"pref_calibration_title" = "تنظیم کردن قطب نما";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "دوباره روی نقشه ضربه طولانی بزنید تا رابط کاربری را ببینید";
 

iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Virhe lähetettäessä viestiä";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompassin kalibrointi";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Paina karttaa pitkään uudelleen nähdäksesi käyttöliittymän";
 

iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Erreur d’envoi de courriel";
 
+/* Settings item title */
+"pref_calibration_title" = "Étalonnage de la boussole";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Appuyez à nouveau longuement sur la carte pour voir l’interface";
 

iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "שגיאה בשליחת דוא\"ל";
 
+/* Settings item title */
+"pref_calibration_title" = "כיול המצפן";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "לחץ לחיצה ארוכה במפה כדי להציג את הממשק";
 

iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "ईमेल भेजने में त्रुटि";
 
+/* Settings item title */
+"pref_calibration_title" = "कम्पास अंशांकन";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "इंटरफ़ेस देखने के लिए मानचित्र पर फिर से देर तक टैप करें";
 

iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Hiba az e-mail küldése során";
 
+/* Settings item title */
+"pref_calibration_title" = "Iránytű kalibrálása";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Érintse meg újra hosszan a térképet a kezelőfelület megjelenítéséhez";
 

iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Gangguan pengiriman surel";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibrasi kompas";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Ketuk lama pada peta sekali lagi untuk melihat antarmuka";
 

iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Errore invio e-mail";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibrazione bussola";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Tocca di nuovo a lungo sulla mappa per visualizzare l'interfaccia";
 

iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "メール送信エラー";
 
+/* Settings item title */
+"pref_calibration_title" = "コンパスの調整";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "インターフェイスを見るには、もう一度地図をロングタップする";
 

iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings

@@ -329,6 +329,9 @@
 /* Alert title */
 "email_error_title" = "메일 전송 중 오류";
 
+/* Settings item title */
+"pref_calibration_title" = "나침반 보정";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "지도를 다시 길게 탭하면 인터페이스가 표시됩니다.";
 

iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Klaida siunčiant laišką";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompaso kalibravimas";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Bakstelėkite ir palaikykite žemėlapį vėl, kad pamatytumėte sąsają";
 

iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Kļūda, nosūtot vēstuli";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompasa kalibrēšana";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Vēlreiz piespiediet un paturiet uz kartes, lai redzētu saskarni";
 

iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "मेल पाठवताना त्रुटी";
 
+/* Settings item title */
+"pref_calibration_title" = "होकायंत्र अंशशोधन";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "इंटरफेस पाहण्यासाठी पुन्हा नकाशावर दीर्घ टॅप करा";
 

iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Żball meta bgħatt e-mejl";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibrazzjoni tal-boxxla";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Itteppja fit-tul darb’ oħra fuq il-mappa biex tara l-interface";
 

iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Feil ved sending av e-post";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompasskalibrering";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Trykk lenge på kartet igjen for å se grensesnittet";
 

iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "E-mail verzendfout";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompaskalibratie";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Tik nogmaals lang op de kaart om de interface te zien";
 

iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Błąd wysyłania wiadomości";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibracja kompasu";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Ponownie dotknij długo mapy, aby wyświetlić interfejs";
 

iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Erro no envio de email";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibração da bússola";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Dê um toque longo no mapa novamente para ver a interface";
 

iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Erro ao enviar o email";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibração da bússola";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Dê um toque longo no mapa novamente para ver a interface";
 

iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Eroare de trimitere e-mail";
 
+/* Settings item title */
+"pref_calibration_title" = "Calibrare busolă";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Atingeți lung pe hartă din nou pentru a vedea interfața";
 

iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "Ошибка при отправлении письма";
 
+/* Settings item title */
+"pref_calibration_title" = "Калибровка компаса";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Долгое нажатие на карту вернет интерфейс обратно";
 

iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Chyba pri odosielaní emailu";
 
+/* Settings item title */
+"pref_calibration_title" = "Kalibrácia kompasu";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Opätovným dlhým ťuknutím na mapu zobrazíte rozhranie";
 

iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Грешка приликом слања email-а";
 
+/* Settings item title */
+"pref_calibration_title" = "Калибрација компаса";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Додирните дуго мапу да бисте поново видели интерфејс";
 

iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Fel när mailet skulle skickas";
 
+/* Settings item title */
+"pref_calibration_title" = "Kompasskalibrering";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Tryck länge på kartan för att se gränssnittet";
 

iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings

@@ -320,6 +320,9 @@
 /* Alert title */
 "email_error_title" = "Error sending email";
 
+/* Settings item title */
+"pref_calibration_title" = "Compass calibration";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Gusa kwa muda mrefu kwenye ramani tena ili kuona kiolesura";
 

iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "จดหมายที่ส่งเกิดความผิดพลาด";
 
+/* Settings item title */
+"pref_calibration_title" = "การปรับเทียบเข็มทิศ";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "แตะยาวบนแผนที่อีกครั้งเพื่อดูอินเทอร์เฟซ";
 

iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "E-Posta gönderme hatası";
 
+/* Settings item title */
+"pref_calibration_title" = "Pusula kalibrasyonu";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Seçenekleri görmek için haritaya tekrar basılı tutun";
 

iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings

@@ -333,6 +333,9 @@
 /* Alert title */
 "email_error_title" = "Помилка при відправленні листа";
 
+/* Settings item title */
+"pref_calibration_title" = "Калібрування компаса";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Ще раз потримайте палець на карті, щоб побачити інтерфейс";
 

iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings

@@ -330,6 +330,9 @@
 /* Alert title */
 "email_error_title" = "Lỗi gửi thư";
 
+/* Settings item title */
+"pref_calibration_title" = "Chuẩn hóa la bàn";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "Nhấn và giữ lại vào bản đồ để xem giao diện";
 

iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "电子邮件发送失败";
 
+/* Settings item title */
+"pref_calibration_title" = "指南针校准";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "再次长按地图即可查看界面";
 

iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings

@@ -336,6 +336,9 @@
 /* Alert title */
 "email_error_title" = "電子郵件發送失敗";
 
+/* Settings item title */
+"pref_calibration_title" = "校正指南針";
+
 /* Toast text when user hides UI with a long tap anywhere on the map */
 "long_tap_toast" = "再次長按地圖即可查看介面";
 

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		165953942CB44B5600CFED7C /* symbols in Resources */ = {isa = PBXBuildFile; fileRef = 165953932CB44B3B00CFED7C /* symbols */; };
 		1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; };
 		270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; };
-		271186872F19467400FD7FF3 /* countries_meta.txt in Resources */ = {isa = PBXBuildFile; fileRef = 271186862F19467400FD7FF3 /* countries_meta.txt */; };
 		27176A862E65B0150015F25F /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A852E65B0150015F25F /* Icon.icon */; };
 		27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A892E65B01B0015F25F /* Debug Icon.icon */; };
 		272CA4492F127221005A3F5B /* subtypes.csv in Resources */ = {isa = PBXBuildFile; fileRef = 272CA4482F127221005A3F5B /* subtypes.csv */; };
@@ -764,7 +763,6 @@
 		1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = "UIColor+PartnerColor.m"; sourceTree = "<group>"; tabWidth = 2; };
 		1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = "<group>"; tabWidth = 2; };
 		270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = "<group>"; };
-		271186862F19467400FD7FF3 /* countries_meta.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = countries_meta.txt; path = ../../data/countries_meta.txt; sourceTree = SOURCE_ROOT; };
 		27176A852E65B0150015F25F /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = "<group>"; };
 		27176A892E65B01B0015F25F /* Debug Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "Debug Icon.icon"; sourceTree = "<group>"; };
 		272CA4482F127221005A3F5B /* subtypes.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = subtypes.csv; path = ../../data/subtypes.csv; sourceTree = SOURCE_ROOT; };
@@ -3943,7 +3941,6 @@
 				452FCA3A1B6A3DF7007019AB /* colors.txt */,
 				97A5967E19B9CD47007A963F /* copyright.html */,
 				FA46DA2B12D4166E00968C36 /* countries.txt */,
-				271186862F19467400FD7FF3 /* countries_meta.txt */,
 				4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */,
 				4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */,
 				FA637ECC29A500BE00D8921A /* drules_proto_outdoors_light.bin */,
@@ -4182,7 +4179,6 @@
 			files = (
 				165953742CB1D85500CFED7C /* fonts in Resources */,
 				165953942CB44B5600CFED7C /* symbols in Resources */,
-				271186872F19467400FD7FF3 /* countries_meta.txt in Resources */,
 				47AEF8402231249E00D20538 /* categories_brands.txt in Resources */,
 				F6C3A1B221AC22810060EEC8 /* Alert 5.m4a in Resources */,
 				3404F49A2028A20D0090E401 /* BMCCategoryCell.xib in Resources */,

iphone/Maps/Model/Settings.swift

@@ -4,23 +4,23 @@ import AVFoundation
 /// The settings
 @objc class Settings: NSObject {
     // MARK: Properties
-
+    
     // The notification name for changed routing options
     static let routingOptionsChangedNotificationName: Notification.Name = Notification.Name(rawValue: "RoutingOptionsChanged")
-
-
+    
+    
     /// Key for storing if the sync beta alert has been shown in the user defaults
     static private let userDefaultsKeyHasShownSyncBetaAlert = "kUDDidShowICloudSynchronizationEnablingAlert"
-
-
+    
+    
     /// Key for storing the type of action used for the bottom left main interface button in the user defaults
     static private let userDefaultsKeyLeftButtonType = "LeftButtonType"
-
-
+    
+    
     /// Key for storing the map appearance in the user defaults
     static private let userDefaultsKeyMapAppearance = "MapAppearance"
-
-
+    
+    
     /// The current distance unit
     static var distanceUnit: DistanceUnit {
         get {
@@ -38,8 +38,8 @@ import AVFoundation
             }
         }
     }
-
-
+    
+    
     /// If zoom buttons should be displayed
     @objc static var hasZoomButtons: Bool {
         get {
@@ -49,23 +49,23 @@ import AVFoundation
             SettingsBridge.setZoomButtonsEnabled(newValue)
         }
     }
-
-
+    
+    
     /// The type of action used for the bottom left main interface button
     static var leftButtonType: LeftButtonType {
         get {
             if let leftButtonTypeRawValue = UserDefaults.standard.string(forKey: userDefaultsKeyLeftButtonType), let leftButtonType = LeftButtonType(rawValue: leftButtonTypeRawValue) {
                 return leftButtonType
             }
-
+            
             return .help
         }
         set {
             UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyLeftButtonType)
         }
     }
-
-
+    
+    
     /// If 3D buildings should be displayed
     @objc static var has3dBuildings: Bool {
         get {
@@ -75,8 +75,8 @@ import AVFoundation
             SettingsBridge.setBuildings3dViewEnabled(newValue)
         }
     }
-
-
+    
+    
     /// If automatic map downloads should be enabled
     @objc static var hasAutomaticDownload: Bool {
         get {
@@ -86,8 +86,8 @@ import AVFoundation
             SettingsBridge.setAutoDownloadEnabled(newValue)
         }
     }
-
-
+    
+    
     /// The current mobile data policy
     @objc static var mobileDataPolicy: MobileDataPolicy {
         get {
@@ -110,8 +110,8 @@ import AVFoundation
             }
         }
     }
-
-
+    
+    
     /// The current power saving mode
     @objc static var powerSavingMode: PowerSavingMode {
         get {
@@ -121,8 +121,8 @@ import AVFoundation
             SettingsBridge.setPowerManagement(newValue.rawValue)
         }
     }
-
-
+    
+    
     /// If an increased font size should be used for map labels
     @objc static var hasIncreasedFontsize: Bool {
         get {
@@ -132,8 +132,8 @@ import AVFoundation
             SettingsBridge.setLargeFontSize(newValue)
         }
     }
-
-
+    
+    
     /// If names should be transliterated to Latin
     @objc static var shouldTransliterateToLatin: Bool {
         get {
@@ -143,8 +143,8 @@ import AVFoundation
             SettingsBridge.setTransliteration(newValue)
         }
     }
-
-
+    
+    
     /// The available languages for the map
     static var availableLanguagesForMap: [MapLanguage] {
         var languages = SettingsBridge.availableMapLanguages().map { language in
@@ -154,8 +154,8 @@ import AVFoundation
         languages.insert(MapLanguage(id: "auto", localizedName: String(localized: "auto")), at: 0)
         return languages
     }
-
-
+    
+    
     /// The current language for the map
     static var languageForMap: MapLanguage.ID {
         get {
@@ -165,19 +165,8 @@ import AVFoundation
             SettingsBridge.setMapLanguageCode(newValue)
         }
     }
-
-
-    /// If the alternative languages for the app only should be used when they are the local native language
-    static var shouldLimitMapLanguageAlternativesToLocal: Bool {
-        get {
-            return SettingsBridge.mapLanguageLimitAlternativesToLocal()
-        }
-        set {
-            SettingsBridge.setMapLanguageLimitAlternativesToLocal(newValue)
-        }
-    }
-
-
+    
+    
     /// If the compass should be calibrated
     @objc static var shouldCalibrateCompass: Bool {
         get {
@@ -187,7 +176,8 @@ import AVFoundation
             SettingsBridge.setCompassCalibrationEnabled(newValue)
         }
     }
-
+    
+    
     /// The current map appearance
     @objc static var mapAppearance: Appearance {
         get {
@@ -195,16 +185,16 @@ import AVFoundation
             if mapAppearanceRawValue != 0, let mapAppearance = Appearance(rawValue: mapAppearanceRawValue) {
                 return mapAppearance
             }
-
-            return .light
+            
+            return .auto
         }
         set {
             UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapAppearance)
             ThemeManager.invalidate()
         }
     }
-
-
+    
+    
     /// The current appearance
     @objc static var appearance: Appearance {
         get {
@@ -227,8 +217,8 @@ import AVFoundation
             }
         }
     }
-
-
+    
+    
     /// If the bookmarks should be synced via iCloud
     @objc static var shouldSync: Bool {
         get {
@@ -238,8 +228,8 @@ import AVFoundation
             SettingsBridge.setICLoudSynchronizationEnabled(newValue)
         }
     }
-
-
+    
+    
     /// If the sync beta alert has been shown
     @objc static var hasShownSyncBetaAlert: Bool {
         get {
@@ -249,15 +239,15 @@ import AVFoundation
             UserDefaults.standard.set(newValue, forKey: userDefaultsKeyHasShownSyncBetaAlert)
         }
     }
-
-
+    
+    
     /// The publisher for state changes of the iCloud sync
     static var syncStatePublisher: AnyPublisher<SynchronizationManagerState, Never> {
         iCloudSynchronizaionManager.shared.notifyObservers()
         return iCloudSynchronizaionManager.shared.statePublisher
     }
-
-
+    
+    
     /// If our custom logging is enabled
     @objc static var isLogging: Bool {
         get {
@@ -267,8 +257,8 @@ import AVFoundation
             SettingsBridge.setFileLoggingEnabled(newValue)
         }
     }
-
-
+    
+    
     /// The formatter for the size of the log file
     @objc static var logSizeFormatter: MeasurementFormatter {
         let measurementFormatter = MeasurementFormatter()
@@ -276,14 +266,14 @@ import AVFoundation
         measurementFormatter.unitOptions = .naturalScale
         return measurementFormatter
     }
-
-
+    
+    
     /// The size of the log file in bytes
     @objc static var logSize: Measurement<UnitInformationStorage> {
         return Measurement<UnitInformationStorage>(value: Double(SettingsBridge.logFileSize()), unit: .bytes)
     }
-
-
+    
+    
     /// If the perspective view should be used during routing
     @objc static var hasPerspectiveViewWhileRouting: Bool {
         get {
@@ -293,8 +283,8 @@ import AVFoundation
             SettingsBridge.setPerspectiveViewEnabled(newValue)
         }
     }
-
-
+    
+    
     /// If auto zoom should be used during routing
     @objc static var hasAutoZoomWhileRouting: Bool {
         get {
@@ -304,8 +294,8 @@ import AVFoundation
             SettingsBridge.setAutoZoomEnabled(newValue)
         }
     }
-
-
+    
+    
     /// If voice guidance should be provided during routing
     @objc static var shouldProvideVoiceRouting: Bool {
         get {
@@ -315,16 +305,16 @@ import AVFoundation
             MWMTextToSpeech.setTTSEnabled(newValue)
         }
     }
-
-
+    
+    
     /// The available languages for voice guidance during routing
     static var availableLanguagesForVoiceRouting: [VoiceRoutingLanguage] {
         return MWMTextToSpeech.availableLanguages().map { language in
             return VoiceRoutingLanguage(id: language.key, localizedName: language.value)
         }.sorted()
     }
-
-
+    
+    
     /// The current language for voice guidance during routing
     @objc static var languageForVoiceRouting: VoiceRoutingLanguage.ID {
         get {
@@ -334,18 +324,18 @@ import AVFoundation
             MWMTextToSpeech.tts().setNotificationsLocale(newValue)
         }
     }
-
-
+    
+    
     /// The voice used for voice guidance during routing
     @objc static var voiceForVoiceRouting: String? {
         if let voice = MWMTextToSpeech.tts().voice() {
             return voice.name
         }
-
+        
         return nil
     }
-
-
+    
+    
     /// If street names should be announced in the voice guidance during routing
     @objc static var shouldAnnounceStreetnamesWhileVoiceRouting: Bool {
         get {
@@ -355,8 +345,8 @@ import AVFoundation
             MWMTextToSpeech.setStreetNamesTTSEnabled(newValue)
         }
     }
-
-
+    
+    
     /// The current announcement of speed traps in the voice guidance during routing
     @objc static var announcingSpeedTrapsWhileVoiceRouting: AnnouncingSpeedTrapsWhileVoiceRouting {
         get {
@@ -366,8 +356,8 @@ import AVFoundation
             MWMTextToSpeech.setSpeedCameraMode(newValue.rawValue)
         }
     }
-
-
+    
+    
     /// If toll roads should be avoided during routing
     @objc static var shouldAvoidTollRoadsWhileRouting: Bool {
         get {
@@ -377,12 +367,12 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidToll = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
+    
+    
     /// If unpaved roads should be avoided during routing
     @objc static var shouldAvoidUnpavedRoadsWhileRouting: Bool {
         get {
@@ -392,12 +382,12 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidDirty = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
+    
+    
     /// If paved roads should be avoided during routing
     @objc static var shouldAvoidPavedRoadsWhileRouting: Bool {
         get {
@@ -407,12 +397,12 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidPaved = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
+    
+    
     /// If ferries should be avoided during routing
     @objc static var shouldAvoidFerriesWhileRouting: Bool {
         get {
@@ -422,12 +412,12 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidFerry = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
+    
+    
     /// If motorways should be avoided during routing
     @objc static var shouldAvoidMotorwaysWhileRouting: Bool {
         get {
@@ -437,12 +427,12 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidMotorway = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
+    
+    
     /// If steps should be avoided during routing
     @objc static var shouldAvoidStepsWhileRouting: Bool {
         get {
@@ -452,15 +442,15 @@ import AVFoundation
             let routingOptions = RoutingOptions()
             routingOptions.avoidSteps = newValue
             routingOptions.save()
-
+            
             NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
-
-
-
+    
+    
+    
     // MARK: Methods
-
+    
     /// Create a bookmarks backup before enabling the sync beta
     /// - Parameter completionHandler: A compeltion handler, which returns if a backup has been created
     static func createBookmarksBackupBecauseOfSyncBeta(completionHandler: ((_ hasCreatedBackup: Bool) -> Void)?) {
@@ -486,8 +476,8 @@ import AVFoundation
             }
         }
     }
-
-
+    
+    
     /// Play a test audio snippet for voice guidance during routing
     @objc static func playVoiceRoutingTest() {
         MWMTextToSpeech.playTest()

iphone/Maps/UI/Settings/SettingsView.swift

@@ -36,10 +36,6 @@ struct SettingsView: View {
     @State var selectedLanguageForMap: Settings.MapLanguage.ID? = nil
     
     
-    /// If the alternative languages for the app only should be used when they are the local native language
-    @State private var shouldLimitMapLanguageAlternativesToLocal: Bool = true
-    
-    
     /// If names should be transliterated to Latin
     @State private var shouldTransliterateToLatin: Bool = true
     
@@ -64,6 +60,10 @@ struct SettingsView: View {
     @State private var isSyncPossible: Bool = true
     
     
+    /// If the compass should be calibrated
+    @State private var shouldCalibrateCompass: Bool = true
+    
+    
     /// The selected power saving mode
     @State private var selectedPowerSavingMode: Settings.PowerSavingMode = .never
     
@@ -153,20 +153,6 @@ struct SettingsView: View {
                         Text("pref_maplanguage_title")
                     }
                     
-                    Toggle(isOn: $shouldLimitMapLanguageAlternativesToLocal) {
-                        VStack(alignment: .leading) {
-                            Text("limit_map_language_alternatives_to_local")
-                            
-                            if selectedLanguageForMap == "default" {
-                                Text("transliteration_title_disabled_summary")
-                                    .font(.footnote)
-                                    .foregroundStyle(.secondary)
-                            }
-                        }
-                    }
-                    .tint(.accent)
-                    .disabled(selectedLanguageForMap == "default")
-                    
                     Toggle(isOn: $shouldTransliterateToLatin) {
                         VStack(alignment: .leading) {
                             Text("transliteration_title")
@@ -252,6 +238,9 @@ struct SettingsView: View {
                         Text("pref_appearance_title")
                     }
                     
+                    Toggle("pref_calibration_title", isOn: $shouldCalibrateCompass)
+                        .tint(.accent)
+                    
                     Picker(selection: $selectedPowerSavingMode) {
                         ForEach(Settings.PowerSavingMode.allCases) { powerSavingMode in
                             Text(powerSavingMode.description)
@@ -307,11 +296,11 @@ struct SettingsView: View {
             hasAutomaticDownload = Settings.hasAutomaticDownload
             hasIncreasedFontsize = Settings.hasIncreasedFontsize
             selectedLanguageForMap = Settings.languageForMap
-            shouldLimitMapLanguageAlternativesToLocal = Settings.shouldLimitMapLanguageAlternativesToLocal
             shouldTransliterateToLatin = Settings.shouldTransliterateToLatin
             selectedMapAppearance = Settings.mapAppearance
             selectedAppearance = Settings.appearance
             shouldSync = Settings.shouldSync
+            shouldCalibrateCompass = Settings.shouldCalibrateCompass
             selectedPowerSavingMode = Settings.powerSavingMode
             selectedMobileDataPolicy = Settings.mobileDataPolicy
             isLogging = Settings.isLogging
@@ -339,9 +328,6 @@ struct SettingsView: View {
                 Settings.languageForMap = changedSelectedLanguageForMap
             }
         }
-        .onChange(of: shouldLimitMapLanguageAlternativesToLocal) { changedShouldLimitMapLanguageAlternativesToLocal in
-            Settings.shouldLimitMapLanguageAlternativesToLocal = changedShouldLimitMapLanguageAlternativesToLocal
-        }
         .onChange(of: shouldTransliterateToLatin) { changedShouldTransliterateToLatin in
             Settings.shouldTransliterateToLatin = changedShouldTransliterateToLatin
         }
@@ -359,6 +345,9 @@ struct SettingsView: View {
                 Settings.shouldSync = changedShouldSync
             }
         }
+        .onChange(of: shouldCalibrateCompass) { changedShouldCalibrateCompass in
+            Settings.shouldCalibrateCompass = changedShouldCalibrateCompass
+        }
         .onChange(of: selectedPowerSavingMode) { changedSelectedPowerSavingMode in
             Settings.powerSavingMode = changedSelectedPowerSavingMode
         }

libs/drape_frontend/drape_engine.cpp

@@ -19,7 +19,6 @@ using namespace std::placeholders;
 namespace
 {
 std::string_view constexpr kLocationStateMode = "LastLocationStateMode";
-std::string_view constexpr kPreferredRoutingMode = "PreferredRoutingMode";
 std::string_view constexpr kLastEnterBackground = "LastEnterBackground";
 }  // namespace
 
@@ -40,20 +39,16 @@ DrapeEngine::DrapeEngine(Params && params)
   m_requestedTiles = make_unique_dp<RequestedTiles>();
 
   using namespace location;
-  EMyPositionMode lastMode = PendingPosition;
-  if (settings::Get(kLocationStateMode, lastMode) && lastMode == FollowAndRotate)
+  EMyPositionMode mode = PendingPosition;
+  if (settings::Get(kLocationStateMode, mode) && mode == FollowAndRotate)
   {
     // If the screen rect setting in follow and rotate mode is missing or invalid, it could cause
     // invalid animations, so the follow and rotate mode should be discarded.
     m2::AnyRectD rect;
     if (!(settings::Get("ScreenClipRect", rect) && df::GetWorldRect().IsRectInside(rect.GetGlobalRect())))
-      lastMode = Follow;
+      mode = Follow;
   }
 
-  EMyPositionMode preferredRoutingMode;
-  if (!settings::Get(kPreferredRoutingMode, preferredRoutingMode))
-    preferredRoutingMode = FollowAndRotate;
-
   if (!settings::Get(kLastEnterBackground, m_startBackgroundTime))
     m_startBackgroundTime = base::Timer::LocalTime();
 
@@ -70,10 +65,9 @@ DrapeEngine::DrapeEngine(Params && params)
   //  effects.push_back(PostprocessRenderer::Antialiasing);
   //}
 
-  MyPositionController::Params mpParams(lastMode, preferredRoutingMode,
-                                        base::Timer::LocalTime() - m_startBackgroundTime, params.m_hints,
+  MyPositionController::Params mpParams(mode, base::Timer::LocalTime() - m_startBackgroundTime, params.m_hints,
                                         params.m_isRoutingActive, params.m_isAutozoomEnabled,
-                                        std::bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2, _3));
+                                        std::bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2));
 
   FrontendRenderer::Params frParams(
       params.m_apiVersion, make_ref(m_threadCommutator), params.m_factory, make_ref(m_textureManager),
@@ -410,11 +404,9 @@ void DrapeEngine::ModelViewChanged(ScreenBase const & screen)
     m_modelViewChangedHandler(screen);
 }
 
-void DrapeEngine::MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive, bool shouldPersistMode)
+void DrapeEngine::MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive)
 {
   settings::Set(kLocationStateMode, mode);
-  if (shouldPersistMode && routingActive)
-    settings::Set(kPreferredRoutingMode, mode);
   if (m_myPositionModeChanged)
     m_myPositionModeChanged(mode, routingActive);
 }
@@ -466,12 +458,6 @@ void DrapeEngine::SwitchMyPositionNextMode()
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::StartPendingPositionMode()
-{
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<StartPendingPositionModeMessage>(),
-                                  MessagePriority::Normal);
-}
-
 void DrapeEngine::LoseLocation()
 {
   using Mode = ChangeMyPositionModeMessage::EChangeType;

libs/drape_frontend/drape_engine.hpp

@@ -157,7 +157,6 @@ public:
   void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, double distToNextTurn, double speedLimit,
                   location::RouteMatchingInfo const & routeInfo);
   void SwitchMyPositionNextMode();
-  void StartPendingPositionMode();
   void LoseLocation();
   void StopLocationFollow();
 
@@ -251,7 +250,7 @@ private:
   void AddUserEvent(drape_ptr<UserEvent> && e);
   void PostUserEvent(drape_ptr<UserEvent> && e);
   void ModelViewChanged(ScreenBase const & screen);
-  void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive, bool shouldPersistMode);
+  void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive);
   void TapEvent(TapInfo const & tapInfo);
   void UserPositionChanged(m2::PointD const & position, bool hasPosition);
 

libs/drape_frontend/frontend_renderer.cpp

@@ -425,12 +425,6 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
     break;
   }
 
-  case Message::Type::StartPendingPositionMode:
-  {
-    m_myPositionController->StartPendingPositionMode();
-    break;
-  }
-
   case Message::Type::CompassInfo:
   {
     ref_ptr<CompassInfoMessage> msg = message;

libs/drape_frontend/message.cpp

@@ -33,7 +33,6 @@ std::string DebugPrint(Message::Type msgType)
   case Message::Type::MapShapesRecache: return "MapShapesRecache";
   case Message::Type::MapShapes: return "MapShapes";
   case Message::Type::ChangeMyPositionMode: return "ChangeMyPositionMode";
-  case Message::Type::StartPendingPositionMode: return "StartPendingPositionMode";
   case Message::Type::CompassInfo: return "CompassInfo";
   case Message::Type::GpsInfo: return "GpsInfo";
   case Message::Type::SelectObject: return "SelectObject";