Compare commits
1 Commits
test/2026.
...
x7z4w-patc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c19b1c30ec |
@@ -132,6 +132,7 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
|
||||
import com.google.android.material.appbar.MaterialToolbar;
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import com.google.android.material.textview.MaterialTextView;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -711,6 +712,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
||||
if (!TextUtils.isEmpty(appName))
|
||||
{
|
||||
setTitle(appName);
|
||||
((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
android:gravity="center"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:background="?selectableItemBackgroundBorderless"
|
||||
android:textSize="@dimen/text_size_toolbar"
|
||||
android:padding="@dimen/margin_half"
|
||||
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
|
||||
android:text="@string/editor_report_problem_send_button"/>
|
||||
</com.google.android.material.appbar.MaterialToolbar>
|
||||
|
||||
|
||||
@@ -15,8 +15,15 @@
|
||||
android:theme="@style/MwmWidget.ToolbarTheme"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:title="@string/editor_add_select_location">
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/margin_half"
|
||||
android:text="@string/editor_add_select_location"
|
||||
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
|
||||
</com.google.android.material.appbar.MaterialToolbar>
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
|
||||
@@ -98,6 +98,16 @@
|
||||
<item name="android:textColorHint">@color/text_light_hint</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
|
||||
<item name="android:textSize">@dimen/text_size_toolbar</item>
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
<item name="android:textColorHint">@color/text_light_hint</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Toolbar.Title.Light">
|
||||
<item name="android:textColor">@color/bg_cards</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.NavMenu">
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
@@ -143,7 +143,8 @@
|
||||
<item name="android:background">?colorPrimary</item>
|
||||
<item name="android:displayOptions">homeAsUp|showTitle</item>
|
||||
<item name="contentInsetStart">0dp</item>
|
||||
<item name="titleTextColor">@color/text_light</item>
|
||||
<item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
|
||||
<item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
|
||||
<item name="buttonGravity">center_vertical</item>
|
||||
</style>
|
||||
|
||||
@@ -168,7 +169,9 @@
|
||||
<item name="android:cacheColorHint">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
|
||||
<style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
|
||||
<item name="android:background">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.TextView.Item">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
|
||||
@@ -1490,12 +1490,6 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv
|
||||
g_framework->Set3dMode(allow3d, allow3dBuildings);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCarScreenMode(JNIEnv * env, jclass, jboolean enabled)
|
||||
{
|
||||
if (g_framework)
|
||||
frm()->SetCarScreenMode(static_cast<bool>(enabled));
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
|
||||
{
|
||||
bool enabled;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -162,22 +162,11 @@
|
||||
@path: #944A12;
|
||||
@path_expert: #523E33;
|
||||
@bridleway: #2B2827;
|
||||
@motorway0_border: #7A4006;
|
||||
@motorway1_border: #784606;
|
||||
@trunk0_border: #794D11;
|
||||
@trunk1_border: #79511D;
|
||||
@primary0_border: #7A5C2A;
|
||||
@primary1_border: #7C5E24;
|
||||
@primary2_border: #7C622F;
|
||||
@secondary0_border: #7F6730;
|
||||
@secondary1_border: #7F6B3C;
|
||||
@minor_road_border: #b2b2b2;
|
||||
|
||||
/* 5.2 Bridges */
|
||||
|
||||
@bridge_background: #2C2C1A;
|
||||
@bridge_casing: #505050;
|
||||
@bridge_minor_road_border: #393928;
|
||||
|
||||
/* 5.3 Tunnels */
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="12" cy="12" r="12" fill="#fff" opacity=".4"/>
|
||||
<circle cx="12" cy="12" r="11" fill="#0d3c73"/>
|
||||
<path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#e7ecf1"/>
|
||||
<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
|
||||
<g>
|
||||
<circle cx="12" cy="12" r="12" fill="#FFF" opacity=".4"/>
|
||||
<circle cx="12" cy="12" r="11" fill="#0D3C73"/>
|
||||
<path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF" opacity=".6"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 435 B After Width: | Height: | Size: 374 B |
@@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
|
||||
<g stroke-width=".75">
|
||||
<circle cx="9" cy="9" r="9" fill="#fff" opacity=".4"/>
|
||||
<circle cx="9" cy="9" r="8.25" fill="#0d3c73"/>
|
||||
<path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#e7ecf1"/>
|
||||
<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
|
||||
<g>
|
||||
<circle cx="9" cy="9" r="9" fill="#FFF" opacity=".4"/>
|
||||
<circle cx="9" cy="9" r="8" fill="#0D3C73"/>
|
||||
<path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF" opacity=".6"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 347 B |
@@ -1 +0,0 @@
|
||||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#181715" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#202510" fill-rule="evenodd"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB |
@@ -70,7 +70,6 @@ node|z14-[natural=geyser],
|
||||
node|z16-[natural=beach],
|
||||
area|z14-[natural=bare_rock],
|
||||
node|z17-[natural=rock],
|
||||
node|z18-[natural=tree],
|
||||
{text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
|
||||
|
||||
node|z13-[natural=peak][!name],
|
||||
@@ -207,9 +206,7 @@ node|z19-[man_made=water_well][drinking_water=not],
|
||||
node|z19-[amenity=water_point][drinking_water=not],
|
||||
{icon-image: drinking-water-no-m.svg;}
|
||||
|
||||
node|z18-[natural=tree][name],
|
||||
{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],
|
||||
|
||||
@@ -35,9 +35,7 @@
|
||||
8.7 Footway 15-22 ZOOM
|
||||
8.8 Steps 15-22 ZOOM
|
||||
8.9 Bridleway 14-22 ZOOM
|
||||
8.10 Major road borders
|
||||
8.11 Minor road borders
|
||||
8.12 Runway 12-22 ZOOM
|
||||
8.10 Runway 12-22 ZOOM
|
||||
9.RAIL 11-22 ZOOM
|
||||
9.1 RAIL 11-22 ZOOM
|
||||
9.2 Rail tunnel 14-22 ZOOM
|
||||
@@ -1139,420 +1137,7 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite
|
||||
line|z17-[highway=bridleway][bridge?]::bridgeblack
|
||||
{casing-width-add: 1;}
|
||||
|
||||
|
||||
/* 8.10 Major road borders */
|
||||
|
||||
line|z6-9[highway=motorway]::border,
|
||||
line|z6-9[highway=trunk]::border,
|
||||
{color: @trunk0_border; opacity: 1;}
|
||||
|
||||
line|z10-13[highway=motorway]::border,
|
||||
line|z10-13[highway=motorway_link]::border,
|
||||
{color: @motorway0_border; opacity: 1;}
|
||||
|
||||
line|z10-13[highway=trunk]::border,
|
||||
line|z10-13[highway=trunk_link]::border,
|
||||
{color: @trunk1_border; opacity: 1;}
|
||||
|
||||
line|z14-[highway=motorway]::border,
|
||||
line|z14-[highway=motorway_link]::border,
|
||||
{color: @motorway1_border; opacity: 1;}
|
||||
|
||||
line|z14-[highway=trunk]::border,
|
||||
line|z14-[highway=trunk_link]::border,
|
||||
{color: @trunk1_border; opacity: 1;}
|
||||
|
||||
line|z8-10[highway=primary]::border,
|
||||
{color: @primary0_border; opacity: 1;}
|
||||
line|z11-13[highway=primary]::border,
|
||||
line|z11-13[highway=primary_link]::border,
|
||||
{color: @primary1_border; opacity: 1;}
|
||||
line|z14-[highway=primary]::border,
|
||||
line|z14-[highway=primary_link]::border,
|
||||
{color: @primary2_border; opacity: 1;}
|
||||
|
||||
line|z10-13[highway=secondary]::border,
|
||||
line|z13[highway=secondary_link]::border,
|
||||
{color: @secondary0_border; opacity: 1;}
|
||||
line|z14-[highway=secondary]::border,
|
||||
line|z14-[highway=secondary_link]::border,
|
||||
{color: @secondary1_border; opacity: 1;}
|
||||
|
||||
/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
|
||||
|
||||
line|z10[highway=motorway]::border,
|
||||
{width: 3.6;}
|
||||
line|z11[highway=motorway]::border,
|
||||
{width: 4.0;}
|
||||
line|z12[highway=motorway]::border,
|
||||
{width: 4.6;}
|
||||
line|z13[highway=motorway]::border,
|
||||
{width: 5.0;}
|
||||
line|z14[highway=motorway]::border,
|
||||
{width: 5.4;}
|
||||
line|z15[highway=motorway]::border,
|
||||
{width: 6.6;}
|
||||
line|z16[highway=motorway]::border,
|
||||
{width: 8.8;}
|
||||
line|z17[highway=motorway]::border,
|
||||
{width: 10.0;}
|
||||
line|z18[highway=motorway]::border,
|
||||
{width: 13.0;}
|
||||
line|z19-[highway=motorway]::border,
|
||||
{width: 17.0;}
|
||||
|
||||
line|z6[highway=motorway]::border,
|
||||
line|z6[highway=trunk]::border,
|
||||
{width: 0;}
|
||||
line|z7[highway=motorway]::border,
|
||||
line|z7[highway=trunk]::border,
|
||||
{width: 0;}
|
||||
line|z8[highway=motorway]::border,
|
||||
line|z8[highway=trunk]::border,
|
||||
{width: 1.7;}
|
||||
line|z9[highway=motorway]::border,
|
||||
line|z9[highway=trunk]::border,
|
||||
{width: 1.8;}
|
||||
line|z10[highway=trunk]::border,
|
||||
{width: 3.2;}
|
||||
line|z11[highway=trunk]::border,
|
||||
{width: 3.5;}
|
||||
line|z12[highway=trunk]::border,
|
||||
{width: 4.0;}
|
||||
line|z13[highway=trunk]::border,
|
||||
{width: 4.6;}
|
||||
line|z14[highway=trunk]::border,
|
||||
{width: 5.0;}
|
||||
line|z15[highway=trunk]::border,
|
||||
{width: 5.8;}
|
||||
line|z16[highway=trunk]::border,
|
||||
{width: 7.2;}
|
||||
line|z17[highway=trunk]::border,
|
||||
{width: 9.2;}
|
||||
line|z18[highway=trunk]::border,
|
||||
{width: 12;}
|
||||
line|z19-[highway=trunk]::border,
|
||||
{width: 14.5;}
|
||||
|
||||
line|z10[highway=motorway_link]::border,
|
||||
line|z10[highway=trunk_link]::border,
|
||||
{width: 0;}
|
||||
line|z11[highway=motorway_link]::border,
|
||||
line|z11[highway=trunk_link]::border,
|
||||
{width: 1.6;}
|
||||
line|z12[highway=motorway_link]::border,
|
||||
line|z12[highway=trunk_link]::border,
|
||||
{width: 1.9;}
|
||||
line|z13[highway=motorway_link]::border,
|
||||
line|z13[highway=trunk_link]::border,
|
||||
{width: 2.4;}
|
||||
line|z14[highway=motorway_link]::border,
|
||||
line|z14[highway=trunk_link]::border,
|
||||
{width: 3.7;}
|
||||
line|z15[highway=motorway_link]::border,
|
||||
line|z15[highway=trunk_link]::border,
|
||||
{width: 4.7;}
|
||||
line|z16[highway=motorway_link]::border,
|
||||
line|z16[highway=trunk_link]::border,
|
||||
{width: 6.1;}
|
||||
line|z17[highway=motorway_link]::border,
|
||||
line|z17[highway=trunk_link]::border,
|
||||
{width: 7.7;}
|
||||
line|z18[highway=motorway_link]::border,
|
||||
line|z18[highway=trunk_link]::border,
|
||||
{width: 10.5;}
|
||||
line|z19-[highway=motorway_link]::border,
|
||||
line|z19-[highway=trunk_link]::border,
|
||||
{width: 12.7;}
|
||||
|
||||
line|z8[highway=primary]::border,
|
||||
{width: 0;}
|
||||
line|z9[highway=primary]::border,
|
||||
{width: 0;}
|
||||
line|z10[highway=primary]::border,
|
||||
{width: 2.3;}
|
||||
line|z11[highway=primary]::border,
|
||||
{width: 3.3;}
|
||||
line|z12[highway=primary]::border,
|
||||
{width: 3.7;}
|
||||
line|z13[highway=primary]::border,
|
||||
{width: 4.0;}
|
||||
line|z14[highway=primary]::border,
|
||||
{width: 4.8;}
|
||||
line|z15[highway=primary]::border,
|
||||
{width: 5.4;}
|
||||
line|z16[highway=primary]::border,
|
||||
{width: 6.4;}
|
||||
line|z17[highway=primary]::border,
|
||||
{width: 8;}
|
||||
line|z18[highway=primary]::border,
|
||||
{width: 11;}
|
||||
line|z19-[highway=primary]::border,
|
||||
{width: 13;}
|
||||
|
||||
line|z11[highway=primary_link]::border,
|
||||
{width: 0;}
|
||||
line|z12[highway=primary_link]::border,
|
||||
{width: 0;}
|
||||
line|z13[highway=primary_link]::border,
|
||||
{width: 1.8;}
|
||||
line|z14[highway=primary_link]::border,
|
||||
{width: 2.3;}
|
||||
line|z15[highway=primary_link]::border,
|
||||
{width: 3.5;}
|
||||
line|z16[highway=primary_link]::border,
|
||||
{width: 4.2;}
|
||||
line|z17[highway=primary_link]::border,
|
||||
{width: 5.7;}
|
||||
line|z18[highway=primary_link]::border,
|
||||
{width: 7.4;}
|
||||
line|z19-[highway=primary_link]::border,
|
||||
{width: 9.2;}
|
||||
|
||||
line|z10[highway=secondary]::border,
|
||||
{width: 1.9;}
|
||||
line|z11[highway=secondary]::border,
|
||||
{width: 3.2;}
|
||||
line|z12[highway=secondary]::border,
|
||||
{width: 3.5;}
|
||||
line|z13[highway=secondary]::border,
|
||||
{width: 3.7;}
|
||||
line|z14[highway=secondary]::border,
|
||||
{width: 4.2;}
|
||||
line|z15[highway=secondary]::border,
|
||||
{width: 4.8;}
|
||||
line|z16[highway=secondary]::border,
|
||||
{width: 6;}
|
||||
line|z17[highway=secondary]::border,
|
||||
{width: 7.6;}
|
||||
line|z18[highway=secondary]::border,
|
||||
{width: 10.4;}
|
||||
line|z19-[highway=secondary]::border,
|
||||
{width: 12.6;}
|
||||
|
||||
line|z13[highway=secondary_link]::border,
|
||||
{width: 1.8;}
|
||||
line|z14[highway=secondary_link]::border,
|
||||
{width: 2.3;}
|
||||
line|z15[highway=secondary_link]::border,
|
||||
{width: 3.5;}
|
||||
line|z16[highway=secondary_link]::border,
|
||||
{width: 4.2;}
|
||||
line|z17[highway=secondary_link]::border,
|
||||
{width: 5.7;}
|
||||
line|z18[highway=secondary_link]::border,
|
||||
{width: 7.4;}
|
||||
line|z19-[highway=secondary_link]::border,
|
||||
{width: 9.2;}
|
||||
|
||||
|
||||
/* 8.11 Minor road borders */
|
||||
|
||||
line|z11-[highway=tertiary]::border,
|
||||
line|z14-[highway=tertiary_link]::border,
|
||||
line|z11-[highway=unclassified]::border,
|
||||
line|z12-[highway=residential]::border,
|
||||
line|z12-[highway=road]::border,
|
||||
line|z12-[highway=living_street]::border,
|
||||
line|z13-[highway=pedestrian]::border,
|
||||
line|z13-[highway=ford]::border,
|
||||
line|z15-[highway=service]::border,
|
||||
line|z15-[highway=service][service=busway]::border,
|
||||
line|z15-[highway=busway]::border,
|
||||
line|z15-[highway=footway]::border,
|
||||
line|z15-[highway=ladder]::border,
|
||||
line|z15-[highway=steps]::border,
|
||||
{color: @minor_road_border; opacity: 0.1;}
|
||||
|
||||
line|z11-[highway=tertiary][bridge?]::border,
|
||||
line|z14-[highway=tertiary_link][bridge?]::border,
|
||||
line|z11-[highway=unclassified][bridge?]::border,
|
||||
line|z12-[highway=residential][bridge?]::border,
|
||||
line|z12-[highway=road][bridge?]::border,
|
||||
line|z12-[highway=living_street][bridge?]::border,
|
||||
line|z13-[highway=pedestrian][bridge?]::border,
|
||||
line|z15-[highway=service][bridge?]::border,
|
||||
line|z15-[highway=service][service=busway][bridge?]::border,
|
||||
line|z15-[highway=busway][bridge?]::border,
|
||||
line|z15-[highway=footway][bridge?]::border,
|
||||
line|z15-[highway=steps][bridge?]::border,
|
||||
{color: @bridge_minor_road_border; opacity: 1; linecap: butt}
|
||||
|
||||
/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
|
||||
|
||||
line|z11[highway=tertiary]::border,
|
||||
{width: 1.7;}
|
||||
line|z12[highway=tertiary]::border,
|
||||
{width: 2.1;}
|
||||
line|z13[highway=tertiary]::border,
|
||||
{width: 2.3;}
|
||||
line|z14[highway=tertiary]::border,
|
||||
{width: 3.7;}
|
||||
line|z15[highway=tertiary]::border,
|
||||
{width: 4.8;}
|
||||
line|z16[highway=tertiary]::border,
|
||||
{width: 6;}
|
||||
line|z17[highway=tertiary]::border,
|
||||
{width: 7.6;}
|
||||
line|z18[highway=tertiary]::border,
|
||||
{width: 10.4;}
|
||||
line|z19-[highway=tertiary]::border,
|
||||
{width: 12.6;}
|
||||
|
||||
line|z14[highway=tertiary_link]::border,
|
||||
{width: 2.3;}
|
||||
line|z15[highway=tertiary_link]::border,
|
||||
{width: 3.5;}
|
||||
line|z16[highway=tertiary_link]::border,
|
||||
{width: 4.2;}
|
||||
line|z17[highway=tertiary_link]::border,
|
||||
{width: 5.7;}
|
||||
line|z18[highway=tertiary_link]::border,
|
||||
{width: 7.4;}
|
||||
line|z19-[highway=tertiary_link]::border,
|
||||
{width: 9.2;}
|
||||
|
||||
line|z11[highway=unclassified]::border,
|
||||
{width: 0;}
|
||||
line|z12[highway=unclassified]::border,
|
||||
{width: 0;}
|
||||
line|z13[highway=unclassified]::border,
|
||||
{width: 1.9;}
|
||||
line|z14[highway=unclassified]::border,
|
||||
{width: 3.3;}
|
||||
line|z15[highway=unclassified]::border,
|
||||
{width: 4.2;}
|
||||
line|z16[highway=unclassified]::border,
|
||||
{width: 5.2;}
|
||||
line|z17[highway=unclassified]::border,
|
||||
{width: 7;}
|
||||
line|z18[highway=unclassified]::border,
|
||||
{width: 9;}
|
||||
line|z19-[highway=unclassified]::border,
|
||||
{width: 11;}
|
||||
|
||||
line|z12[highway=residential]::border,
|
||||
line|z12[highway=road]::border,
|
||||
line|z12[highway=living_street]::border,
|
||||
{width: 0;}
|
||||
line|z13[highway=residential]::border,
|
||||
line|z13[highway=road]::border,
|
||||
line|z13[highway=living_street]::border,
|
||||
{width: 0;}
|
||||
line|z14[highway=residential]::border,
|
||||
line|z14[highway=road]::border,
|
||||
line|z14[highway=living_street]::border,
|
||||
{width: 2.1;}
|
||||
line|z15[highway=residential]::border,
|
||||
line|z15[highway=road]::border,
|
||||
line|z15[highway=living_street]::border,
|
||||
{width: 3.4;}
|
||||
line|z16[highway=residential]::border,
|
||||
line|z16[highway=road]::border,
|
||||
line|z16[highway=living_street]::border,
|
||||
{width: 4.2;}
|
||||
line|z17[highway=residential]::border,
|
||||
line|z17[highway=road]::border,
|
||||
line|z17[highway=living_street]::border,
|
||||
{width: 5.7;}
|
||||
line|z18[highway=residential]::border,
|
||||
line|z18[highway=road]::border,
|
||||
line|z18[highway=living_street]::border,
|
||||
{width: 7.4;}
|
||||
line|z19-[highway=residential]::border,
|
||||
line|z19-[highway=road]::border,
|
||||
line|z19-[highway=living_street]::border,
|
||||
{width: 9.2;}
|
||||
|
||||
line|z13[highway=pedestrian]::border,
|
||||
line|z13[highway=ford]::border,
|
||||
{width: 0;dashes: 4,1;}
|
||||
line|z14[highway=pedestrian]::border,
|
||||
line|z14[highway=ford]::border,
|
||||
{width: 2.1;dashes: 6,1.3;}
|
||||
line|z15[highway=pedestrian]::border,
|
||||
line|z15[highway=ford]::border,
|
||||
{width: 3;dashes: 8,1.5;}
|
||||
line|z16[highway=pedestrian]::border,
|
||||
line|z16[highway=ford]::border,
|
||||
{width: 3.4;dashes: 8,1.5;}
|
||||
line|z17[highway=pedestrian]::border,
|
||||
line|z17[highway=ford]::border,
|
||||
{width: 4;dashes: 9,1.8;}
|
||||
line|z18[highway=pedestrian]::border,
|
||||
line|z18[highway=ford]::border,
|
||||
{width: 5;dashes: 11,2.3;}
|
||||
line|z19-[highway=pedestrian]::border,
|
||||
line|z19-[highway=ford]::border,
|
||||
{width: 6;dashes: 13,2.7;}
|
||||
|
||||
line|z15[highway=service]::border,
|
||||
line|z15[highway=service][service=busway]::border,
|
||||
line|z15[highway=busway]::border,
|
||||
{width: 1.7;}
|
||||
line|z15[highway=service][service=driveway]::border,
|
||||
{width: 0;}
|
||||
line|z16[highway=service]::border,
|
||||
line|z16[highway=service][service=busway]::border,
|
||||
line|z16[highway=busway]::border,
|
||||
{width: 2.1;}
|
||||
line|z17[highway=service]::border,
|
||||
line|z17[highway=service][service=busway]::border,
|
||||
line|z17[highway=busway]::border,
|
||||
{width: 3;}
|
||||
line|z18[highway=service]::border,
|
||||
line|z18[highway=service][service=busway]::border,
|
||||
line|z18[highway=busway]::border,
|
||||
{width: 4;}
|
||||
line|z19-[highway=service]::border,
|
||||
line|z19-[highway=service][service=busway]::border,
|
||||
line|z19-[highway=busway]::border,
|
||||
{width: 5;}
|
||||
|
||||
line|z15[highway=footway]::border,
|
||||
{width: 2; dashes: 5,1.5;}
|
||||
line|z16[highway=footway]::border,
|
||||
{width: 3; dashes: 5,1.5;}
|
||||
line|z17[highway=footway]::border,
|
||||
{width: 3.4; dashes: 6,1.8;}
|
||||
line|z18[highway=footway]::border,
|
||||
{width: 4.2; dashes: 8,2.3;}
|
||||
line|z19-[highway=footway]::border,
|
||||
{width: 5.2; dashes: 10,2.7;}
|
||||
|
||||
line|z15[highway=footway][bicycle=designated]::border,
|
||||
{width: 2; dashes: 6,9;}
|
||||
line|z16[highway=footway][bicycle=designated]::border,
|
||||
{width: 3; dashes: 8,10;}
|
||||
line|z17[highway=footway][bicycle=designated]::border,
|
||||
{width: 3.4; dashes: 10,11;}
|
||||
line|z18[highway=footway][bicycle=designated]::border,
|
||||
{width: 4.2; dashes: 15,15;}
|
||||
line|z19-[highway=footway][bicycle=designated]::border,
|
||||
{width: 5.2; dashes: 20,20;}
|
||||
|
||||
/* Don't display sidewalks and pedestrian crossings on z15. */
|
||||
line|z15[highway=footway][footway=sidewalk]::border,
|
||||
line|z15[highway=footway][footway=crossing]::border,
|
||||
{width: 0;}
|
||||
|
||||
line|z15[highway=ladder]::border,
|
||||
line|z15[highway=steps]::border,
|
||||
{width: 3.4; dashes: 1.5,1.3;}
|
||||
line|z16[highway=ladder]::border,
|
||||
line|z16[highway=steps]::border,
|
||||
{width: 5; dashes: 1.8,1.6;}
|
||||
line|z17-[highway=ladder]::border,
|
||||
line|z17-[highway=steps]::border,
|
||||
{width: 7; dashes: 2.5,2.2;}
|
||||
line|z18[highway=ladder]::border,
|
||||
line|z18[highway=steps]::border,
|
||||
{width: 9; dashes: 3.2,2.8;}
|
||||
line|z19-[highway=ladder]::border,
|
||||
line|z19-[highway=steps]::border,
|
||||
{width: 11; dashes: 4,3.5;}
|
||||
|
||||
/* 8.12 Runway 12-22 ZOOM */
|
||||
/* 8.10 Runway 12-22 ZOOM */
|
||||
|
||||
line|z12-[aeroway=runway],
|
||||
line|z14-[aeroway=taxiway],
|
||||
|
||||
@@ -97,8 +97,8 @@ amenity-recycling-centre # area z15- (also has icon z
|
||||
amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-)
|
||||
amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-)
|
||||
emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-)
|
||||
highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-)
|
||||
highway-pedestrian-square # area z14- (also has line z13-, pathtext z14-)
|
||||
highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-)
|
||||
highway-services # area z13- (also has icon z14-, caption(optional) z14-)
|
||||
landuse-garages # area z13- (also has caption z15-)
|
||||
@@ -111,7 +111,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
|
||||
|
||||
|
||||
@@ -45,10 +45,10 @@ power-line # line z19- (also has line::
|
||||
power-line::dash # line::dash z19- (also has line z19-)
|
||||
=== 340
|
||||
|
||||
highway-ladder # line z15- (also has line::border z15-, icon z17-, pathtext z17-)
|
||||
highway-steps # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-steps-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
|
||||
highway-ladder # line z15- (also has icon z17-, pathtext z17-)
|
||||
highway-steps # line z15- (also has pathtext z16-)
|
||||
highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
|
||||
hwtag-oneway::arrows # line::arrows z15-
|
||||
waterway-weir # line z14- (also has pathtext z15-)
|
||||
=== 330
|
||||
@@ -73,23 +73,23 @@ railway-tram-bridge # line z13-
|
||||
railway-tram-tunnel # line z13-
|
||||
=== 320
|
||||
|
||||
highway-motorway # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway # line z6- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk # line z6- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-world_level # line z4-9
|
||||
highway-world_towns_level # line z6-9
|
||||
=== 310
|
||||
|
||||
# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
# === 309
|
||||
|
||||
highway-primary # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-bridge # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-tunnel # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary # line z8- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-primary-bridge # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-tunnel # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
railway-rail-branch::dash # line::dash z16- (also has line z11-)
|
||||
railway-rail-branch-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
railway-rail-branch-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-)
|
||||
@@ -104,7 +104,7 @@ railway-rail-tourism-bridge::dash # line::dash z16- (also has
|
||||
railway-rail-tourism-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
|
||||
=== 290
|
||||
|
||||
# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
|
||||
# highway-primary-tunnel # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
|
||||
# === 289
|
||||
|
||||
railway-rail-branch # line z11- (also has line::dash z16-)
|
||||
@@ -127,88 +127,88 @@ railway-rail-tourism-tunnel # line z10- (also has line::
|
||||
# railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
|
||||
# === 279
|
||||
|
||||
highway-secondary # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-tunnel # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary # line z10- (also has pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-tunnel # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
=== 270
|
||||
|
||||
# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
|
||||
# highway-secondary-tunnel # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
|
||||
# === 269
|
||||
|
||||
highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-tunnel # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-unclassified # line z11- (also has line::border z13-, pathtext z13-)
|
||||
highway-unclassified-area # line z11- (also has line::border z13-, pathtext z13-)
|
||||
highway-unclassified-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
highway-unclassified-tunnel # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
|
||||
highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-unclassified # line z11- (also has pathtext z13-)
|
||||
highway-unclassified-area # line z11- (also has pathtext z13-)
|
||||
highway-unclassified-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-)
|
||||
=== 250
|
||||
|
||||
# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
|
||||
# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
|
||||
# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
|
||||
# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-)
|
||||
# === 249
|
||||
|
||||
highway-living_street # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street-bridge # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
|
||||
highway-residential # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-bridge # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-road-bridge # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-road-tunnel # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street # line z12- (also has pathtext z14-)
|
||||
highway-living_street-bridge # line z12- (also has pathtext z14-)
|
||||
highway-living_street-tunnel # line z12- (also has line(casing) z16-, pathtext z14-)
|
||||
highway-residential # line z12- (also has pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-)
|
||||
highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road # line z12- (also has pathtext z14-)
|
||||
highway-road-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-road-tunnel # line z12- (also has pathtext z14-)
|
||||
=== 230
|
||||
|
||||
# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
|
||||
# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-)
|
||||
# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
# === 229
|
||||
|
||||
highway-motorway_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link # line z10- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 228
|
||||
|
||||
# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
# === 227
|
||||
|
||||
highway-primary_link # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-tunnel # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link # line z11- (also has pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 226
|
||||
|
||||
# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
|
||||
# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
|
||||
# === 225
|
||||
|
||||
highway-secondary_link # line z13- (also has line::border z13-, pathtext z16-)
|
||||
highway-secondary_link-bridge # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-secondary_link-tunnel # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
|
||||
highway-secondary_link # line z13- (also has pathtext z16-)
|
||||
highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-secondary_link-tunnel # line z13- (also has line(casing) z16-, pathtext z16-)
|
||||
=== 224
|
||||
|
||||
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
|
||||
highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-)
|
||||
highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
|
||||
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-)
|
||||
highway-tertiary_link # line z14- (also has pathtext z18-)
|
||||
highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-)
|
||||
=== 223
|
||||
|
||||
highway-busway # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
|
||||
highway-service # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-area # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-)
|
||||
highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
|
||||
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
|
||||
highway-busway # line z15- (also has pathtext z16-)
|
||||
highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-)
|
||||
highway-service # line z15- (also has pathtext z16-)
|
||||
highway-service-area # line z15- (also has pathtext z16-)
|
||||
highway-service-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-service-driveway # line z16- (also has pathtext z16-)
|
||||
highway-service-parking_aisle # line z15- (also has pathtext z16-)
|
||||
highway-service-tunnel # line z15- (also has line(casing) z15-, pathtext z16-)
|
||||
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
|
||||
=== 222
|
||||
|
||||
# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
|
||||
# highway-service-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
|
||||
# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-)
|
||||
# highway-service-tunnel # line(casing) z15- (also has line z15-, pathtext z16-)
|
||||
railway-light_rail::dash # line::dash z16- (also has line z13-)
|
||||
railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
railway-rail::dash # line::dash z16- (also has line z11-)
|
||||
@@ -227,11 +227,11 @@ railway-subway::dash # line::dash z16- (also has
|
||||
railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
=== 221
|
||||
|
||||
highway-footway-bicycle # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-)
|
||||
highway-footway-bicycle # line z15- (also has line::cycleline z15-, pathtext z15-)
|
||||
highway-path-bicycle # line z15- (also has line::cycleline z14-, pathtext z15-)
|
||||
=== 220
|
||||
|
||||
highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-)
|
||||
highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-)
|
||||
highway-path-bicycle::cycleline # line::cycleline z14- (also has line z15-, pathtext z15-)
|
||||
=== 219
|
||||
|
||||
@@ -264,23 +264,23 @@ railway-subway-bridge # line z13- (also has line::
|
||||
# railway-rail-utility-tunnel # line(casing) z14- (also has line z13-, line::dash z17-)
|
||||
# === 209
|
||||
|
||||
highway-ford # line z13- (also has line::border z14-, icon z16-, pathtext z16-)
|
||||
highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
|
||||
highway-ford # line z13- (also has icon z16-, pathtext z16-)
|
||||
highway-pedestrian # line z13- (also has pathtext z14-)
|
||||
highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-)
|
||||
highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-pedestrian-square # line z13- and area z14- (also has pathtext z14-)
|
||||
highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-)
|
||||
=== 200
|
||||
|
||||
# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-)
|
||||
# === 199
|
||||
|
||||
highway-bridleway # line z14- (also has pathtext z15-)
|
||||
highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
|
||||
highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
|
||||
highway-footway # line z15- (also has line::border z15-, pathtext z15-)
|
||||
highway-footway-area # line z15- and area z14- (also has line::border z15-, pathtext z15-)
|
||||
highway-footway-crossing # line z16- (also has line::border z16-)
|
||||
highway-footway # line z15- (also has pathtext z15-)
|
||||
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
|
||||
highway-footway-crossing # line z16-
|
||||
highway-path # line z15- (also has pathtext z15-)
|
||||
highway-path-difficult # line z15- (also has pathtext z15-)
|
||||
highway-path-expert # line z15- (also has pathtext z15-)
|
||||
@@ -290,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 z8- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
=== 163
|
||||
|
||||
highway-primary::border # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
|
||||
=== 162
|
||||
|
||||
highway-secondary::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
|
||||
=== 161
|
||||
|
||||
highway-motorway_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
=== 160
|
||||
|
||||
highway-primary_link::border # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
|
||||
=== 159
|
||||
|
||||
highway-secondary_link::border # line::border z13- (also has line z13-, pathtext z16-)
|
||||
=== 158
|
||||
|
||||
highway-motorway-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 157
|
||||
|
||||
highway-primary-bridge::border # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 156
|
||||
|
||||
highway-secondary-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
=== 155
|
||||
|
||||
highway-motorway_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 154
|
||||
|
||||
highway-primary_link-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 153
|
||||
|
||||
highway-secondary_link-bridge::border # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
=== 152
|
||||
|
||||
highway-motorway-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
=== 151
|
||||
|
||||
highway-primary-tunnel::border # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 150
|
||||
|
||||
highway-secondary-tunnel::border # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
=== 149
|
||||
|
||||
highway-motorway_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 148
|
||||
|
||||
highway-primary_link-tunnel::border # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 147
|
||||
|
||||
highway-secondary_link-tunnel::border # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
|
||||
=== 146
|
||||
|
||||
highway-busway::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
highway-road::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-service::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-service-area::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-)
|
||||
highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-)
|
||||
highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-)
|
||||
highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-)
|
||||
=== 145
|
||||
|
||||
highway-footway::border # line::border z15- (also has line z15-, pathtext z15-)
|
||||
highway-footway-area::border # line::border z15- (also has line z15-, area z14-, pathtext z15-)
|
||||
highway-footway-bicycle::border # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-)
|
||||
highway-footway-crossing::border # line::border z16- (also has line z16-)
|
||||
highway-footway-sidewalk::border # line::border z16- (also has line z16-)
|
||||
highway-ford::border # line::border z14- (also has line z13-, icon z16-, pathtext z16-)
|
||||
highway-ladder::border # line::border z15- (also has line z15-, icon z17-, pathtext z17-)
|
||||
highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-)
|
||||
highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-)
|
||||
highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-)
|
||||
highway-steps::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
=== 144
|
||||
|
||||
highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-service-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
=== 143
|
||||
|
||||
highway-footway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
|
||||
highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-steps-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
|
||||
=== 142
|
||||
|
||||
highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
|
||||
highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
|
||||
highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-service-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
|
||||
highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
|
||||
highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
|
||||
=== 141
|
||||
|
||||
highway-footway-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
|
||||
highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
|
||||
highway-steps-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
|
||||
=== 140
|
||||
|
||||
highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
|
||||
highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-)
|
||||
highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
|
||||
highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
|
||||
highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
|
||||
highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
|
||||
highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
|
||||
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
|
||||
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-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
|
||||
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
|
||||
railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
|
||||
@@ -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 z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
|
||||
highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
|
||||
highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
|
||||
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
|
||||
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-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
|
||||
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
|
||||
railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
|
||||
@@ -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-)
|
||||
|
||||
@@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio
|
||||
railway-station # icon z12- (also has caption(optional) z12-)
|
||||
=== 6800
|
||||
|
||||
highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
|
||||
highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
|
||||
highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-)
|
||||
highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
|
||||
highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-)
|
||||
highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
|
||||
=== 6750
|
||||
|
||||
highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
|
||||
highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
|
||||
highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-)
|
||||
highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
|
||||
highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-)
|
||||
highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
|
||||
=== 6740
|
||||
|
||||
boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16)
|
||||
@@ -259,31 +259,31 @@ railway-station-subway-yerevan # icon z13- (also has captio
|
||||
railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-)
|
||||
=== 6250
|
||||
|
||||
highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
|
||||
highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
|
||||
highway-primary # pathtext z10- (also has shield::shield z10-, line z8-)
|
||||
highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
|
||||
route-ferry # pathtext z10- (also has line z7-)
|
||||
=== 6200
|
||||
|
||||
highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
|
||||
highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
|
||||
highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-)
|
||||
highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
|
||||
highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-)
|
||||
highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
|
||||
=== 6150
|
||||
|
||||
highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
|
||||
highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
|
||||
highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-)
|
||||
highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
|
||||
highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-)
|
||||
highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
|
||||
=== 6140
|
||||
|
||||
highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
|
||||
highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
|
||||
highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-)
|
||||
highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
|
||||
=== 6100
|
||||
|
||||
barrier-border_control # icon z14- (also has caption(optional) z14-)
|
||||
@@ -302,9 +302,9 @@ place-locality # caption z13-
|
||||
place-neighbourhood # caption z13-
|
||||
=== 5700
|
||||
|
||||
highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
|
||||
highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
|
||||
highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-)
|
||||
highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
|
||||
=== 5600
|
||||
|
||||
man_made-communications_tower # icon z14- (also has caption(optional) z15-)
|
||||
@@ -581,14 +581,14 @@ shop-supermarket # icon z16- (also has captio
|
||||
=== 3200
|
||||
|
||||
area:highway-pedestrian # caption z15- (also has area z14-)
|
||||
highway-pedestrian # pathtext z14- (also has line z13-, line::border z14-)
|
||||
highway-pedestrian-area # pathtext z14- (also has line z13-, line::border z14-, area z14-)
|
||||
highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
|
||||
highway-pedestrian-square # pathtext z14- (also has line z13-, line::border z14-, area z14-)
|
||||
highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
|
||||
highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
|
||||
highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
|
||||
highway-pedestrian # pathtext z14- (also has line z13-)
|
||||
highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-)
|
||||
highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
|
||||
highway-pedestrian-square # pathtext z14- (also has line z13-, area z14-)
|
||||
highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-)
|
||||
highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-)
|
||||
highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
|
||||
natural-strait # caption z13- (also has line z13-)
|
||||
natural-water # caption z10- (also has area z1-)
|
||||
natural-water-pond # caption z10- (also has area z1-)
|
||||
@@ -600,10 +600,10 @@ waterway-dam # pathtext z15- (also has li
|
||||
waterway-river # pathtext z11- (also has line z10-)
|
||||
=== 3150
|
||||
|
||||
highway-unclassified # pathtext z13- (also has line z11-, line::border z13-)
|
||||
highway-unclassified-area # pathtext z13- (also has line z11-, line::border z13-)
|
||||
highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
|
||||
highway-unclassified # pathtext z13- (also has line z11-)
|
||||
highway-unclassified-area # pathtext z13- (also has line z11-)
|
||||
highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-)
|
||||
=== 3100
|
||||
|
||||
amenity-water_point # icon z17- (also has caption(optional) z18-)
|
||||
@@ -635,46 +635,46 @@ aerialway-mixed_lift # pathtext z15- (also has li
|
||||
aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
|
||||
highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
|
||||
highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-road # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
|
||||
highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-secondary_link # pathtext z16- (also has line z13-, line::border z13-)
|
||||
highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
|
||||
highway-residential # pathtext z13- (also has shield::shield z15-, line z12-)
|
||||
highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-)
|
||||
highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
|
||||
highway-road # pathtext z14- (also has line z12-)
|
||||
highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
|
||||
highway-road-tunnel # pathtext z14- (also has line z12-)
|
||||
highway-secondary_link # pathtext z16- (also has line z13-)
|
||||
highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-)
|
||||
=== 3000
|
||||
|
||||
highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
|
||||
highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
|
||||
highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-)
|
||||
highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
|
||||
=== 2975
|
||||
|
||||
highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
|
||||
highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
|
||||
highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-)
|
||||
highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
|
||||
=== 2970
|
||||
|
||||
highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
|
||||
highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
|
||||
highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-)
|
||||
highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
|
||||
=== 2965
|
||||
|
||||
highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
|
||||
highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
|
||||
highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-)
|
||||
highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
|
||||
=== 2960
|
||||
|
||||
barrier-city_wall # pathtext z16- (also has line z14-)
|
||||
historic-citywalls # pathtext z16- (also has line z14-)
|
||||
=== 2957
|
||||
|
||||
highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
|
||||
highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
|
||||
highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-)
|
||||
highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-)
|
||||
highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
|
||||
=== 2955
|
||||
|
||||
highway-cycleway # pathtext z15- (also has line z13-)
|
||||
@@ -683,14 +683,14 @@ highway-cycleway-tunnel # pathtext z15- (also has li
|
||||
=== 2953
|
||||
|
||||
area:highway-footway # caption z15- (also has area z14-)
|
||||
highway-footway # pathtext z15- (also has line z15-, line::border z15-)
|
||||
highway-footway-area # pathtext z15- (also has line z15-, line::border z15-, area z14-)
|
||||
highway-footway-bicycle # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
|
||||
highway-footway-bridge # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-footway-tunnel # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-)
|
||||
highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
|
||||
highway-footway # pathtext z15- (also has line z15-)
|
||||
highway-footway-area # pathtext z15- (also has line z15-, area z14-)
|
||||
highway-footway-bicycle # pathtext z15- (also has line z15-, line::cycleline z15-)
|
||||
highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-tertiary_link # pathtext z18- (also has line z14-)
|
||||
highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-)
|
||||
=== 2950
|
||||
|
||||
natural-water-basin # caption z10- (also has area z1-)
|
||||
@@ -707,7 +707,7 @@ waterway-stream-intermittent # pathtext z13- (also has li
|
||||
waterway-weir # pathtext z15- (also has line z14-)
|
||||
=== 2900
|
||||
|
||||
highway-ford # icon z16- and pathtext z16- (also has line z13-, line::border z14-)
|
||||
highway-ford # icon z16- and pathtext z16- (also has line z13-)
|
||||
natural-rock # icon z17- (also has caption(optional) z17-)
|
||||
=== 2850
|
||||
|
||||
@@ -723,9 +723,9 @@ highway-path-horse # pathtext z15- (also has li
|
||||
highway-path-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2820
|
||||
|
||||
highway-steps # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-steps-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-steps-tunnel # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-steps # pathtext z16- (also has line z15-)
|
||||
highway-steps-bridge # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2810
|
||||
|
||||
highway-track # pathtext z15- (also has line z15-)
|
||||
@@ -735,12 +735,12 @@ highway-track-no-access # pathtext z15- (also has li
|
||||
highway-track-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2780
|
||||
|
||||
highway-service # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-service-area # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-service-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-service-driveway # pathtext z16- (also has line z16-, line::border z16-)
|
||||
highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-service-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
|
||||
highway-service # pathtext z16- (also has line z15-)
|
||||
highway-service-area # pathtext z16- (also has line z15-)
|
||||
highway-service-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-service-driveway # pathtext z16- (also has line z16-)
|
||||
highway-service-parking_aisle # pathtext z16- (also has line z15-)
|
||||
highway-service-tunnel # pathtext z16- (also has line(casing) z15-, line z15-)
|
||||
piste:type-downhill # pathtext z15- (also has line z14-)
|
||||
piste:type-downhill-advanced # pathtext z15- (also has line z14-)
|
||||
piste:type-downhill-easy # pathtext z15- (also has line z14-)
|
||||
@@ -823,9 +823,9 @@ attraction-historic # icon z17- (also has captio
|
||||
attraction-maze # icon z17- (also has caption(optional) z17-)
|
||||
attraction-roller_coaster # icon z17- (also has caption(optional) z17-)
|
||||
highway-construction # pathtext z15- (also has line z13-)
|
||||
highway-living_street # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-living_street # pathtext z14- (also has line z12-)
|
||||
highway-living_street-bridge # pathtext z14- (also has line z12-)
|
||||
highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-)
|
||||
landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-)
|
||||
leisure-bowling_alley # icon z17- (also has caption(optional) z17-)
|
||||
leisure-garden # icon z16- (also has caption(optional) z16-, area z12-)
|
||||
@@ -892,9 +892,9 @@ barrier-yes # icon z16- (also has captio
|
||||
leisure-dog_park # icon z16- (also has caption(optional) z16-, area z15-)
|
||||
=== 2300
|
||||
|
||||
highway-busway # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-busway-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-busway-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
|
||||
highway-busway # pathtext z16- (also has line z15-)
|
||||
highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-)
|
||||
=== 2250
|
||||
|
||||
amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-)
|
||||
@@ -1162,7 +1162,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-)
|
||||
@@ -2436,7 +2436,7 @@ emergency-life_ring # icon z19- (also has captio
|
||||
power-substation # icon z17- (also has caption(optional) z18-, area z13-)
|
||||
=== -9990
|
||||
|
||||
natural-tree # icon z18- (also has caption(optional) z18-)
|
||||
natural-tree # icon z18-
|
||||
=== -9991
|
||||
|
||||
# amenity-bench # caption(optional) z19- (also has icon z18-)
|
||||
@@ -2474,7 +2474,6 @@ entrance-service # icon z19- (also has captio
|
||||
# man_made-survey_point # caption(optional) z18- (also has icon z18-)
|
||||
# man_made-telescope # caption(optional) z18- (also has icon z18-)
|
||||
# man_made-telescope-optical # caption(optional) z17- (also has icon z17-)
|
||||
# natural-tree # caption(optional) z18- (also has icon z18-)
|
||||
# power-substation # caption(optional) z18- (also has icon z17-, area z13-)
|
||||
# tourism-information # caption(optional) z16- (also has icon z16-)
|
||||
# tourism-information-board # caption(optional) z16- (also has icon z16-)
|
||||
|
||||
@@ -161,22 +161,11 @@
|
||||
@path: #8E4E1D;
|
||||
@path_expert: #3D2617;
|
||||
@bridleway: #3D361E;
|
||||
@motorway0_border: #C26E00;
|
||||
@motorway1_border: #D87A00;
|
||||
@trunk0_border: #DA8816;
|
||||
@trunk1_border: #DA8F2B;
|
||||
@primary0_border: #DDA546;
|
||||
@primary1_border: #E1A93A;
|
||||
@primary2_border: #E1AF4E;
|
||||
@secondary0_border: #E6BA51;
|
||||
@secondary1_border: #E6C068;
|
||||
@minor_road_border: #000000;
|
||||
|
||||
/* 5.2 Bridges */
|
||||
|
||||
@bridge_background: #FCF1DE;
|
||||
@bridge_casing: #E1D4BE;
|
||||
@bridge_minor_road_border: #E3D9C8;
|
||||
|
||||
/* 5.3 Tunnels */
|
||||
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
|
||||
<svg viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
|
||||
<g>
|
||||
<circle cx="12" cy="12" r="12" fill="#FFF" opacity=".6"/>
|
||||
<circle cx="12" cy="12" r="11" fill="#1565C0"/>
|
||||
<path d="m12.7 19.1c-3.6 0.4-6.7-2.5-6.7-6.1v-8h4v7.9c0 0.8 0.5 1.6 1.3 1.9 1.4 0.4 2.7-0.5 2.7-1.8v-8h4v7.8c0 3.1-2.2 5.9-5.3 6.3z" fill="#FFF"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 446 B After Width: | Height: | Size: 361 B |
@@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
|
||||
<g stroke-width=".75">
|
||||
<circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
|
||||
<circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
|
||||
<path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#fff"/>
|
||||
<svg viewBox="0 0 18 18" width="14" height="14" xmlns="http://www.w3.org/2000/svg">
|
||||
<g>
|
||||
<circle cx="9" cy="9" r="9" fill="#FFF" opacity=".6"/>
|
||||
<circle cx="9" cy="9" r="8" fill="#1565C0"/>
|
||||
<path d="m5 4h3v6c0 0.57157 0.42843 1 1 1s1-0.42843 1-1v-6h3v6c0 2.2284-1.7716 4-4 4-2.2284 0-4-1.7716-4-4v-6z" fill="#FFF"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 334 B |
@@ -1 +0,0 @@
|
||||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.70796435.16441116 2.91781369 1.20859801c.45330196.18776383.81344906.54791086 1.00121276 1.00121279l1.208598 2.91781371c.1877638.45330195.1877638.96262671 0 1.41592868l-1.208598 2.91781367c-.1877637.45330198-.5479108.81344908-1.00121276 1.00121278l-2.91781371 1.208598c-.45330195.1877638-.96262671.1877638-1.41592868 0l-2.91781367-1.208598c-.45330195-.1877637-.81344898-.5479108-1.00121281-1.00121276l-1.20859801-2.91781369c-.18776381-.45330196-.18776381-.96262674 0-1.4159287l1.20859801-2.91781369c.18776382-.45330196.54791083-.81344897 1.00121279-1.00121279l2.91781369-1.20859801c.45330196-.18776381.96262674-.18776381 1.4159287 0z" fill="#f5eada" fill-opacity=".5"/><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB |
@@ -97,8 +97,8 @@ amenity-recycling-centre # area z15- (also has icon z
|
||||
amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-)
|
||||
amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-)
|
||||
emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-)
|
||||
highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-)
|
||||
highway-pedestrian-square # area z14- (also has line z13-, pathtext z14-)
|
||||
highway-rest_area # area z13- (also has icon z14-, caption(optional) z15-)
|
||||
highway-services # area z13- (also has icon z14-, caption(optional) z14-)
|
||||
landuse-garages # area z13- (also has caption z15-)
|
||||
@@ -111,7 +111,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
|
||||
|
||||
|
||||
@@ -47,10 +47,10 @@ power-line::dash # line::dash z13- (also has
|
||||
power-minor_line::dash # line::dash z15- (also has line z15-)
|
||||
=== 340
|
||||
|
||||
highway-ladder # line z12- (also has line::border z15-, icon z16-, pathtext z17-)
|
||||
highway-steps # line z12- (also has line::border z15-, pathtext z13-)
|
||||
highway-steps-bridge # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-steps-tunnel # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
|
||||
highway-ladder # line z12- (also has icon z16-, pathtext z17-)
|
||||
highway-steps # line z12- (also has pathtext z13-)
|
||||
highway-steps-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-steps-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
|
||||
hwtag-oneway::arrows # line::arrows z15-
|
||||
waterway-weir # line z14- (also has pathtext z15-)
|
||||
=== 330
|
||||
@@ -75,23 +75,23 @@ railway-tram-bridge # line z13-
|
||||
railway-tram-tunnel # line z13-
|
||||
=== 320
|
||||
|
||||
highway-motorway # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk # line z6- (also has line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge # line z6- (also has line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel # line z6- (also has line::border z8-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway # line z6- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk # line z6- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-world_level # line z4-9
|
||||
highway-world_towns_level # line z6-9
|
||||
=== 310
|
||||
|
||||
# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z8-, pathtext z10-, shield::shield z10-)
|
||||
# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
# === 309
|
||||
|
||||
highway-primary # line z8- (also has line::border z10-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-bridge # line z8- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-tunnel # line z8- (also has line::border z10-, line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary # line z8- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-primary-bridge # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary-tunnel # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
railway-rail-branch::dash # line::dash z15- (also has line z10-)
|
||||
railway-rail-branch-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
railway-rail-branch-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-)
|
||||
@@ -106,7 +106,7 @@ railway-rail-tourism-bridge::dash # line::dash z15- (also has
|
||||
railway-rail-tourism-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-)
|
||||
=== 290
|
||||
|
||||
# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z10-, pathtext z10-, shield::shield z10-)
|
||||
# highway-primary-tunnel # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
|
||||
# === 289
|
||||
|
||||
railway-rail-branch # line z10- (also has line::dash z15-)
|
||||
@@ -129,88 +129,88 @@ railway-rail-tourism-tunnel # line z10- (also has line::
|
||||
# railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-)
|
||||
# === 279
|
||||
|
||||
highway-secondary # line z10- (also has line::border z10-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-tunnel # line z10- (also has line::border z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary # line z10- (also has pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary-tunnel # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
=== 270
|
||||
|
||||
# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z12-)
|
||||
# highway-secondary-tunnel # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
|
||||
# === 269
|
||||
|
||||
highway-tertiary # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-tunnel # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-unclassified # line z11- (also has line::border z13-, pathtext z13-)
|
||||
highway-unclassified-area # line z11- (also has line::border z13-, pathtext z13-)
|
||||
highway-unclassified-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
highway-unclassified-tunnel # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
|
||||
highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-unclassified # line z11- (also has pathtext z13-)
|
||||
highway-unclassified-area # line z11- (also has pathtext z13-)
|
||||
highway-unclassified-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-)
|
||||
=== 250
|
||||
|
||||
# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
|
||||
# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
|
||||
# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
|
||||
# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-)
|
||||
# === 249
|
||||
|
||||
highway-living_street # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street-bridge # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
|
||||
highway-residential # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-bridge # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-tunnel # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-road-bridge # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-road-tunnel # line z12- (also has line::border z14-, pathtext z14-)
|
||||
highway-living_street # line z12- (also has pathtext z14-)
|
||||
highway-living_street-bridge # line z12- (also has pathtext z14-)
|
||||
highway-living_street-tunnel # line z12- (also has line(casing) z16-, pathtext z14-)
|
||||
highway-residential # line z12- (also has pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-)
|
||||
highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road # line z12- (also has pathtext z14-)
|
||||
highway-road-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-road-tunnel # line z12- (also has pathtext z14-)
|
||||
=== 230
|
||||
|
||||
# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
|
||||
# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
|
||||
# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-)
|
||||
# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
# === 229
|
||||
|
||||
highway-motorway_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link # line z10- (also has line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel # line z10- (also has line::border z11-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link # line z10- (also has pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 228
|
||||
|
||||
# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z10-)
|
||||
# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
# === 227
|
||||
|
||||
highway-primary_link # line z11- (also has line::border z13-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-bridge # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-tunnel # line z11- (also has line::border z13-, line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link # line z11- (also has pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 226
|
||||
|
||||
# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z13-, pathtext z11-, shield::shield z11-)
|
||||
# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
|
||||
# === 225
|
||||
|
||||
highway-secondary_link # line z13- (also has line::border z13-, pathtext z16-)
|
||||
highway-secondary_link-bridge # line z13- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-secondary_link-tunnel # line z13- (also has line::border z13-, line(casing) z16-, pathtext z16-)
|
||||
highway-secondary_link # line z13- (also has pathtext z16-)
|
||||
highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-secondary_link-tunnel # line z13- (also has line(casing) z16-, pathtext z16-)
|
||||
=== 224
|
||||
|
||||
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z13-, pathtext z16-)
|
||||
highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-)
|
||||
highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
|
||||
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-)
|
||||
highway-tertiary_link # line z14- (also has pathtext z18-)
|
||||
highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-)
|
||||
=== 223
|
||||
|
||||
highway-busway # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
|
||||
highway-service # line z13- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-area # line z13- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-bridge # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-)
|
||||
highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-)
|
||||
highway-service-tunnel # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-)
|
||||
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
|
||||
highway-busway # line z15- (also has pathtext z16-)
|
||||
highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-)
|
||||
highway-service # line z13- (also has pathtext z16-)
|
||||
highway-service-area # line z13- (also has pathtext z16-)
|
||||
highway-service-bridge # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-service-driveway # line z16- (also has pathtext z16-)
|
||||
highway-service-parking_aisle # line z15- (also has pathtext z16-)
|
||||
highway-service-tunnel # line z13- (also has line(casing) z15-, pathtext z16-)
|
||||
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
|
||||
=== 222
|
||||
|
||||
# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
|
||||
# highway-service-tunnel # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-)
|
||||
# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-)
|
||||
# highway-service-tunnel # line(casing) z15- (also has line z13-, pathtext z16-)
|
||||
railway-light_rail::dash # line::dash z16- (also has line z13-)
|
||||
railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
railway-rail::dash # line::dash z15- (also has line z10-)
|
||||
@@ -229,11 +229,11 @@ railway-subway::dash # line::dash z16- (also has
|
||||
railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
|
||||
=== 221
|
||||
|
||||
highway-footway-bicycle # line z11- (also has line::border z15-, line::cycleline z13-, pathtext z13-)
|
||||
highway-footway-bicycle # line z11- (also has line::cycleline z13-, pathtext z13-)
|
||||
highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-)
|
||||
=== 220
|
||||
|
||||
highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, line::border z15-, pathtext z13-)
|
||||
highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-)
|
||||
highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-)
|
||||
=== 219
|
||||
|
||||
@@ -266,23 +266,23 @@ railway-subway-bridge # line z13- (also has line::
|
||||
# railway-rail-utility-tunnel # line(casing) z14- (also has line z12-, line::dash z16-)
|
||||
# === 209
|
||||
|
||||
highway-ford # line z13- (also has line::border z14-, icon z14-, pathtext z16-)
|
||||
highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-)
|
||||
highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
|
||||
highway-ford # line z13- (also has icon z14-, pathtext z16-)
|
||||
highway-pedestrian # line z13- (also has pathtext z14-)
|
||||
highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-)
|
||||
highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-pedestrian-square # line z13- and area z14- (also has pathtext z14-)
|
||||
highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-)
|
||||
=== 200
|
||||
|
||||
# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
|
||||
# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-)
|
||||
# === 199
|
||||
|
||||
highway-bridleway # line z11- (also has pathtext z13-)
|
||||
highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
|
||||
highway-footway # line z11- (also has line::border z15-, pathtext z13-)
|
||||
highway-footway-area # line z11- and area z14- (also has line::border z15-, pathtext z13-)
|
||||
highway-footway-crossing # line z16- (also has line::border z16-)
|
||||
highway-footway # line z11- (also has pathtext z13-)
|
||||
highway-footway-area # line z11- and area z14- (also has pathtext z13-)
|
||||
highway-footway-crossing # line z16-
|
||||
highway-path # line z11- (also has pathtext z13-)
|
||||
highway-path-difficult # line z11- (also has pathtext z13-)
|
||||
highway-path-expert # line z11- (also has pathtext z13-)
|
||||
@@ -292,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 z8- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk::border # line::border z8- (also has line z6-, pathtext z10-, shield::shield z10-)
|
||||
=== 163
|
||||
|
||||
highway-primary::border # line::border z10- (also has line z8-, pathtext z10-, shield::shield z10-)
|
||||
=== 162
|
||||
|
||||
highway-secondary::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-)
|
||||
=== 161
|
||||
|
||||
highway-motorway_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z10-)
|
||||
=== 160
|
||||
|
||||
highway-primary_link::border # line::border z13- (also has line z11-, pathtext z11-, shield::shield z11-)
|
||||
=== 159
|
||||
|
||||
highway-secondary_link::border # line::border z13- (also has line z13-, pathtext z16-)
|
||||
=== 158
|
||||
|
||||
highway-motorway-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-bridge::border # line::border z8- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 157
|
||||
|
||||
highway-primary-bridge::border # line::border z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 156
|
||||
|
||||
highway-secondary-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
=== 155
|
||||
|
||||
highway-motorway_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 154
|
||||
|
||||
highway-primary_link-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 153
|
||||
|
||||
highway-secondary_link-bridge::border # line::border z13- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
|
||||
=== 152
|
||||
|
||||
highway-motorway-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk-tunnel::border # line::border z8- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
|
||||
=== 151
|
||||
|
||||
highway-primary-tunnel::border # line::border z10- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
|
||||
=== 150
|
||||
|
||||
highway-secondary-tunnel::border # line::border z10- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
|
||||
=== 149
|
||||
|
||||
highway-motorway_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-tunnel::border # line::border z11- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
|
||||
=== 148
|
||||
|
||||
highway-primary_link-tunnel::border # line::border z13- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
|
||||
=== 147
|
||||
|
||||
highway-secondary_link-tunnel::border # line::border z13- (also has line z13-, line(casing) z16-, pathtext z16-)
|
||||
=== 146
|
||||
|
||||
highway-busway::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
|
||||
highway-road::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-service::border # line::border z15- (also has line z13-, pathtext z16-)
|
||||
highway-service-area::border # line::border z15- (also has line z13-, pathtext z16-)
|
||||
highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-)
|
||||
highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-)
|
||||
highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-)
|
||||
highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-)
|
||||
highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-)
|
||||
=== 145
|
||||
|
||||
highway-footway::border # line::border z15- (also has line z11-, pathtext z13-)
|
||||
highway-footway-area::border # line::border z15- (also has line z11-, area z14-, pathtext z13-)
|
||||
highway-footway-bicycle::border # line::border z15- (also has line z11-, line::cycleline z13-, pathtext z13-)
|
||||
highway-footway-crossing::border # line::border z16- (also has line z16-)
|
||||
highway-footway-sidewalk::border # line::border z16- (also has line z13-)
|
||||
highway-ford::border # line::border z14- (also has line z13-, icon z14-, pathtext z16-)
|
||||
highway-ladder::border # line::border z15- (also has line z12-, icon z16-, pathtext z17-)
|
||||
highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-)
|
||||
highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-)
|
||||
highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-)
|
||||
highway-steps::border # line::border z15- (also has line z12-, pathtext z13-)
|
||||
=== 144
|
||||
|
||||
highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-service-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
|
||||
=== 143
|
||||
|
||||
highway-footway-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-steps-bridge::border # line::border z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
|
||||
=== 142
|
||||
|
||||
highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
|
||||
highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
|
||||
highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-)
|
||||
highway-service-tunnel::border # line::border z15- (also has line z13-, line(casing) z15-, pathtext z16-)
|
||||
highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
|
||||
highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
|
||||
=== 141
|
||||
|
||||
highway-footway-tunnel::border # line::border z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
|
||||
highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
|
||||
highway-steps-tunnel::border # line::border z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
|
||||
=== 140
|
||||
|
||||
highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
|
||||
highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z13-, line::bridgeblack z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
|
||||
highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
|
||||
highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
|
||||
highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
|
||||
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z8-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
|
||||
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-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
|
||||
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
|
||||
railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
|
||||
@@ -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 z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z13-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
|
||||
highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
|
||||
highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
|
||||
highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
|
||||
highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
|
||||
highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
|
||||
highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
|
||||
highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
|
||||
highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
|
||||
highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
|
||||
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z8-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
|
||||
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
|
||||
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
|
||||
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-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
|
||||
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
|
||||
railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
|
||||
@@ -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-)
|
||||
|
||||
@@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio
|
||||
railway-station # icon z12- (also has caption(optional) z12-)
|
||||
=== 6800
|
||||
|
||||
highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
|
||||
highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-)
|
||||
highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-)
|
||||
highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
|
||||
highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-)
|
||||
highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
|
||||
=== 6750
|
||||
|
||||
highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
|
||||
highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-)
|
||||
highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z8-, line(casing) z12-)
|
||||
highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-)
|
||||
highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
|
||||
highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-)
|
||||
highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
|
||||
highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
|
||||
=== 6740
|
||||
|
||||
boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16)
|
||||
@@ -259,31 +259,31 @@ railway-station-subway-yerevan # icon z13- (also has captio
|
||||
railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-)
|
||||
=== 6250
|
||||
|
||||
highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-)
|
||||
highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z10-, line(casing) z14-)
|
||||
highway-primary # pathtext z10- (also has shield::shield z10-, line z8-)
|
||||
highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
|
||||
route-ferry # pathtext z10- (also has line z7-)
|
||||
=== 6200
|
||||
|
||||
highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
|
||||
highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-)
|
||||
highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-)
|
||||
highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
|
||||
highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-)
|
||||
highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
|
||||
=== 6150
|
||||
|
||||
highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
|
||||
highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-)
|
||||
highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z13-)
|
||||
highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-)
|
||||
highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
|
||||
highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-)
|
||||
highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
|
||||
=== 6140
|
||||
|
||||
highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-)
|
||||
highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z13-, line(casing) z14-)
|
||||
highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-)
|
||||
highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
|
||||
=== 6100
|
||||
|
||||
barrier-border_control # icon z12- (also has caption(optional) z14-)
|
||||
@@ -302,9 +302,9 @@ place-locality # caption z13-
|
||||
place-neighbourhood # caption z13-
|
||||
=== 5700
|
||||
|
||||
highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-)
|
||||
highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z10-, line(casing) z16-)
|
||||
highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-)
|
||||
highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
|
||||
=== 5600
|
||||
|
||||
man_made-communications_tower # icon z12- (also has caption(optional) z13-)
|
||||
@@ -581,14 +581,14 @@ shop-supermarket # icon z16- (also has captio
|
||||
=== 3200
|
||||
|
||||
area:highway-pedestrian # caption z15- (also has area z14-)
|
||||
highway-pedestrian # pathtext z14- (also has line z13-, line::border z14-)
|
||||
highway-pedestrian-area # pathtext z14- (also has line z13-, line::border z14-, area z14-)
|
||||
highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
|
||||
highway-pedestrian-square # pathtext z14- (also has line z13-, line::border z14-, area z14-)
|
||||
highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
|
||||
highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
|
||||
highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
|
||||
highway-pedestrian # pathtext z14- (also has line z13-)
|
||||
highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-)
|
||||
highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
|
||||
highway-pedestrian-square # pathtext z14- (also has line z13-, area z14-)
|
||||
highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-)
|
||||
highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-)
|
||||
highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
|
||||
natural-strait # caption z13- (also has line z11-)
|
||||
natural-water # caption z10- (also has area z1-)
|
||||
natural-water-pond # caption z10- (also has area z1-)
|
||||
@@ -600,10 +600,10 @@ waterway-dam # pathtext z15- (also has li
|
||||
waterway-river # pathtext z11- (also has line z10-)
|
||||
=== 3150
|
||||
|
||||
highway-unclassified # pathtext z13- (also has line z11-, line::border z13-)
|
||||
highway-unclassified-area # pathtext z13- (also has line z11-, line::border z13-)
|
||||
highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
|
||||
highway-unclassified # pathtext z13- (also has line z11-)
|
||||
highway-unclassified-area # pathtext z13- (also has line z11-)
|
||||
highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-)
|
||||
=== 3100
|
||||
|
||||
amenity-water_point # icon z12- (also has caption(optional) z14-)
|
||||
@@ -635,46 +635,46 @@ aerialway-mixed_lift # pathtext z15- (also has li
|
||||
aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-)
|
||||
highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
|
||||
highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
|
||||
highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-road # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
|
||||
highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-secondary_link # pathtext z16- (also has line z13-, line::border z13-)
|
||||
highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z13-, line(casing) z16-)
|
||||
highway-residential # pathtext z13- (also has shield::shield z15-, line z12-)
|
||||
highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-)
|
||||
highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
|
||||
highway-road # pathtext z14- (also has line z12-)
|
||||
highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
|
||||
highway-road-tunnel # pathtext z14- (also has line z12-)
|
||||
highway-secondary_link # pathtext z16- (also has line z13-)
|
||||
highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-)
|
||||
=== 3000
|
||||
|
||||
highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-)
|
||||
highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z10-, line(casing) z14-)
|
||||
highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-)
|
||||
highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
|
||||
=== 2975
|
||||
|
||||
highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-)
|
||||
highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z13-, line(casing) z14-)
|
||||
highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-)
|
||||
highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
|
||||
=== 2970
|
||||
|
||||
highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-)
|
||||
highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z16-)
|
||||
highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-)
|
||||
highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
|
||||
=== 2965
|
||||
|
||||
highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
|
||||
highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
|
||||
highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-)
|
||||
highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
|
||||
=== 2960
|
||||
|
||||
barrier-city_wall # pathtext z16- (also has line z14-)
|
||||
historic-citywalls # pathtext z16- (also has line z14-)
|
||||
=== 2957
|
||||
|
||||
highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
|
||||
highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
|
||||
highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-)
|
||||
highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-)
|
||||
highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
|
||||
=== 2955
|
||||
|
||||
highway-cycleway # pathtext z13- (also has line z11-)
|
||||
@@ -683,14 +683,14 @@ highway-cycleway-tunnel # pathtext z13- (also has li
|
||||
=== 2953
|
||||
|
||||
area:highway-footway # caption z15- (also has area z14-)
|
||||
highway-footway # pathtext z13- (also has line z11-, line::border z15-)
|
||||
highway-footway-area # pathtext z13- (also has line z11-, line::border z15-, area z14-)
|
||||
highway-footway-bicycle # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
|
||||
highway-footway-bridge # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-footway-tunnel # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-)
|
||||
highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
|
||||
highway-footway # pathtext z13- (also has line z11-)
|
||||
highway-footway-area # pathtext z13- (also has line z11-, area z14-)
|
||||
highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-)
|
||||
highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-tertiary_link # pathtext z18- (also has line z14-)
|
||||
highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
|
||||
highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-)
|
||||
=== 2950
|
||||
|
||||
natural-water-basin # caption z10- (also has area z1-)
|
||||
@@ -707,7 +707,7 @@ waterway-stream-intermittent # pathtext z13- (also has li
|
||||
waterway-weir # pathtext z15- (also has line z14-)
|
||||
=== 2900
|
||||
|
||||
highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-)
|
||||
highway-ford # icon z14- and pathtext z16- (also has line z13-)
|
||||
natural-rock # icon z14- (also has caption(optional) z17-)
|
||||
=== 2850
|
||||
|
||||
@@ -723,9 +723,9 @@ highway-path-horse # pathtext z13- (also has li
|
||||
highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2820
|
||||
|
||||
highway-steps # pathtext z13- (also has line z12-, line::border z15-)
|
||||
highway-steps-bridge # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-steps-tunnel # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
highway-steps # pathtext z13- (also has line z12-)
|
||||
highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
|
||||
highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2810
|
||||
|
||||
highway-track # pathtext z13- (also has line z11-)
|
||||
@@ -735,12 +735,12 @@ highway-track-no-access # pathtext z13- (also has li
|
||||
highway-track-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
|
||||
=== 2780
|
||||
|
||||
highway-service # pathtext z16- (also has line z13-, line::border z15-)
|
||||
highway-service-area # pathtext z16- (also has line z13-, line::border z15-)
|
||||
highway-service-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-service-driveway # pathtext z16- (also has line z16-, line::border z16-)
|
||||
highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-service-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
|
||||
highway-service # pathtext z16- (also has line z13-)
|
||||
highway-service-area # pathtext z16- (also has line z13-)
|
||||
highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-service-driveway # pathtext z16- (also has line z16-)
|
||||
highway-service-parking_aisle # pathtext z16- (also has line z15-)
|
||||
highway-service-tunnel # pathtext z16- (also has line z13-, line(casing) z15-)
|
||||
piste:type-downhill # pathtext z15- (also has line z12-)
|
||||
piste:type-downhill-advanced # pathtext z15- (also has line z12-)
|
||||
piste:type-downhill-easy # pathtext z15- (also has line z12-)
|
||||
@@ -823,9 +823,9 @@ attraction-historic # icon z17- (also has captio
|
||||
attraction-maze # icon z17- (also has caption(optional) z17-)
|
||||
attraction-roller_coaster # icon z17- (also has caption(optional) z17-)
|
||||
highway-construction # pathtext z15- (also has line z11-)
|
||||
highway-living_street # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z14-)
|
||||
highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
|
||||
highway-living_street # pathtext z14- (also has line z12-)
|
||||
highway-living_street-bridge # pathtext z14- (also has line z12-)
|
||||
highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-)
|
||||
landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-)
|
||||
leisure-bowling_alley # icon z17- (also has caption(optional) z17-)
|
||||
leisure-garden # icon z16- (also has caption(optional) z16-, area z12-)
|
||||
@@ -892,9 +892,9 @@ barrier-yes # icon z16- (also has captio
|
||||
leisure-dog_park # icon z16- (also has caption(optional) z16-, area z15-)
|
||||
=== 2300
|
||||
|
||||
highway-busway # pathtext z16- (also has line z15-, line::border z15-)
|
||||
highway-busway-bridge # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-busway-tunnel # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
|
||||
highway-busway # pathtext z16- (also has line z15-)
|
||||
highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
|
||||
highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-)
|
||||
=== 2250
|
||||
|
||||
amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-)
|
||||
@@ -1163,7 +1163,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-)
|
||||
@@ -2442,7 +2442,7 @@ emergency-life_ring # icon z19- (also has captio
|
||||
power-substation # icon z17- (also has caption(optional) z18-, area z13-)
|
||||
=== -9990
|
||||
|
||||
natural-tree # icon z18- (also has caption(optional) z18-)
|
||||
natural-tree # icon z18-
|
||||
=== -9991
|
||||
|
||||
# amenity-bench # caption(optional) z19- (also has icon z18-)
|
||||
@@ -2480,7 +2480,6 @@ entrance-service # icon z19- (also has captio
|
||||
# man_made-survey_point # caption(optional) z15- (also has icon z14-)
|
||||
# man_made-telescope # caption(optional) z18- (also has icon z18-)
|
||||
# man_made-telescope-optical # caption(optional) z17- (also has icon z17-)
|
||||
# natural-tree # caption(optional) z18- (also has icon z18-)
|
||||
# power-substation # caption(optional) z18- (also has icon z17-, area z13-)
|
||||
# tourism-information # caption(optional) z15- (also has icon z15-)
|
||||
# tourism-information-board # caption(optional) z15- (also has icon z15-)
|
||||
|
||||
@@ -57,8 +57,6 @@ TagMapping const kMotorCarTagMapping = {
|
||||
{OsmElement::Tag("motorcar", "private"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("motorcar", "destination"), RoadAccess::Type::Destination},
|
||||
{OsmElement::Tag("motorcar", "permit"), RoadAccess::Type::Permit},
|
||||
{OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Destination},
|
||||
{OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Destination},
|
||||
};
|
||||
|
||||
TagMapping const kMotorVehicleTagMapping = {
|
||||
@@ -79,6 +77,8 @@ TagMapping const kVehicleTagMapping = {
|
||||
{OsmElement::Tag("vehicle", "private"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("vehicle", "destination"), RoadAccess::Type::Destination},
|
||||
{OsmElement::Tag("vehicle", "permit"), RoadAccess::Type::Permit},
|
||||
{OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
|
||||
};
|
||||
|
||||
TagMapping const kCarBarriersTagMapping = {
|
||||
@@ -136,6 +136,8 @@ TagMapping const kDefaultTagMapping = {
|
||||
{OsmElement::Tag("access", "agricultural"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("access", "forestry"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("locked", "yes"), RoadAccess::Type::Locked},
|
||||
{OsmElement::Tag("service", "parking_aisle"), RoadAccess::Type::Private},
|
||||
{OsmElement::Tag("amenity", "parking_entrance"), RoadAccess::Type::Private},
|
||||
};
|
||||
|
||||
// Removed secondary, tertiary from car list. Example https://www.openstreetmap.org/node/8169922700
|
||||
|
||||
@@ -59,7 +59,6 @@ NS_SWIFT_NAME(FrameworkHelper)
|
||||
+ (void)updatePlacePageData;
|
||||
+ (void)updateAfterDeleteBookmark;
|
||||
+ (int)currentZoomLevel;
|
||||
+ (void)setCarScreenMode:(BOOL)enabled;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -241,8 +241,4 @@
|
||||
return [[ElevationProfileData alloc] initWithElevationInfo:GetFramework().GetTrackRecordingElevationInfo()];
|
||||
}
|
||||
|
||||
+ (void)setCarScreenMode:(BOOL)enabled {
|
||||
GetFramework().SetCarScreenMode(enabled);
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -186,7 +186,7 @@ import AVFoundation
|
||||
return mapAppearance
|
||||
}
|
||||
|
||||
return .light
|
||||
return .auto
|
||||
}
|
||||
set {
|
||||
UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapAppearance)
|
||||
|
||||
@@ -120,11 +120,13 @@ static std::pair<UniString, UniString> const kPreprocessReplacements[] = {
|
||||
{MakeUniString("ι.μ"), MakeUniString("ιερά μονή")},
|
||||
{MakeUniString("ι.ν"), MakeUniString("ιερός ναός")},
|
||||
{MakeUniString("κων/νου"), MakeUniString("κωνσταντίνου")},
|
||||
{MakeUniString("б-р"), MakeUniString("бульвар")},
|
||||
{MakeUniString("д-р"), MakeUniString("доктор")},
|
||||
{MakeUniString("м-н"), MakeUniString("микрорайон")},
|
||||
{MakeUniString("наб-я"), MakeUniString("набережная")},
|
||||
{MakeUniString("пр-д"), MakeUniString("проезд")},
|
||||
{MakeUniString("пр-т"), MakeUniString("проспект")},
|
||||
{MakeUniString("р-н"), MakeUniString("район")},
|
||||
{MakeUniString("আ/এ"), MakeUniString("আবাসিক এলাকা")},
|
||||
};
|
||||
|
||||
|
||||
@@ -175,16 +175,6 @@ void Framework::OnLocationUpdate(GpsInfo const & info)
|
||||
#endif
|
||||
|
||||
m_routingManager.OnLocationUpdate(rInfo);
|
||||
|
||||
bool const isRoutingActive = m_routingManager.IsRoutingActive();
|
||||
|
||||
if (m_wasRoutingActive != isRoutingActive)
|
||||
{
|
||||
m_wasRoutingActive = isRoutingActive;
|
||||
|
||||
/// State changed (Started OR Stopped) -> Refresh 3D Buildings
|
||||
Refresh3dMode();
|
||||
}
|
||||
}
|
||||
|
||||
void Framework::OnCompassUpdate(CompassInfo const & info)
|
||||
@@ -2434,10 +2424,6 @@ void Framework::Allow3dMode(bool allow3d, bool allow3dBuildings)
|
||||
if (!m_powerManager.IsFacilityEnabled(power_management::Facility::Buildings3d))
|
||||
allow3dBuildings = false;
|
||||
|
||||
/// If we are in CarPlay/AA mode and Navigation is active, force 3D buildings off.
|
||||
if (m_isCarScreenMode && m_routingManager.IsRoutingActive())
|
||||
allow3dBuildings = false;
|
||||
|
||||
m_drapeEngine->Allow3dMode(allow3d, allow3dBuildings);
|
||||
}
|
||||
|
||||
@@ -3238,7 +3224,6 @@ void Framework::OnRouteFollow(routing::RouterType type)
|
||||
// GetRoutingSettings(type).m_matchRoute to the FollowRoute() instead of |isPedestrianRoute|.
|
||||
// |isArrowGlued| parameter fully corresponds to |m_matchRoute| in RoutingSettings.
|
||||
m_drapeEngine->FollowRoute(scale, scale3d, enableAutoZoom, !isPedestrianRoute /* isArrowGlued */);
|
||||
Refresh3dMode();
|
||||
}
|
||||
|
||||
// RoutingManager::Delegate
|
||||
@@ -3307,25 +3292,3 @@ void Framework::OnPowerSchemeChanged(power_management::Scheme const actualScheme
|
||||
if (actualScheme == power_management::Scheme::EconomyMaximum && GetTrafficManager().IsEnabled())
|
||||
GetTrafficManager().SetEnabled(false);
|
||||
}
|
||||
|
||||
void Framework::SetCarScreenMode(bool enabled)
|
||||
{
|
||||
if (m_isCarScreenMode == enabled)
|
||||
return;
|
||||
|
||||
m_isCarScreenMode = enabled;
|
||||
|
||||
bool allow3d, allow3dBuildings;
|
||||
Load3dMode(allow3d, allow3dBuildings);
|
||||
Allow3dMode(allow3d, allow3dBuildings);
|
||||
}
|
||||
|
||||
void Framework::Refresh3dMode()
|
||||
{
|
||||
bool allow3d = true;
|
||||
bool allow3dBuildings = true;
|
||||
|
||||
/// Load User Preferences and apply logic
|
||||
Load3dMode(allow3d, allow3dBuildings);
|
||||
Allow3dMode(allow3d, allow3dBuildings);
|
||||
}
|
||||
|
||||
@@ -769,13 +769,4 @@ public:
|
||||
// PowerManager::Subscriber override.
|
||||
void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override;
|
||||
void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override;
|
||||
|
||||
public:
|
||||
/// Call this from iOS/Android when CarPlay/AA session starts/ends
|
||||
void SetCarScreenMode(bool enabled);
|
||||
bool m_isCarScreenMode = false;
|
||||
|
||||
private:
|
||||
void Refresh3dMode();
|
||||
bool m_wasRoutingActive = false;
|
||||
};
|
||||
|
||||
@@ -458,7 +458,7 @@ private:
|
||||
positionsAccessConditional.clear();
|
||||
|
||||
auto openingHoursDeserializer = GetOpeningHoursSerDesForRouting();
|
||||
auto const size = ReadPrimitiveFromSource<uint64_t>(src);
|
||||
auto const size = ReadPrimitiveFromSource<size_t>(src);
|
||||
|
||||
positionsAccessConditional.reserve(size);
|
||||
uint32_t prevFeatureId = 0;
|
||||
|
||||