diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java index 5ade7fda6..6e2246d32 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java @@ -8,7 +8,7 @@ import androidx.annotation.UiThread; import androidx.car.app.CarContext; import app.organicmaps.R; -import app.organicmaps.sdk.MapStyle; +import app.organicmaps.sdk.MapAppearance; import app.organicmaps.sdk.routing.RoutingController; import app.organicmaps.sdk.util.Config; @@ -60,14 +60,14 @@ public static void update(@NonNull CarContext context, @NonNull ThemeMode oldThe final ThemeMode newThemeMode = oldThemeMode == ThemeMode.AUTO ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode; - MapStyle newMapStyle; + MapAppearance newMapAppearance; if (newThemeMode == ThemeMode.NIGHT) - newMapStyle = RoutingController.get().isVehicleNavigation() ? MapStyle.VehicleDark : MapStyle.Dark; + newMapAppearance = MapAppearance.Dark; else - newMapStyle = RoutingController.get().isVehicleNavigation() ? MapStyle.VehicleClear : MapStyle.Clear; + newMapAppearance = MapAppearance.Light; - if (MapStyle.get() != newMapStyle) - MapStyle.set(newMapStyle); + if (MapAppearance.get() != newMapAppearance) + MapAppearance.set(newMapAppearance); } public static boolean isNightMode(@NonNull CarContext context) diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java index 5a6a3dbbf..7994f09de 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java @@ -10,7 +10,7 @@ import app.organicmaps.MwmApplication; import app.organicmaps.downloader.DownloaderStatusIcon; import app.organicmaps.sdk.Framework; -import app.organicmaps.sdk.MapStyle; +import app.organicmaps.sdk.MapAppearance; import app.organicmaps.sdk.routing.RoutingController; import app.organicmaps.sdk.util.Config; import app.organicmaps.sdk.util.concurrency.UiThread; @@ -43,7 +43,7 @@ public void run() theme = Config.UiTheme.DEFAULT; } - setThemeAndMapStyle(theme); + setTheme(theme); } }; @@ -59,7 +59,7 @@ public void initialize(@NonNull Context context) /** * Changes the UI theme of application and the map style if necessary. If the contract regarding * the input parameter is broken, the UI will be frozen during attempting to change the map style - * through the synchronous method {@link MapStyle#set(MapStyle)}. + * through the synchronous method {@link MapAppearance#set(MapAppearance)}. * * @param isRendererActive Indicates whether OpenGL renderer is active or not. Must be * true only if the map is rendered and visible on the screen @@ -77,27 +77,22 @@ public void restart(boolean isRendererActive) } UiThread.cancelDelayedTasks(mAutoThemeChecker); - setThemeAndMapStyle(theme); + setTheme(theme); } - private void setThemeAndMapStyle(@NonNull String theme) + private void setTheme(@NonNull String theme) { UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE); String oldTheme = Config.UiTheme.getCurrent(); - MapStyle style; + MapAppearance mapAppearance; if (Config.UiTheme.isNight(theme)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES); AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); - if (RoutingController.get().isVehicleNavigation()) - style = MapStyle.VehicleDark; - else if (Framework.nativeIsOutdoorsLayerEnabled()) - style = MapStyle.OutdoorsDark; - else - style = MapStyle.Dark; + mapAppearance = MapAppearance.Dark; } else { @@ -105,14 +100,11 @@ else if (Framework.nativeIsOutdoorsLayerEnabled()) uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO); AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); - if (RoutingController.get().isVehicleNavigation()) - style = MapStyle.VehicleClear; - else if (Framework.nativeIsOutdoorsLayerEnabled()) - style = MapStyle.OutdoorsClear; - else - style = MapStyle.Clear; + mapAppearance = MapAppearance.Light; } + Framework.nativeSwitchToUsingVehicleStyle(RoutingController.get().isVehicleNavigation()); + if (!theme.equals(oldTheme)) { Config.UiTheme.setCurrent(theme); @@ -125,25 +117,21 @@ else if (Framework.nativeIsOutdoorsLayerEnabled()) else { // If the UI theme is not changed we just need to change the map style if needed. - final MapStyle currentStyle = MapStyle.get(); - if (currentStyle == style) + final MapAppearance currentMapAppearance = MapAppearance.get(); + if (currentMapAppearance == mapAppearance) return; - SetMapStyle(style); + SetMapAppearance(mapAppearance); } } - private void SetMapStyle(MapStyle style) + private void SetMapAppearance(MapAppearance mapAppearance) { // Because of the distinct behavior in auto theme, Android Auto employs its own mechanism for theme switching. // For the Android Auto theme switcher, please consult the app.organicmaps.car.util.ThemeUtils module. if (MwmApplication.from(mContext).getDisplayManager().isCarDisplayUsed()) return; - // If rendering is not active we can mark map style, because all graphics - // will be recreated after rendering activation. - if (mRendererActive) - MapStyle.set(style); - else - MapStyle.mark(style); + + MapAppearance.set(mapAppearance); } /** diff --git a/android/sdk/src/main/assets/drules_proto_cycling_dark.bin b/android/sdk/src/main/assets/drules_proto_cycling_dark.bin new file mode 120000 index 000000000..89db10bf4 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_cycling_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_cycling_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_cycling_light.bin b/android/sdk/src/main/assets/drules_proto_cycling_light.bin new file mode 120000 index 000000000..b21008d67 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_cycling_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_cycling_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_cycling_outdoor_dark.bin b/android/sdk/src/main/assets/drules_proto_cycling_outdoor_dark.bin new file mode 120000 index 000000000..21c1df399 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_cycling_outdoor_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_cycling_outdoor_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_cycling_outdoor_light.bin b/android/sdk/src/main/assets/drules_proto_cycling_outdoor_light.bin new file mode 120000 index 000000000..099380f33 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_cycling_outdoor_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_cycling_outdoor_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_default_dark.bin b/android/sdk/src/main/assets/drules_proto_default_dark.bin deleted file mode 120000 index 5865d4810..000000000 --- a/android/sdk/src/main/assets/drules_proto_default_dark.bin +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/drules_proto_default_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_default_light.bin b/android/sdk/src/main/assets/drules_proto_default_light.bin deleted file mode 120000 index 1abef951e..000000000 --- a/android/sdk/src/main/assets/drules_proto_default_light.bin +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/drules_proto_default_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_driving_dark.bin b/android/sdk/src/main/assets/drules_proto_driving_dark.bin new file mode 120000 index 000000000..98d3e6c54 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_driving_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_driving_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_driving_light.bin b/android/sdk/src/main/assets/drules_proto_driving_light.bin new file mode 120000 index 000000000..0a1e4d195 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_driving_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_driving_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_driving_outdoor_dark.bin b/android/sdk/src/main/assets/drules_proto_driving_outdoor_dark.bin new file mode 120000 index 000000000..74b28b444 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_driving_outdoor_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_driving_outdoor_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_driving_outdoor_light.bin b/android/sdk/src/main/assets/drules_proto_driving_outdoor_light.bin new file mode 120000 index 000000000..9742b47cb --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_driving_outdoor_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_driving_outdoor_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_outdoors_dark.bin b/android/sdk/src/main/assets/drules_proto_outdoors_dark.bin deleted file mode 120000 index 202ebadcc..000000000 --- a/android/sdk/src/main/assets/drules_proto_outdoors_dark.bin +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/drules_proto_outdoors_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_outdoors_light.bin b/android/sdk/src/main/assets/drules_proto_outdoors_light.bin deleted file mode 120000 index d0c2fde66..000000000 --- a/android/sdk/src/main/assets/drules_proto_outdoors_light.bin +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/drules_proto_outdoors_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_public-transport_dark.bin b/android/sdk/src/main/assets/drules_proto_public-transport_dark.bin new file mode 120000 index 000000000..003a4ea26 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_public-transport_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_public-transport_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_public-transport_light.bin b/android/sdk/src/main/assets/drules_proto_public-transport_light.bin new file mode 120000 index 000000000..c67a59bed --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_public-transport_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_public-transport_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_dark.bin b/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_dark.bin new file mode 120000 index 000000000..179d97403 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_public-transport_outdoor_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_light.bin b/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_light.bin new file mode 120000 index 000000000..b2c77ae11 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_public-transport_outdoor_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_public-transport_outdoor_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_walking_dark.bin b/android/sdk/src/main/assets/drules_proto_walking_dark.bin new file mode 120000 index 000000000..46b0c626b --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_walking_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_walking_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_walking_light.bin b/android/sdk/src/main/assets/drules_proto_walking_light.bin new file mode 120000 index 000000000..c00d30ad9 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_walking_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_walking_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_walking_outdoor_dark.bin b/android/sdk/src/main/assets/drules_proto_walking_outdoor_dark.bin new file mode 120000 index 000000000..bee3751d5 --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_walking_outdoor_dark.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_walking_outdoor_dark.bin \ No newline at end of file diff --git a/android/sdk/src/main/assets/drules_proto_walking_outdoor_light.bin b/android/sdk/src/main/assets/drules_proto_walking_outdoor_light.bin new file mode 120000 index 000000000..41a9a1abe --- /dev/null +++ b/android/sdk/src/main/assets/drules_proto_walking_outdoor_light.bin @@ -0,0 +1 @@ +../../../../../data/drules_proto_walking_outdoor_light.bin \ No newline at end of file diff --git a/android/sdk/src/main/cpp/CMakeLists.txt b/android/sdk/src/main/cpp/CMakeLists.txt index 426229441..e3367ebfa 100644 --- a/android/sdk/src/main/cpp/CMakeLists.txt +++ b/android/sdk/src/main/cpp/CMakeLists.txt @@ -37,7 +37,8 @@ set(SRC app/organicmaps/sdk/routing/TransitRouteInfo.hpp app/organicmaps/sdk/routing/TransitStepInfo.hpp app/organicmaps/sdk/ChoosePositionMode.cpp - app/organicmaps/sdk/MapStyle.cpp + app/organicmaps/sdk/MapMode.cpp + app/organicmaps/sdk/MapAppearance.cpp app/organicmaps/sdk/OrganicMaps.cpp app/organicmaps/sdk/Router.cpp app/organicmaps/sdk/core/jni_helper.cpp diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp index 705925fd9..9d7395018 100644 --- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp @@ -414,24 +414,34 @@ void Framework::ResumeSurfaceRendering() LOG(LINFO, ("Resume surface rendering.")); } -void Framework::SetMapStyle(MapStyle mapStyle) +void Framework::SwitchToMapAppearance(MapAppearance mapAppearance) { - m_work.SetMapStyle(mapStyle); + m_work.SwitchToMapAppearance(mapAppearance); } -void Framework::MarkMapStyle(MapStyle mapStyle) +MapAppearance Framework::CurrentMapAppearance() { - // In case of Vulkan rendering we don't recreate geometry and textures data, so - // we need use SetMapStyle instead of MarkMapStyle in all cases. - if (m_vulkanContextFactory) - m_work.SetMapStyle(mapStyle); - else - m_work.MarkMapStyle(mapStyle); + return m_work.CurrentMapAppearance(); +} + +void Framework::SwitchToMapMode(MapMode mapMode) +{ + m_work.SwitchToMapMode(mapMode); +} + +MapMode Framework::CurrentMapMode() +{ + return m_work.CurrentMapMode(); +} + +void Framework::SwitchToUsingVehicleStyle(bool enabled) +{ + m_work.SwitchToUsingVehicleStyle(enabled); } -MapStyle Framework::GetMapStyle() const +bool Framework::IsUsingVehicleStyle() { - return m_work.GetMapStyle(); + return m_work.IsUsingVehicleStyle(); } void Framework::Save3dMode(bool allow3d, bool allow3dBuildings) @@ -662,19 +672,17 @@ void Framework::SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn cons bool Framework::IsTrafficEnabled() { - return m_work.GetTrafficManager().IsEnabled(); + return NativeFramework()->DrivingMapModeHasTraffic(); } void Framework::EnableTraffic() { - m_work.GetTrafficManager().SetEnabled(true); - NativeFramework()->SaveTrafficEnabled(true); + NativeFramework()->DrivingMapModeSetTraffic(true); } void Framework::DisableTraffic() { - m_work.GetTrafficManager().SetEnabled(false); - NativeFramework()->SaveTrafficEnabled(false); + NativeFramework()->DrivingMapModeSetTraffic(false); } void Framework::SetMyPositionModeListener(location::TMyPositionModeChanged const & fn) @@ -1540,42 +1548,51 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabl JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { - frm()->GetTransitManager().EnableTransitSchemeMode(static_cast(enabled)); + if (enabled) + { + frm()->SwitchToMapMode(MapMode::PublicTransport); + } + else { + frm()->SwitchToMapMode(MapMode::Walking); + } } JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass) { - return static_cast(frm()->LoadTransitSchemeEnabled()); + return static_cast(frm()->CurrentMapMode() == MapMode::PublicTransport); } JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { - auto const isolinesEnabled = static_cast(enabled); - frm()->GetIsolinesManager().SetEnabled(isolinesEnabled); - frm()->SaveIsolinesEnabled(isolinesEnabled); + frm()->SetContourLinesLayer(static_cast(enabled)); } JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass) { - return static_cast(frm()->LoadIsolinesEnabled()); + return static_cast(frm()->HasContourLinesLayer()); } JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { - frm()->SaveOutdoorsEnabled(enabled); + frm()->SetOutdoorLayer(static_cast(enabled)); } JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass) { - return static_cast(frm()->LoadOutdoorsEnabled()); + return static_cast(frm()->HasOutdoorLayer()); +} + +JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSwitchToUsingVehicleStyle(JNIEnv * env, jclass, + jboolean enabled) +{ + frm()->SwitchToUsingVehicleStyle(static_cast(enabled)); } -JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, - jboolean enabled) +JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsUsingVehicleStyle(JNIEnv * env, jclass) { - frm()->SaveTransitSchemeEnabled(static_cast(enabled)); + return static_cast(frm()->IsUsingVehicleStyle()); } JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass) diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp index eb05eaf83..5fc3086ab 100644 --- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp @@ -15,7 +15,6 @@ #include "drape/pointers.hpp" #include "indexer/feature_decl.hpp" -#include "indexer/map_style.hpp" #include "platform/country_defines.hpp" #include "platform/location.hpp" @@ -108,9 +107,12 @@ class Framework : private power_management::PowerManager::Subscriber void PauseSurfaceRendering(); void ResumeSurfaceRendering(); - void SetMapStyle(MapStyle mapStyle); - void MarkMapStyle(MapStyle mapStyle); - MapStyle GetMapStyle() const; + void SwitchToMapAppearance(MapAppearance mapAppearance); + MapAppearance CurrentMapAppearance(); + void SwitchToMapMode(MapMode mapMode); + MapMode CurrentMapMode(); + void SwitchToUsingVehicleStyle(bool enabled); + bool IsUsingVehicleStyle(); void SetupMeasurementSystem(); diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapAppearance.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapAppearance.cpp new file mode 100644 index 000000000..215160c3e --- /dev/null +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapAppearance.cpp @@ -0,0 +1,18 @@ +#include "app/organicmaps/sdk/core/jni_helper.hpp" + +#include "app/organicmaps/sdk/Framework.hpp" + +extern "C" +{ +JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapAppearance_nativeSet(JNIEnv *, jclass, jint mapAppearance) +{ + auto const val = static_cast(mapAppearance); + if (val != g_framework->CurrentMapAppearance()) + g_framework->SwitchToMapAppearance(val); +} + +JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_MapAppearance_nativeGet(JNIEnv *, jclass) +{ + return g_framework->CurrentMapAppearance(); +} +} diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapMode.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapMode.cpp new file mode 100644 index 000000000..34e6cb2df --- /dev/null +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapMode.cpp @@ -0,0 +1,18 @@ +#include "app/organicmaps/sdk/core/jni_helper.hpp" + +#include "app/organicmaps/sdk/Framework.hpp" + +extern "C" +{ +JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapMode_nativeSet(JNIEnv *, jclass, jint mapMode) +{ + auto const val = static_cast(mapMode); + if (val != g_framework->CurrentMapMode()) + g_framework->SwitchToMapMode(val); +} + +JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_MapMode_nativeGet(JNIEnv *, jclass) +{ + return g_framework->CurrentMapMode(); +} +} diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp deleted file mode 100644 index 6083134a1..000000000 --- a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "app/organicmaps/sdk/core/jni_helper.hpp" - -#include "app/organicmaps/sdk/Framework.hpp" - -#include "indexer/map_style.hpp" - -extern "C" -{ -JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapStyle_nativeSet(JNIEnv *, jclass, jint mapStyle) -{ - auto const val = static_cast(mapStyle); - if (val != g_framework->GetMapStyle()) - g_framework->SetMapStyle(val); -} - -JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_MapStyle_nativeGet(JNIEnv *, jclass) -{ - return g_framework->GetMapStyle(); -} - -JNIEXPORT void JNICALL Java_app_organicmaps_sdk_MapStyle_nativeMark(JNIEnv *, jclass, jint mapStyle) -{ - auto const val = static_cast(mapStyle); - if (val != g_framework->GetMapStyle()) - g_framework->MarkMapStyle(val); -} -} diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java b/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java index 39fdf5ecf..ea9c0d184 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java @@ -297,6 +297,10 @@ public static native void nativeAddRoutePoint(String title, String subtitle, @No public static native boolean nativeIsOutdoorsLayerEnabled(); + public static native void nativeSwitchToUsingVehicleStyle(boolean enabled); + + public static native boolean nativeIsUsingVehicleStyle(); + @NonNull public static native MapObject nativeDeleteBookmarkFromMapObject(); diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/MapAppearance.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapAppearance.java new file mode 100644 index 000000000..e866a9089 --- /dev/null +++ b/android/sdk/src/main/java/app/organicmaps/sdk/MapAppearance.java @@ -0,0 +1,42 @@ +package app.organicmaps.sdk; + +import androidx.annotation.NonNull; + +public enum MapAppearance +{ + Light(0), + Dark(1); + + MapAppearance(int value) + { + this.value = value; + } + + @NonNull + public static MapAppearance get() + { + return valueOf(nativeGet()); + } + + public static void set(@NonNull MapAppearance mapAppearance) + { + nativeSet(mapAppearance.value); + } + + @NonNull + public static MapAppearance valueOf(int value) + { + for (MapAppearance mapAppearance : MapAppearance.values()) + { + if (mapAppearance.value == value) + return mapAppearance; + } + throw new IllegalArgumentException("Unknown map appearancde value: " + value); + } + + private final int value; + + private static native void nativeSet(int mapAppearance); + + private static native int nativeGet(); +} diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/MapMode.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapMode.java new file mode 100644 index 000000000..6c294bf5e --- /dev/null +++ b/android/sdk/src/main/java/app/organicmaps/sdk/MapMode.java @@ -0,0 +1,44 @@ +package app.organicmaps.sdk; + +import androidx.annotation.NonNull; + +public enum MapMode +{ + Walking(0), + Cycling(1), + Driving(2), + PublicTransport(3); + + MapMode(int value) + { + this.value = value; + } + + @NonNull + public static MapMode get() + { + return valueOf(nativeGet()); + } + + public static void set(@NonNull MapMode mapMode) + { + nativeSet(mapMode.value); + } + + @NonNull + public static MapMode valueOf(int value) + { + for (MapMode mapMode : MapMode.values()) + { + if (mapMode.value == value) + return mapMode; + } + throw new IllegalArgumentException("Unknown map mode value: " + value); + } + + private final int value; + + private static native void nativeSet(int mapMode); + + private static native int nativeGet(); +} diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java deleted file mode 100644 index 94e4fd461..000000000 --- a/android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java +++ /dev/null @@ -1,59 +0,0 @@ -package app.organicmaps.sdk; - -import androidx.annotation.NonNull; - -public enum MapStyle -{ - Clear(0), - Dark(1), - VehicleClear(3), - VehicleDark(4), - OutdoorsClear(5), - OutdoorsDark(6); - - MapStyle(int value) - { - this.value = value; - } - - @NonNull - public static MapStyle get() - { - return valueOf(nativeGet()); - } - - public static void set(@NonNull MapStyle mapStyle) - { - nativeSet(mapStyle.value); - } - - /** - * This method allows to set new map style without immediate applying. It can be used before - * engine recreation instead of nativeSetMapStyle to avoid huge flow of OpenGL invocations. - * - * @param mapStyle style index - */ - public static void mark(@NonNull MapStyle mapStyle) - { - nativeMark(mapStyle.value); - } - - @NonNull - public static MapStyle valueOf(int value) - { - for (MapStyle mapStyle : MapStyle.values()) - { - if (mapStyle.value == value) - return mapStyle; - } - throw new IllegalArgumentException("Unknown map style value: " + value); - } - - private final int value; - - private static native void nativeSet(int mapStyle); - - private static native int nativeGet(); - - private static native void nativeMark(int mapStyle); -} diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java index 2a420a15d..4f41dce74 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java @@ -20,7 +20,6 @@ static public void setEnabled(boolean isEnabled) return; Framework.nativeSetTransitSchemeEnabled(isEnabled); - Framework.nativeSaveSettingSchemeEnabled(isEnabled); } static public boolean isEnabled() diff --git a/configure.sh b/configure.sh index 21df45a11..ad4ea7a93 100755 --- a/configure.sh +++ b/configure.sh @@ -17,7 +17,7 @@ DRULES_NOT_GENERATED= SYMBOLS_NOT_GENERATED= STRINGS_NOT_GENERATED= -DRULES_FILES=(drules_proto.bin drules_proto_default_dark.bin drules_proto_default_light.bin drules_proto_outdoors_dark.bin drules_proto_outdoors_light.bin drules_proto_vehicle_dark.bin drules_proto_vehicle_light.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt) +DRULES_FILES=(drules_proto.bin drules_proto_walking_light.bin drules_proto_walking_outdoor_light.bin drules_proto_walking_dark.bin drules_proto_walking_outdoor_dark.bin drules_proto_cycling_light.bin drules_proto_cycling_outdoor_light.bin drules_proto_cycling_dark.bin drules_proto_cycling_outdoor_dark.bin drules_proto_driving_light.bin drules_proto_driving_outdoor_light.bin drules_proto_driving_dark.bin drules_proto_driving_outdoor_dark.bin drules_proto_public-transport_light.bin drules_proto_public-transport_outdoor_light.bin drules_proto_public-transport_dark.bin drules_proto_public-transport_outdoor_dark.bin drules_proto_vehicle_light.bin drules_proto_vehicle_dark.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt) SYMBOLS_FILES=(xhdpi/light/symbols.png xhdpi/light/symbols.sdf xhdpi/dark/symbols.png xhdpi/dark/symbols.sdf mdpi/light/symbols.png mdpi/light/symbols.sdf mdpi/dark/symbols.png mdpi/dark/symbols.sdf 6plus/light/symbols.png 6plus/light/symbols.sdf 6plus/dark/symbols.png 6plus/dark/symbols.sdf xxxhdpi/light/symbols.png xxxhdpi/light/symbols.sdf xxxhdpi/dark/symbols.png xxxhdpi/dark/symbols.sdf hdpi/light/symbols.png hdpi/light/symbols.sdf hdpi/dark/symbols.png hdpi/dark/symbols.sdf xxhdpi/light/symbols.png xxhdpi/light/symbols.sdf xxhdpi/dark/symbols.png xxhdpi/dark/symbols.sdf) for f in ${DRULES_FILES[*]}; do diff --git a/data/styles/outdoors/include/Subways.mapcss b/data/styles/cycling/dark/colors.mapcss similarity index 53% rename from data/styles/outdoors/include/Subways.mapcss rename to data/styles/cycling/dark/colors.mapcss index 49ecbf467..2cfa81948 100644 --- a/data/styles/outdoors/include/Subways.mapcss +++ b/data/styles/cycling/dark/colors.mapcss @@ -1,2 +1,2 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Subways.mapcss"); +@import("../../walking/dark/colors.mapcss"); diff --git a/data/styles/cycling/dark/style.mapcss b/data/styles/cycling/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/cycling/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/cycling/include/basemap.mapcss b/data/styles/cycling/include/basemap.mapcss new file mode 100644 index 000000000..3764cd63f --- /dev/null +++ b/data/styles/cycling/include/basemap.mapcss @@ -0,0 +1,25 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap.mapcss"); + + +/* Buildings */ + +area|z14[building], +area|z14[waterway=dam], +{fill-opacity: 0.4;} + +area|z15[building], +area|z15[waterway=dam], +{fill-opacity: 0.5;} + +area|z14-15[aeroway=terminal], +area|z16[building], +area|z16[building:part], +area|z16[waterway=dam], +{fill-opacity: 0.6; casing-opacity: 0.8;} + +area|z16-[aeroway=terminal], +area|z17-[building], +area|z17-[building:part], +area|z17-[waterway=dam], +{fill-opacity: 0.7;} diff --git a/data/styles/cycling/include/basemap_label.mapcss b/data/styles/cycling/include/basemap_label.mapcss new file mode 100644 index 000000000..f1eba831d --- /dev/null +++ b/data/styles/cycling/include/basemap_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap_label.mapcss"); diff --git a/data/styles/cycling/include/icons.mapcss b/data/styles/cycling/include/icons.mapcss new file mode 100644 index 000000000..56fe9e81b --- /dev/null +++ b/data/styles/cycling/include/icons.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons.mapcss"); diff --git a/data/styles/cycling/include/icons_label_colors.mapcss b/data/styles/cycling/include/icons_label_colors.mapcss new file mode 100644 index 000000000..ed0b61b6a --- /dev/null +++ b/data/styles/cycling/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons_label_colors.mapcss"); diff --git a/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt b/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..c2452bbbf --- /dev/null +++ b/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,265 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) +# highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) +# highway-services # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-garages # area z13- (also has caption z15-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) +# tourism-information-office # area z15- (also has icon z15-, caption(optional) z15-) +# tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) +# === 170 + +# highway-footway-area # area z14- (also has line z15-, line::border z15-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z14-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-coniferous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-deciduous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z15-, caption(optional) z18-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z15-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z15-) +# natural-beach-gravel # area z10- (also has caption z15-) +# natural-beach-sand # area z10- (also has caption z15-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/cycling/include/priorities_2_BG-top.prio.txt b/data/styles/cycling/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..cbb6a5a25 --- /dev/null +++ b/data/styles/cycling/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,50 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z13- (also has caption z13-) +# waterway-canal # line z13- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z13- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/cycling/include/priorities_3_FG.prio.txt b/data/styles/cycling/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..9cb41d1c7 --- /dev/null +++ b/data/styles/cycling/include/priorities_3_FG.prio.txt @@ -0,0 +1,606 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z19- (also has line::dash z19-) +# === 350 + +# power-line::dash # line::dash z19- (also has line z19-) +# === 340 + +# highway-ladder # line z15- (also has line::border z15-, icon z17-, pathtext z17-) +# highway-steps # line z15- (also has line::border z15-, pathtext z16-) +# highway-steps-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z16- +# barrier-guard_rail # line z17- +# barrier-hedge # line z16- +# barrier-wall # line z16- +# barrier-yes # line z16- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-world_level # line z4-9 +# highway-world_towns_level # line z6-9 +# === 310 + +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 309 + +# highway-primary # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-) +# highway-primary-bridge # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary-tunnel # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# railway-rail-branch::dash # line::dash z16- (also has line z11-) +# railway-rail-branch-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-branch-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-highspeed::dash # line::dash z16- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z16- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z16- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# railway-rail-tourism-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-) +# === 290 + +# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-) +# === 289 + +# railway-rail-branch # line z11- (also has line::dash z16-) +# railway-rail-branch-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-branch-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z16-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z16-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z16-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-) +# === 279 + +# highway-secondary # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-) +# highway-secondary-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary-tunnel # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z11-, 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-) +# === 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-) +# === 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-) +# === 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-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-) +# === 225 + +# highway-secondary_link # line z13- (also has line::border z15-, pathtext z16-) +# highway-secondary_link-bridge # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# highway-secondary_link-tunnel # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-) +# === 224 + +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-) +# highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +# highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) +# === 223 + +# highway-busway # line z15- (also has line::border z15-, pathtext z16-) +# highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-service # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-area # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# railway-light_rail::dash # line::dash z16- (also has line z13-) +# railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail::dash # line::dash z16- (also has line z11-) +# railway-rail-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z17- (also has line z16-) +# railway-rail-service-bridge::dash # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-) +# railway-rail-service-tunnel::dash # line::dash z17- (also has line(casing) z16-, line z16-) +# railway-rail-spur::dash # line::dash z17- (also has line z15-) +# railway-rail-spur-bridge::dash # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-spur-tunnel::dash # line::dash z17- (also has line(casing) z15-, line z15-) +# railway-rail-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z17- (also has line z13-) +# railway-rail-utility-bridge::dash # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z17- (also has line z13-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z15- (also has line::border z15-, line::cycleline z14-, pathtext z15-) +# highway-path-bicycle # line z15- (also has line::cycleline z13-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z14- (also has line z15-, line::border z15-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z13- (also has line z15-, pathtext z15-) +# === 219 + +# highway-cycleway # line z12- (also has pathtext z15-) +# highway-cycleway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z11- (also has line::dash z16-) +# railway-rail-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service # line z16- (also has line::dash z17-) +# railway-rail-service-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-service-tunnel # line z16- (also has line(casing) z16-, line::dash z17-) +# railway-rail-spur # line z15- (also has line::dash z17-) +# railway-rail-spur-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-spur-tunnel # line z15- (also has line(casing) z15-, line::dash z17-) +# railway-rail-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-utility # line z13- (also has line::dash z17-) +# railway-rail-utility-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-) +# railway-rail-utility-tunnel # line z13- (also has line::dash z17-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z16- (also has line z16-, line::dash z17-) +# railway-rail-spur-tunnel # line(casing) z15- (also has line z15-, line::dash z17-) +# railway-rail-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-utility-tunnel # line(casing) z14- (also has line z13-, line::dash z17-) +# === 209 + +# highway-ford # line z13- (also has line::border z14-, icon z16-, pathtext z16-) +# highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z14- (also has pathtext z15-) +# highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z15- (also has line::border z15-, pathtext z15-) +# highway-footway-area # line z15- and area z14- (also has line::border z15-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z15- (also has pathtext z15-) +# highway-path-difficult # line z15- (also has pathtext z15-) +# highway-path-expert # line z15- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z15- (also has pathtext z15-) +# highway-track-area # line z15- (also has pathtext z15-) +# highway-track-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z15- (also has pathtext z15-) +# highway-track-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z13- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z16- +# railway-construction # line z15- +# railway-disused # line z16- +# railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z16- +# railway-miniature # line z16- +# railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z16- +# railway-preserved # line z15- +# railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) +# railway-preserved-tunnel # line z15- +# railway-turntable # line z17- +# === 180 + +# highway-footway-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z16- (also has line::border z16-) +# highway-footway-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z15- (also has pathtext z15-) +# highway-path-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# === 163 + +# highway-primary::border # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-) +# === 162 + +# highway-secondary::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-) +# === 161 + +# highway-motorway_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 159 + +# highway-secondary_link::border # line::border z15- (also has line z13-, pathtext z16-) +# === 158 + +# highway-motorway-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# === 157 + +# highway-primary-bridge::border # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 156 + +# highway-secondary-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# === 155 + +# highway-motorway_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# === 153 + +# highway-secondary_link-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# === 152 + +# highway-motorway-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# === 151 + +# highway-primary-tunnel::border # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# === 150 + +# highway-secondary-tunnel::border # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 149 + +# highway-motorway_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 147 + +# highway-secondary_link-tunnel::border # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-) +# === 146 + +# highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-area::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-) +# highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-) +# highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z15- (also has line z15-, pathtext z15-) +# highway-footway-area::border # line::border z15- (also has line z15-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z15- (also has line z15-, line::cycleline z14-, 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-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-) +# highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-) +# highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-tourism-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-) +# railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# === 135 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) +# highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-) +# highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-) +# highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-tourism-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-) +# railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# === 130 + +# building # area z14- (also has caption z17-) +# building-garage # area z14- (also has caption z17-) +# building-guardhouse # area z14- (also has icon z18-, caption(optional) z18-) +# building-has_parts # area z14- (also has caption z17-) +# building-train_station # area z14- (also has icon z17-, caption(optional) z17-) +# === 120 + +# piste:type-connection # line z15- +# piste:type-downhill # line z14- (also has pathtext z15-) +# piste:type-downhill-advanced # line z14- (also has pathtext z15-) +# piste:type-downhill-easy # line z14- (also has pathtext z15-) +# piste:type-downhill-expert # line z14- (also has pathtext z15-) +# piste:type-downhill-freeride # line z14- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z14- (also has pathtext z15-) +# piste:type-downhill-novice # line z14- (also has pathtext z15-) +# piste:type-hike # line z15- (also has pathtext z15-) +# piste:type-nordic # line z14- (also has pathtext z15-) +# piste:type-skitour # line z14- (also has pathtext z15-) +# piste:type-sled # line z14- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z14- (also has pathtext z16-) +# natural-earth_bank # line z14- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z14- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z16- +# === 60 + +# isoline-step_10 # line z15- (also has pathtext z17-) +# isoline-step_100 # line z12- (also has pathtext z14-) +# isoline-step_1000 # line z11- (also has pathtext z11-) +# isoline-step_50 # line z14- (also has pathtext z16-) +# isoline-step_500 # line z11- (also has pathtext z12-) +# isoline-zero # line z15- (also has pathtext z17-) +# === 50 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# leisure-nature_reserve # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-) +# === 20 + +# piste:type-snow_park # area z14- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z18- +# === 5 diff --git a/data/styles/cycling/include/priorities_4_overlays.prio.txt b/data/styles/cycling/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..87afa562b --- /dev/null +++ b/data/styles/cycling/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2537 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-1 # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-3 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-4 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-5 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-6 # icon z11-17 (also has caption(optional) z12-17) +# leisure-nature_reserve # icon z11-17 and caption z18- (also has caption(optional) z12-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z16- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-) +# === 6250 + +# highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-) +# highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z14- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z13- (also has caption(optional) z13-) +# waterway-waterfall # icon z13- (also has caption(optional) z14-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# place-locality # caption z13- +# place-neighbourhood # caption z13- +# === 5700 + +# highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-) +# highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-) +# === 5600 + +# man_made-communications_tower # icon z14- (also has caption(optional) z15-) +# man_made-lighthouse # icon z13- (also has caption(optional) z14-) +# natural-peak # icon z13- (also has caption(optional) z13-) +# natural-volcano # icon z12- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z14- (also has caption(optional) z15-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z14- (also has caption(optional) z14-) +# === 4950 + +# landuse-forest # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-coniferous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-deciduous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-mixed # icon z13- (also has caption(optional) z14-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z14- (also has caption(optional) z15-) +# natural-geyser # icon z14- (also has caption(optional) z14-) +# natural-hot_spring # icon z14- (also has caption(optional) z15-) +# natural-spring # icon z14- (also has caption(optional) z15-) +# === 4650 + +# natural-saddle # icon z15- (also has caption(optional) z16-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z15- (also has caption(optional) z15-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z15- (also has caption(optional) z15-, area z15-) +# tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z16- (also has caption(optional) z16-) +# amenity-shelter-lean_to # icon z16- (also has caption(optional) z16-) +# emergency-mountain_rescue # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-wilderness_hut # icon z16- (also has caption(optional) z16-) +# === 3900 + +# highway-rest_area # icon z15- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-caravan_site # icon z16- (also has caption(optional) z16-) +# tourism-chalet # icon z16- (also has caption(optional) z16-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3751 + +# amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z15- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z17- (also has caption(optional) z18-) +# === 3500 + +# isoline-step_1000 # pathtext z11- (also has line z11-) +# === 3400 + +# isoline-step_500 # pathtext z12- (also has line z11-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z14- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z15- (also has area z10-) +# natural-beach-gravel # caption z15- (also has area z10-) +# natural-beach-sand # caption z15- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z16-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# 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-) +# === 3100 + +# amenity-water_point # icon z17- (also has caption(optional) z18-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z17- (also has caption(optional) z18-) +# man_made-water_well # icon z17- (also has caption(optional) z18-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z14- (also has line z12-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) +# highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z14-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-) +# highway-secondary_link # pathtext z16- (also has line z13-, line::border z15-) +# highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-) +# === 3000 + +# highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-) +# highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-) +# === 2970 + +# highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-) +# highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-) +# === 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-) +# === 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-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z12-) +# highway-cycleway-bridge # pathtext z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 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 z14-) +# highway-footway-bridge # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-footway-tunnel # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +# highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z13-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z13-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z16- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z17- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z14-) +# highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z15-) +# highway-path-bicycle # pathtext z15- (also has line z15-, line::cycleline z13-) +# highway-path-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z15-) +# highway-path-expert # pathtext z15- (also has line z15-) +# highway-path-horse # pathtext z15- (also has line z15-) +# 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-) +# === 2810 + +# highway-track # pathtext z15- (also has line z15-) +# highway-track-area # pathtext z15- (also has line z15-) +# highway-track-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z15-) +# 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-) +# 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z14-) +# piste:type-downhill-freeride # pathtext z15- (also has line z14-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z14-) +# piste:type-downhill-novice # pathtext z15- (also has line z14-) +# piste:type-hike # pathtext z15- (also has line z15-) +# piste:type-nordic # pathtext z15- (also has line z14-) +# piste:type-skitour # pathtext z15- (also has line z14-) +# piste:type-sled # pathtext z15- (also has line z14-) +# piste:type-snow_park # caption z15- (also has area z14-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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-) +# 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z18- (also has caption(optional) z18-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z16-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z16- (also has caption(optional) z16-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z16- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z16- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z17- (also has caption(optional) z17-) +# amenity-shelter-public_transport # icon z17- (also has caption(optional) z17-) +# emergency-lifeguard # icon z17- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z16- (also has line z14-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z16- (also has line z14-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z17- (also has caption(optional) z17-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) +# man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) +# natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) +# === 1200 + +# isoline-step_10 # pathtext z17- (also has line z15-) +# isoline-zero # pathtext z17- (also has line z15-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z17- +# man_made-flare # icon z16- (also has caption(optional) z18-) +# man_made-mast-communication # icon z16- +# man_made-tower # icon z16- (also has caption(optional) z18-) +# man_made-tower-communication # icon z16- (also has caption(optional) z18-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z18- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z18- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z18- (also has caption(optional) z18-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z18- (also has caption(optional) z18-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z16- +# man_made-silo # icon z16- (also has caption(optional) z18-) +# man_made-storage_tank # icon z16- (also has caption(optional) z18-) +# man_made-water_tower # icon z16- (also has caption(optional) z18-) +# power-portal # icon z19- +# power-tower # icon z19- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z18- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z15- (also has caption(optional) z16-, area z13-) +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z17- +# spherical_buoy-cardinal-north # icon z17- +# spherical_buoy-cardinal-south # icon z17- +# spherical_buoy-cardinal-west # icon z17- +# spherical_buoy-isolated_danger # icon z17- +# spherical_buoy-lateral-port # icon z17- +# spherical_buoy-lateral-starboard # icon z17- +# spherical_buoy-safe_water # icon z17- +# spherical_buoy-special_purpose # icon z17- +# === 216 + +# beacon-cardinal-east # icon z16- +# beacon-cardinal-north # icon z16- +# beacon-cardinal-south # icon z16- +# beacon-cardinal-west # icon z16- +# beacon-isolated_danger # icon z16- +# beacon-lateral-port # icon z16- +# beacon-lateral-starboard # icon z16- +# beacon-safe_water # icon z16- +# beacon-special_purpose # icon z16- +# buoy-cardinal-east # icon z16- +# buoy-cardinal-north # icon z16- +# buoy-cardinal-south # icon z16- +# buoy-cardinal-west # icon z16- +# buoy-isolated_danger # icon z16- +# buoy-lateral-port # icon z16- +# buoy-lateral-starboard # icon z16- +# buoy-safe_water # icon z16- +# buoy-special_purpose # icon z16- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z17- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z15- (also has caption(optional) z18-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-1 # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-3 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-4 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-5 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-6 # caption(optional) z12-17 (also has icon z11-17) +# leisure-nature_reserve # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z14-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z13- (also has icon z13-) +# waterway-waterfall # caption(optional) z14- (also has icon z13-) +# === -4200 + +# man_made-communications_tower # caption(optional) z15- (also has icon z14-) +# man_made-lighthouse # caption(optional) z14- (also has icon z13-) +# natural-peak # caption(optional) z13- (also has icon z13-) +# natural-volcano # caption(optional) z13- (also has icon z12-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z15- (also has icon z14-) +# === -4950 + +# tourism-viewpoint # caption(optional) z14- (also has icon z14-) +# === -5050 + +# landuse-forest # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-coniferous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-deciduous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-mixed # caption(optional) z14- (also has icon z13-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z15- (also has icon z14-) +# natural-geyser # caption(optional) z14- (also has icon z14-) +# natural-hot_spring # caption(optional) z15- (also has icon z14-) +# natural-spring # caption(optional) z15- (also has icon z14-) +# === -5350 + +# natural-saddle # caption(optional) z16- (also has icon z15-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z15- (also has icon z15-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z15- (also has icon z15-, area z15-) +# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z16- (also has icon z16-) +# amenity-shelter-lean_to # caption(optional) z16- (also has icon z16-) +# emergency-mountain_rescue # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-wilderness_hut # caption(optional) z16- (also has icon z16-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z15-, area z13-) +# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-caravan_site # caption(optional) z16- (also has icon z16-) +# tourism-chalet # caption(optional) z16- (also has icon z16-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z15-) +# === -6400 + +# amenity-drinking_water # caption(optional) z18- (also has icon z17-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z18- (also has icon z17-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z18- (also has icon z17-) +# man_made-water_well # caption(optional) z18- (also has icon z17-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z17-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z18- (also has icon z18-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z16-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z16- (also has icon z16-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z16-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z16-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z17- (also has icon z17-) +# amenity-shelter-public_transport # caption(optional) z17- (also has icon z17-) +# emergency-lifeguard # caption(optional) z18- (also has icon z17-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-) +# leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) +# man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) +# natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flare # caption(optional) z18- (also has icon z16-) +# man_made-tower # caption(optional) z18- (also has icon z16-) +# man_made-tower-communication # caption(optional) z18- (also has icon z16-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z18-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z18-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z18- (also has icon z18-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z18- (also has icon z18-) +# man_made-silo # caption(optional) z18- (also has icon z16-) +# man_made-storage_tank # caption(optional) z18- (also has icon z16-) +# man_made-water_tower # caption(optional) z18- (also has icon z16-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z18-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z15-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z17-) +# power-generator-wind # caption(optional) z18- (also has icon z15-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z19- (also has caption(optional) z19-) +# man_made-survey_point # icon z18- (also has caption(optional) z18-) +# tourism-information # icon z16- (also has caption(optional) z16-) +# tourism-information-board # icon z16- (also has caption(optional) z16-) +# tourism-information-guidepost # icon z16- (also has caption(optional) z16-) +# tourism-information-map # icon z16- (also has caption(optional) z16-) +# tourism-information-tactile_map # icon z16- (also has caption(optional) z16-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z17- (also has icon z17-, caption z17-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z19- (also has icon z19-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z16- (also has icon z16-) +# tourism-information-map # caption(optional) z16- (also has icon z16-) +# tourism-information-tactile_map # caption(optional) z16- (also has icon z16-) +# === -10000 diff --git a/data/styles/cycling/include/transit_systems.mapcss b/data/styles/cycling/include/transit_systems.mapcss new file mode 100644 index 000000000..7cbd435f6 --- /dev/null +++ b/data/styles/cycling/include/transit_systems.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/transit_systems.mapcss"); diff --git a/data/styles/cycling/include/ways.mapcss b/data/styles/cycling/include/ways.mapcss new file mode 100644 index 000000000..9bb289320 --- /dev/null +++ b/data/styles/cycling/include/ways.mapcss @@ -0,0 +1,52 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways.mapcss"); + +line|z12-[highway=cycleway], +line|z13-[highway=path][bicycle=designated]::cycleline, +line|z14-[highway=footway][bicycle=designated]::cycleline, +{color: @cycleway;} + +line|z12[highway=cycleway] +{width: 1.9;} +line|z13[highway=cycleway] +{width: 2.0;} +line|z14[highway=cycleway], +{width: 2.2;} +line|z15[highway=cycleway], +{width: 2.5;} +line|z16[highway=cycleway], +{width: 3;} +line|z17[highway=cycleway], +{width: 3.4;} +line|z18[highway=cycleway], +{width: 4.2;} +line|z19-[highway=cycleway], +{width: 5.2;} + +line|z13[highway=path][bicycle=designated]::cycleline, +{width: 1.4;} +line|z14[highway=path][bicycle=designated]::cycleline, +{width: 1.5;} +line|z15[highway=path][bicycle=designated]::cycleline, +{width: 1.6;} +line|z16[highway=path][bicycle=designated]::cycleline, +{width: 2.2;} +line|z17[highway=path][bicycle=designated]::cycleline, +{width: 2;} +line|z18[highway=path][bicycle=designated]::cycleline, +{width: 2.4;} +line|z19-[highway=path][bicycle=designated]::cycleline, +{width: 2.8;} + +line|z14[highway=footway][bicycle=designated]::cycleline, +{width: 1.6;} +line|z15[highway=footway][bicycle=designated]::cycleline, +{width: 1.7;} +line|z16[highway=footway][bicycle=designated]::cycleline, +{width: 1.8;} +line|z17[highway=footway][bicycle=designated]::cycleline, +{width: 2.1;} +line|z18[highway=footway][bicycle=designated]::cycleline, +{width: 2.4;} +line|z19-[highway=footway][bicycle=designated]::cycleline, +{width: 3.0;} diff --git a/data/styles/cycling/include/ways_label.mapcss b/data/styles/cycling/include/ways_label.mapcss new file mode 100644 index 000000000..fb0627ff0 --- /dev/null +++ b/data/styles/cycling/include/ways_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways_label.mapcss"); diff --git a/data/styles/cycling/light/colors.mapcss b/data/styles/cycling/light/colors.mapcss new file mode 100644 index 000000000..0f80e9a02 --- /dev/null +++ b/data/styles/cycling/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/light/colors.mapcss"); diff --git a/data/styles/cycling/light/style.mapcss b/data/styles/cycling/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/cycling/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/cycling_outdoor/dark/colors.mapcss b/data/styles/cycling_outdoor/dark/colors.mapcss new file mode 100644 index 000000000..cf3f36719 --- /dev/null +++ b/data/styles/cycling_outdoor/dark/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/dark/colors.mapcss"); +@import("../../outdoor/dark/colors.mapcss"); diff --git a/data/styles/cycling_outdoor/dark/style.mapcss b/data/styles/cycling_outdoor/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/cycling_outdoor/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/cycling_outdoor/include/basemap.mapcss b/data/styles/cycling_outdoor/include/basemap.mapcss new file mode 100644 index 000000000..3ab5086ea --- /dev/null +++ b/data/styles/cycling_outdoor/include/basemap.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/basemap.mapcss"); +@import("../../outdoor/include/basemap.mapcss"); diff --git a/data/styles/cycling_outdoor/include/basemap_label.mapcss b/data/styles/cycling_outdoor/include/basemap_label.mapcss new file mode 100644 index 000000000..53077cbc5 --- /dev/null +++ b/data/styles/cycling_outdoor/include/basemap_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/basemap_label.mapcss"); +@import("../../outdoor/include/basemap_label.mapcss"); diff --git a/data/styles/cycling_outdoor/include/icons.mapcss b/data/styles/cycling_outdoor/include/icons.mapcss new file mode 100644 index 000000000..935f03487 --- /dev/null +++ b/data/styles/cycling_outdoor/include/icons.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/icons.mapcss"); +@import("../../outdoor/include/icons.mapcss"); diff --git a/data/styles/cycling_outdoor/include/icons_label_colors.mapcss b/data/styles/cycling_outdoor/include/icons_label_colors.mapcss new file mode 100644 index 000000000..520bfc9eb --- /dev/null +++ b/data/styles/cycling_outdoor/include/icons_label_colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/icons_label_colors.mapcss"); +@import("../../outdoor/include/icons_label_colors.mapcss"); diff --git a/data/styles/cycling_outdoor/include/priorities_1_BG-by-size.prio.txt b/data/styles/cycling_outdoor/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..f9dfb5271 --- /dev/null +++ b/data/styles/cycling_outdoor/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,266 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../cycling/include/priorities_1_BG-by-size.prio.txt") +@import("../../outdoor/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon 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-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-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) +# tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +# 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 z16-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z13-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z14-) +# natural-beach-gravel # area z10- (also has caption z14-) +# natural-beach-sand # area z10- (also has caption z14-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/cycling_outdoor/include/priorities_2_BG-top.prio.txt b/data/styles/cycling_outdoor/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..583e43a44 --- /dev/null +++ b/data/styles/cycling_outdoor/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,51 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../cycling/include/priorities_2_BG-top.prio.txt") +@import("../../outdoor/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z11- (also has caption z13-) +# waterway-canal # line z12- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z12- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/cycling_outdoor/include/priorities_3_FG.prio.txt b/data/styles/cycling_outdoor/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..7136be850 --- /dev/null +++ b/data/styles/cycling_outdoor/include/priorities_3_FG.prio.txt @@ -0,0 +1,616 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../cycling/include/priorities_3_FG.prio.txt") +@import("../../outdoor/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z13- (also has line::dash z13-, pathtext z15-) +# power-minor_line # line z15- (also has line::dash z15-) +# === 350 + +# power-line::dash # line::dash z13- (also has line z13-, pathtext z15-) +# power-minor_line::dash # line::dash z15- (also has line z15-) +# === 340 + +# highway-ladder # line z12- (also has line::border z16-, icon z16-, pathtext z17-) +# highway-steps # line z12- (also has line::border z16-, pathtext z16-) +# highway-steps-bridge # line z12- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z12- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z15- +# barrier-guard_rail # line z16- +# barrier-hedge # line z16- +# barrier-wall # line z15- +# barrier-yes # line z15- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z10-, 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 z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z10-, 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-) +# 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-) +# railway-rail-highspeed::dash # line::dash z15- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z15- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z15- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# 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-) +# === 289 + +# railway-rail-branch # line z10- (also has line::dash z15-) +# railway-rail-branch-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-branch-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z15-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z15-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z15-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border 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 z11-, pathtext z13-) +# highway-unclassified-area # line z11- (also has line::border z11-, pathtext z13-) +# highway-unclassified-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# highway-unclassified-tunnel # line z11- (also has line::border z11-, 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 z11-, pathtext z13-) +# === 249 + +# highway-living_street # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-bridge # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z14-) +# highway-residential # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-bridge # line z12- (also has line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-residential-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road # line z12- (also has line::border z12-, pathtext z14-) +# highway-road-bridge # line z12- (also has line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-road-tunnel # line z12- (also has line::border z12-, pathtext z14-) +# === 230 + +# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z14-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z13-, shield::shield z15-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z11-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border 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-) +# === 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-) +# === 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 z13-, pathtext z16-) +# highway-service-area # line z13- (also has line::border z13-, pathtext z16-) +# highway-service-bridge # line z13- (also has line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z13- (also has line::border z13-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, line::border 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-) +# railway-rail-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z16- (also has line z15-) +# railway-rail-service-bridge::dash # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-service-tunnel::dash # line::dash z16- (also has line(casing) z15-, line z15-) +# railway-rail-spur::dash # line::dash z16- (also has line z14-) +# railway-rail-spur-bridge::dash # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-) +# railway-rail-spur-tunnel::dash # line::dash z16- (also has line(casing) z14-, line z14-) +# railway-rail-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z16- (also has line z12-) +# railway-rail-utility-bridge::dash # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z16- (also has line z12-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z11- (also has line::border z12-, line::cycleline z13-, pathtext z15-) +# highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, line::border z12-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z15-) +# === 219 + +# highway-cycleway # line z11- (also has pathtext z15-) +# highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z10- (also has line::dash z15-) +# railway-rail-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service # line z15- (also has line::dash z16-) +# railway-rail-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-service-tunnel # line z15- (also has line(casing) z15-, line::dash z16-) +# railway-rail-spur # line z14- (also has line::dash z16-) +# railway-rail-spur-bridge # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) +# railway-rail-spur-tunnel # line z14- (also has line(casing) z14-, line::dash z16-) +# railway-rail-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-utility # line z12- (also has line::dash z16-) +# railway-rail-utility-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-utility-tunnel # line z12- (also has line::dash z16-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z15- (also has line z15-, line::dash z16-) +# railway-rail-spur-tunnel # line(casing) z14- (also has line z14-, line::dash z16-) +# railway-rail-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z11- (also has pathtext z15-) +# highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z11- (also has line::border z16-, pathtext z15-) +# highway-footway-area # line z11- and area z14- (also has line::border z16-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z11- (also has pathtext z15-) +# highway-path-difficult # line z11- (also has pathtext z15-) +# highway-path-expert # line z11- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z11- (also has pathtext z15-) +# highway-track-area # line z11- (also has pathtext z15-) +# highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z11- (also has pathtext z15-) +# highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z11- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z13- +# railway-construction # line z13- +# railway-disused # line z13- +# railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z13- +# railway-miniature # line z13- +# railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z13- +# 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 + +# highway-footway-bridge # line z11- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z13- (also has line::border z16-) +# highway-footway-tunnel # line z11- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z11- (also has pathtext z15-) +# highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::border z16-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::border z16-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::border z16-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::border z16-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z10- (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 z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z11- (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 z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z10- (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 z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z11- (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 z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z10- (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 z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z11- (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 z12- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-area::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-driveway::border # line::border z15- (also has line z15-, 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 z11- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z11- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z16- (also has line z11-, pathtext z15-) +# highway-footway-area::border # line::border z16- (also has line z11-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z12- (also has line z11-, line::cycleline z13-, pathtext z15-) +# 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 z16- (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 z16- (also has line z12-, 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 z12- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z13- (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 z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 + +# highway-footway-bridge::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, 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 z12- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z13- (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 z11- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 + +# highway-footway-tunnel::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# === 140 + +# highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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 z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z12-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::border z16-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z16-, line::dash z16-) +# 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 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::border z16-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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 z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z12-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::border z16-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z14-, line::bridgewhite z14-, line::dash z16-) +# 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 + +# 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 + +# piste:type-connection # line z15- +# piste:type-downhill # line z12- (also has pathtext z15-) +# piste:type-downhill-advanced # line z12- (also has pathtext z15-) +# piste:type-downhill-easy # line z12- (also has pathtext z15-) +# piste:type-downhill-expert # line z12- (also has pathtext z15-) +# piste:type-downhill-freeride # line z12- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z12- (also has pathtext z15-) +# piste:type-downhill-novice # line z12- (also has pathtext z15-) +# piste:type-hike # line z12- (also has pathtext z15-) +# piste:type-nordic # line z12- (also has pathtext z15-) +# piste:type-skitour # line z12- (also has pathtext z15-) +# piste:type-sled # line z12- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z12- (also has pathtext z14-) +# natural-earth_bank # line z12- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z13- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z15- +# === 60 + +# 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 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# leisure-nature_reserve # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) +# === 20 + +# piste:type-downhill-advanced-area # area z13- +# piste:type-downhill-area # area z13- +# piste:type-downhill-easy-area # area z13- +# piste:type-downhill-expert-area # area z13- +# piste:type-downhill-intermediate-area # area z13- +# piste:type-downhill-novice-area # area z13- +# piste:type-sled-area # area z13- +# piste:type-snow_park # area z13- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z15- +# === 5 diff --git a/data/styles/cycling_outdoor/include/priorities_4_overlays.prio.txt b/data/styles/cycling_outdoor/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..e081f0629 --- /dev/null +++ b/data/styles/cycling_outdoor/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2544 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../cycling/include/priorities_4_overlays.prio.txt") +@import("../../outdoor/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-5 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-6 # icon z10-17 (also has caption(optional) z11-17) +# leisure-nature_reserve # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z16- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# 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-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z12- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z11- (also has caption(optional) z11-) +# waterway-waterfall # icon z10- (also has caption(optional) z11-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# 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-) +# === 5600 + +# man_made-communications_tower # icon z12- (also has caption(optional) z13-) +# man_made-lighthouse # icon z11- (also has caption(optional) z14-) +# natural-peak # icon z10- (also has caption(optional) z11-) +# natural-volcano # icon z10- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z11- (also has caption(optional) z12-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z11- (also has caption(optional) z13-) +# === 4950 + +# landuse-forest # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z10- (also has caption(optional) z11-) +# natural-geyser # icon z10- (also has caption(optional) z12-) +# natural-hot_spring # icon z12- (also has caption(optional) z15-) +# natural-spring # icon z12- (also has caption(optional) z14-) +# === 4650 + +# natural-saddle # icon z13- (also has caption(optional) z15-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +# tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) +# amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) +# emergency-mountain_rescue # icon z12- (also has caption(optional) z12-, area z13-) +# tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) +# === 3900 + +# highway-rest_area # icon z14- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) +# tourism-caravan_site # icon z13- (also has caption(optional) z13-) +# tourism-chalet # icon z14- (also has caption(optional) z14-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3751 + +# amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z15- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z12- (also has caption(optional) z14-) +# === 3500 + +# isoline-step_1000 # pathtext z10- (also has line z10-) +# === 3400 + +# isoline-step_500 # pathtext z11- (also has line z10-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z13- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z14- (also has area z10-) +# natural-beach-gravel # caption z14- (also has area z10-) +# natural-beach-sand # caption z14- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z15-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z15-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# waterway-river # pathtext z11- (also has line z10-) +# === 3150 + +# highway-unclassified # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-area # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z11-, line(casing) z16-) +# === 3100 + +# amenity-water_point # icon z12- (also has caption(optional) z14-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z12- (also has caption(optional) z14-) +# man_made-water_well # icon z12- (also has caption(optional) z14-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z13- (also has line z11-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# 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 z12-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z12-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z12-) +# 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-) +# === 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-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-) +# === 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-) +# === 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 z12-) +# highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-) +# highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line(casing) z16-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z11-) +# highway-cycleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2953 + +# area:highway-footway # caption z15- (also has area z14-) +# highway-footway # pathtext z15- (also has line z11-, line::border z16-) +# highway-footway-area # pathtext z15- (also has line z11-, line::border z16-, area z14-) +# highway-footway-bicycle # pathtext z15- (also has line z11-, line::border z12-, line::cycleline z13-) +# highway-footway-bridge # pathtext z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-footway-tunnel # pathtext z15- (also has line z11-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +# highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z12-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z12-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z14- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z11-) +# highway-bridleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z11-) +# highway-path-bicycle # pathtext z15- (also has line z11-, line::cycleline z12-) +# highway-path-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z11-) +# highway-path-expert # pathtext z15- (also has line z11-) +# highway-path-horse # pathtext z15- (also has line z11-) +# highway-path-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2820 + +# highway-steps # pathtext z16- (also has line z12-, line::border z16-) +# highway-steps-bridge # pathtext z16- (also has line z12-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-steps-tunnel # pathtext z16- (also has line z12-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2810 + +# highway-track # pathtext z15- (also has line z11-) +# highway-track-area # pathtext z15- (also has line z11-) +# highway-track-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z11-) +# highway-track-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2780 + +# highway-service # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-area # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-) +# highway-service-driveway # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-tunnel # pathtext z16- (also has line z13-, line::border 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z12-) +# piste:type-downhill-freeride # pathtext z15- (also has line z12-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z12-) +# piste:type-downhill-novice # pathtext z15- (also has line z12-) +# piste:type-hike # pathtext z15- (also has line z12-) +# piste:type-nordic # pathtext z15- (also has line z12-) +# piste:type-skitour # pathtext z15- (also has line z12-) +# piste:type-sled # pathtext z15- (also has line z12-) +# piste:type-snow_park # caption z15- (also has area z13-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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 z12-) +# highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z12-) +# highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z14- (also has caption(optional) z15-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z15-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z14- (also has caption(optional) z14-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z15- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z14- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z12- (also has caption(optional) z13-) +# amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) +# emergency-lifeguard # icon z14- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z14- (also has line z12-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z15- (also has line z13-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z15- (also has caption(optional) z16-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) +# man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) +# natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) +# === 1200 + +# isoline-step_10 # pathtext z16- (also has line z15-) +# isoline-zero # pathtext z15- (also has line z15-) +# power-line # pathtext z15- (also has line z13-, line::dash z13-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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 z16-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z13- (also has caption(optional) z14-) +# man_made-flare # icon z13- (also has caption(optional) z18-) +# man_made-mast-communication # icon z13- (also has caption(optional) z14-) +# man_made-tower # icon z13- (also has caption(optional) z14-) +# man_made-tower-communication # icon z13- (also has caption(optional) z14-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z15- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z17- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z16- (also has caption(optional) z17-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z16- (also has caption(optional) z17-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z13- (also has caption(optional) z14-) +# man_made-silo # icon z13- (also has caption(optional) z14-) +# man_made-storage_tank # icon z13- (also has caption(optional) z14-) +# man_made-water_tower # icon z13- (also has caption(optional) z14-) +# power-portal # icon z13- +# power-tower # icon z13- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# man_made-utility_pole # icon z15- +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z13- (also has caption(optional) z16-, area z13-) +# power-pole # icon z15- +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z15- +# spherical_buoy-cardinal-north # icon z15- +# spherical_buoy-cardinal-south # icon z15- +# spherical_buoy-cardinal-west # icon z15- +# spherical_buoy-isolated_danger # icon z15- +# spherical_buoy-lateral-port # icon z15- +# spherical_buoy-lateral-starboard # icon z15- +# spherical_buoy-safe_water # icon z15- +# spherical_buoy-special_purpose # icon z15- +# === 216 + +# beacon-cardinal-east # icon z13- +# beacon-cardinal-north # icon z13- +# beacon-cardinal-south # icon z13- +# beacon-cardinal-west # icon z13- +# beacon-isolated_danger # icon z13- +# beacon-lateral-port # icon z13- +# beacon-lateral-starboard # icon z13- +# beacon-safe_water # icon z13- +# beacon-special_purpose # icon z13- +# buoy-cardinal-east # icon z13- +# buoy-cardinal-north # icon z13- +# buoy-cardinal-south # icon z13- +# buoy-cardinal-west # icon z13- +# buoy-isolated_danger # icon z13- +# buoy-lateral-port # icon z13- +# buoy-lateral-starboard # icon z13- +# buoy-safe_water # icon z13- +# buoy-special_purpose # icon z13- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z14- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z13- (also has caption(optional) z16-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z15- and caption z16- (also has caption(optional) z16-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-1 # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-3 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-4 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-5 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-6 # caption(optional) z11-17 (also has icon z10-17) +# leisure-nature_reserve # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z12-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z11- (also has icon z11-) +# waterway-waterfall # caption(optional) z11- (also has icon z10-) +# === -4200 + +# man_made-communications_tower # caption(optional) z13- (also has icon z12-) +# man_made-lighthouse # caption(optional) z14- (also has icon z11-) +# natural-peak # caption(optional) z11- (also has icon z10-) +# natural-volcano # caption(optional) z13- (also has icon z10-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z12- (also has icon z11-) +# === -4950 + +# tourism-viewpoint # caption(optional) z13- (also has icon z11-) +# === -5050 + +# landuse-forest # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-coniferous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-deciduous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-mixed # caption(optional) z13- (also has icon z12-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z11- (also has icon z10-) +# natural-geyser # caption(optional) z12- (also has icon z10-) +# natural-hot_spring # caption(optional) z15- (also has icon z12-) +# natural-spring # caption(optional) z14- (also has icon z12-) +# === -5350 + +# natural-saddle # caption(optional) z15- (also has icon z13-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z14- (also has icon z13-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z14- (also has icon z13-, area z15-) +# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z13- (also has icon z12-) +# amenity-shelter-lean_to # caption(optional) z13- (also has icon z12-) +# emergency-mountain_rescue # caption(optional) z12- (also has icon z12-, area z13-) +# tourism-wilderness_hut # caption(optional) z13- (also has icon z12-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z14-, area z13-) +# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-) +# tourism-caravan_site # caption(optional) z13- (also has icon z13-) +# tourism-chalet # caption(optional) z14- (also has icon z14-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z15-) +# === -6400 + +# amenity-drinking_water # caption(optional) z14- (also has icon z12-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z14- (also has icon z12-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z14- (also has icon z12-) +# man_made-water_well # caption(optional) z14- (also has icon z12-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z14-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z15- (also has icon z14-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z15-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z14- (also has icon z14-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z15-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z14-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z13- (also has icon z12-) +# amenity-shelter-public_transport # caption(optional) z14- (also has icon z14-) +# emergency-lifeguard # caption(optional) z18- (also has icon z14-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-) +# leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) +# man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) +# natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flagpole # caption(optional) z14- (also has icon z13-) +# man_made-flare # caption(optional) z18- (also has icon z13-) +# man_made-mast-communication # caption(optional) z14- (also has icon z13-) +# man_made-tower # caption(optional) z14- (also has icon z13-) +# man_made-tower-communication # caption(optional) z14- (also has icon z13-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z15-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z17-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z17- (also has icon z16-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z17- (also has icon z16-) +# man_made-mast # caption(optional) z14- (also has icon z13-) +# man_made-silo # caption(optional) z14- (also has icon z13-) +# man_made-storage_tank # caption(optional) z14- (also has icon z13-) +# man_made-water_tower # caption(optional) z14- (also has icon z13-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z16-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z14-) +# power-generator-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z17- (also has caption(optional) z17-) +# man_made-survey_point # icon z14- (also has caption(optional) z15-) +# tourism-information # icon z15- (also has caption(optional) z15-) +# tourism-information-board # icon z15- (also has caption(optional) z15-) +# tourism-information-guidepost # icon z15- (also has caption(optional) z15-) +# tourism-information-map # icon z15- (also has caption(optional) z15-) +# tourism-information-tactile_map # icon z15- (also has caption(optional) z15-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z16- (also has icon z15-, caption z16-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z17- (also has icon z17-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z15- (also has icon z15-) +# tourism-information-map # caption(optional) z15- (also has icon z15-) +# tourism-information-tactile_map # caption(optional) z15- (also has icon z15-) +# === -10000 diff --git a/data/styles/cycling_outdoor/include/transit_systems.mapcss b/data/styles/cycling_outdoor/include/transit_systems.mapcss new file mode 100644 index 000000000..17ac4f918 --- /dev/null +++ b/data/styles/cycling_outdoor/include/transit_systems.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/transit_systems.mapcss"); +@import("../../outdoor/include/transit_systems.mapcss"); diff --git a/data/styles/cycling_outdoor/include/ways.mapcss b/data/styles/cycling_outdoor/include/ways.mapcss new file mode 100644 index 000000000..5758f9bd7 --- /dev/null +++ b/data/styles/cycling_outdoor/include/ways.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/ways.mapcss"); +@import("../../outdoor/include/ways.mapcss"); diff --git a/data/styles/cycling_outdoor/include/ways_label.mapcss b/data/styles/cycling_outdoor/include/ways_label.mapcss new file mode 100644 index 000000000..6bbf64c76 --- /dev/null +++ b/data/styles/cycling_outdoor/include/ways_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/include/ways_label.mapcss"); +@import("../../outdoor/include/ways_label.mapcss"); diff --git a/data/styles/cycling_outdoor/light/colors.mapcss b/data/styles/cycling_outdoor/light/colors.mapcss new file mode 100644 index 000000000..96bcc3149 --- /dev/null +++ b/data/styles/cycling_outdoor/light/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../cycling/light/colors.mapcss"); +@import("../../outdoor/light/colors.mapcss"); diff --git a/data/styles/cycling_outdoor/light/style.mapcss b/data/styles/cycling_outdoor/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/cycling_outdoor/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/default/dark/symbols/compass.svg b/data/styles/default/dark/symbols/compass.svg deleted file mode 100644 index 69e306fab..000000000 --- a/data/styles/default/dark/symbols/compass.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/default/include/defaults_new.mapcss b/data/styles/default/include/defaults_new.mapcss deleted file mode 100644 index b8a843af6..000000000 --- a/data/styles/default/include/defaults_new.mapcss +++ /dev/null @@ -1,24 +0,0 @@ -way|z1-12::* -{ - linejoin: bevel; -} - -way|z13-::* -{ - linejoin: round; -} - -way|z1-15::* -{ - linecap: butt; -} - -way|z16-::* -{ - linecap: round; -} - -*::int_name -{ - text-offset: 1; -} diff --git a/data/styles/default/light/symbols/compass.svg b/data/styles/default/light/symbols/compass.svg deleted file mode 100644 index 8b98c59a0..000000000 --- a/data/styles/default/light/symbols/compass.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/styles/driving/dark/colors.mapcss b/data/styles/driving/dark/colors.mapcss new file mode 100644 index 000000000..2cfa81948 --- /dev/null +++ b/data/styles/driving/dark/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/dark/colors.mapcss"); diff --git a/data/styles/driving/dark/style.mapcss b/data/styles/driving/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/driving/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/driving/include/basemap.mapcss b/data/styles/driving/include/basemap.mapcss new file mode 100644 index 000000000..06fafd621 --- /dev/null +++ b/data/styles/driving/include/basemap.mapcss @@ -0,0 +1,25 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap.mapcss"); + + +/* Buildings */ + +area|z14[building], +area|z14[waterway=dam], +{fill-opacity: 0.3;} + +area|z15[building], +area|z15[waterway=dam], +{fill-opacity: 0.4;} + +area|z14-15[aeroway=terminal], +area|z16[building], +area|z16[building:part], +area|z16[waterway=dam], +{fill-opacity: 0.5; casing-opacity: 0.7;} + +area|z16-[aeroway=terminal], +area|z17-[building], +area|z17-[building:part], +area|z17-[waterway=dam], +{fill-opacity: 0.5;} \ No newline at end of file diff --git a/data/styles/driving/include/basemap_label.mapcss b/data/styles/driving/include/basemap_label.mapcss new file mode 100644 index 000000000..f1eba831d --- /dev/null +++ b/data/styles/driving/include/basemap_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap_label.mapcss"); diff --git a/data/styles/driving/include/icons.mapcss b/data/styles/driving/include/icons.mapcss new file mode 100644 index 000000000..0ed3daf6b --- /dev/null +++ b/data/styles/driving/include/icons.mapcss @@ -0,0 +1,62 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons.mapcss"); + + +/* Toll Booths */ + +node|z13-14[barrier=toll_booth], +{icon-image: toll_booth-s.svg;} +node|z15-[barrier=toll_booth], +{icon-image: toll_booth-m.svg;} + + +/* Charging & Fueling */ + +node|z14-[amenity=fuel], +node|z15-[amenity=charging_station][motorcar?][!capacity], +node|z15-[amenity=charging_station][motorcar?][capacity=1], +node|z15-[amenity=charging_station][motorcar?][capacity=2], +node|z14-[amenity=charging_station][motorcar?][capacity?], +node|z16-[amenity=charging_station], +{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} + +node|z14[amenity=fuel], +{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} +node|z15[amenity=fuel], +{icon-image: fuel-m.svg; icon-min-distance: 20;} +node|z16[amenity=fuel], +{icon-image: fuel-m.svg; icon-min-distance: 10;} +node|z17-[amenity=fuel], +{icon-image: fuel-m.svg;} +node|z18-[amenity=fuel], +{font-size: 11;} + +node|z15-[amenity=charging_station][motorcar?], +node|z16-[amenity=charging_station][motorcycle?], +node|z16-[amenity=charging_station][bicycle?], +node|z16-[amenity=charging_station][motorcar=not], +node|z16-[amenity=charging_station], +{icon-image: charging_station-small-m.svg;} + +node|z14[amenity=charging_station][motorcar?][capacity?], +{icon-image: charging_station-s.svg;} +node|z15-[amenity=charging_station][motorcar?][capacity?], +{icon-image: charging_station-m.svg;} + +node|z14[amenity=charging_station][motorcar?][!capacity], +node|z14[amenity=charging_station][motorcar?][capacity=1], +node|z14[amenity=charging_station][motorcar?][capacity=2], +{icon-image: none;} +node|z15-[amenity=charging_station][motorcar?][!capacity], +node|z15-[amenity=charging_station][motorcar?][capacity=1], +node|z15-[amenity=charging_station][motorcar?][capacity=2], +{icon-image: charging_station-small-m.svg;} + +node|z14[amenity=charging_station][motorcar?], +{text-offset: 1;font-size: 10;icon-min-distance: 20;} +node|z15[amenity=charging_station][motorcar?], +{icon-min-distance: 20;} +node|z16[amenity=charging_station], +{icon-min-distance: 10;} +node|z18-[amenity=charging_station], +{font-size: 11;} diff --git a/data/styles/driving/include/icons_label_colors.mapcss b/data/styles/driving/include/icons_label_colors.mapcss new file mode 100644 index 000000000..ed0b61b6a --- /dev/null +++ b/data/styles/driving/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons_label_colors.mapcss"); diff --git a/data/styles/driving/include/priorities_1_BG-by-size.prio.txt b/data/styles/driving/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..5e8eb4f9e --- /dev/null +++ b/data/styles/driving/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,265 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) +# amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-) +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) +# highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) +# highway-services # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-garages # area z13- (also has caption z15-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) +# tourism-information-office # area z15- (also has icon z15-, caption(optional) z15-) +# tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) +# === 170 + +# highway-footway-area # area z14- (also has line z15-, line::border z15-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z14-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-coniferous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-deciduous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z15-, caption(optional) z18-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z15-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z15-) +# natural-beach-gravel # area z10- (also has caption z15-) +# natural-beach-sand # area z10- (also has caption z15-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/driving/include/priorities_2_BG-top.prio.txt b/data/styles/driving/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..cbb6a5a25 --- /dev/null +++ b/data/styles/driving/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,50 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z13- (also has caption z13-) +# waterway-canal # line z13- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z13- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/driving/include/priorities_3_FG.prio.txt b/data/styles/driving/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..10cc8b73e --- /dev/null +++ b/data/styles/driving/include/priorities_3_FG.prio.txt @@ -0,0 +1,606 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z19- (also has line::dash z19-) +# === 350 + +# power-line::dash # line::dash z19- (also has line z19-) +# === 340 + +# highway-ladder # line z15- (also has line::border z15-, icon z17-, pathtext z17-) +# highway-steps # line z15- (also has line::border z15-, pathtext z16-) +# highway-steps-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z16- +# barrier-guard_rail # line z17- +# barrier-hedge # line z16- +# barrier-wall # line z16- +# barrier-yes # line z16- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-world_level # line z4-9 +# highway-world_towns_level # line z6-9 +# === 310 + +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 309 + +# highway-primary # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-) +# highway-primary-bridge # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary-tunnel # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# railway-rail-branch::dash # line::dash z16- (also has line z11-) +# railway-rail-branch-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-branch-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-highspeed::dash # line::dash z16- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z16- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z16- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# railway-rail-tourism-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-) +# === 290 + +# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-) +# === 289 + +# railway-rail-branch # line z11- (also has line::dash z16-) +# railway-rail-branch-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-branch-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z16-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z16-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z16-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-) +# === 279 + +# highway-secondary # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-) +# highway-secondary-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary-tunnel # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z11-, 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-) +# === 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-) +# === 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-) +# === 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-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-) +# === 225 + +# highway-secondary_link # line z13- (also has line::border z15-, pathtext z16-) +# highway-secondary_link-bridge # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# highway-secondary_link-tunnel # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-) +# === 224 + +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-) +# highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +# highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) +# === 223 + +# highway-busway # line z15- (also has line::border z15-, pathtext z16-) +# highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-service # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-area # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# railway-light_rail::dash # line::dash z16- (also has line z13-) +# railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail::dash # line::dash z16- (also has line z11-) +# railway-rail-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z17- (also has line z16-) +# railway-rail-service-bridge::dash # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-) +# railway-rail-service-tunnel::dash # line::dash z17- (also has line(casing) z16-, line z16-) +# railway-rail-spur::dash # line::dash z17- (also has line z15-) +# railway-rail-spur-bridge::dash # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-spur-tunnel::dash # line::dash z17- (also has line(casing) z15-, line z15-) +# railway-rail-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z17- (also has line z13-) +# railway-rail-utility-bridge::dash # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z17- (also has line z13-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-) +# highway-path-bicycle # line z15- (also has line::cycleline z14-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z14- (also has line z15-, pathtext z15-) +# === 219 + +# highway-cycleway # line z13- (also has pathtext z15-) +# highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z11- (also has line::dash z16-) +# railway-rail-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service # line z16- (also has line::dash z17-) +# railway-rail-service-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-service-tunnel # line z16- (also has line(casing) z16-, line::dash z17-) +# railway-rail-spur # line z15- (also has line::dash z17-) +# railway-rail-spur-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-spur-tunnel # line z15- (also has line(casing) z15-, line::dash z17-) +# railway-rail-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-utility # line z13- (also has line::dash z17-) +# railway-rail-utility-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-) +# railway-rail-utility-tunnel # line z13- (also has line::dash z17-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z16- (also has line z16-, line::dash z17-) +# railway-rail-spur-tunnel # line(casing) z15- (also has line z15-, line::dash z17-) +# railway-rail-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-utility-tunnel # line(casing) z14- (also has line z13-, line::dash z17-) +# === 209 + +# highway-ford # line z13- (also has line::border z14-, icon z16-, pathtext z16-) +# highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z14- (also has pathtext z15-) +# highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z15- (also has line::border z15-, pathtext z15-) +# highway-footway-area # line z15- and area z14- (also has line::border z15-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z15- (also has pathtext z15-) +# highway-path-difficult # line z15- (also has pathtext z15-) +# highway-path-expert # line z15- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z15- (also has pathtext z15-) +# highway-track-area # line z15- (also has pathtext z15-) +# highway-track-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z15- (also has pathtext z15-) +# highway-track-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z13- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z16- +# railway-construction # line z15- +# railway-disused # line z16- +# railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z16- +# railway-miniature # line z16- +# railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z16- +# railway-preserved # line z15- +# railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) +# railway-preserved-tunnel # line z15- +# railway-turntable # line z17- +# === 180 + +# highway-footway-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z16- (also has line::border z16-) +# highway-footway-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z15- (also has pathtext z15-) +# highway-path-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# === 163 + +# highway-primary::border # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-) +# === 162 + +# highway-secondary::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-) +# === 161 + +# highway-motorway_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 159 + +# highway-secondary_link::border # line::border z15- (also has line z13-, pathtext z16-) +# === 158 + +# highway-motorway-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# === 157 + +# highway-primary-bridge::border # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 156 + +# highway-secondary-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# === 155 + +# highway-motorway_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# === 153 + +# highway-secondary_link-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# === 152 + +# highway-motorway-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# === 151 + +# highway-primary-tunnel::border # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# === 150 + +# highway-secondary-tunnel::border # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 149 + +# highway-motorway_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 147 + +# highway-secondary_link-tunnel::border # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-) +# === 146 + +# highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-area::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-) +# highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-) +# highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z15- (also has line z15-, pathtext z15-) +# highway-footway-area::border # line::border z15- (also has line z15-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-) +# highway-footway-crossing::border # line::border z16- (also has line z16-) +# highway-footway-sidewalk::border # line::border z16- (also has line z16-) +# highway-ford::border # line::border z14- (also has line z13-, icon z16-, pathtext z16-) +# highway-ladder::border # line::border z15- (also has line z15-, icon z17-, pathtext z17-) +# highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-) +# highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +# highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +# highway-steps::border # line::border z15- (also has line z15-, pathtext z16-) +# === 144 + +# highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 + +# highway-footway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-steps-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# === 142 + +# highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +# highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-) +# highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 + +# highway-footway-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-) +# highway-steps-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# === 140 + +# highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) +# highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +# highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-) +# highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-) +# highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-tourism-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-) +# railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# === 135 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) +# highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-) +# highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-) +# highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-tourism-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-) +# railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# === 130 + +# building # area z14- (also has caption z17-) +# building-garage # area z14- (also has caption z17-) +# building-guardhouse # area z14- (also has icon z18-, caption(optional) z18-) +# building-has_parts # area z14- (also has caption z17-) +# building-train_station # area z14- (also has icon z17-, caption(optional) z17-) +# === 120 + +# piste:type-connection # line z15- +# piste:type-downhill # line z14- (also has pathtext z15-) +# piste:type-downhill-advanced # line z14- (also has pathtext z15-) +# piste:type-downhill-easy # line z14- (also has pathtext z15-) +# piste:type-downhill-expert # line z14- (also has pathtext z15-) +# piste:type-downhill-freeride # line z14- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z14- (also has pathtext z15-) +# piste:type-downhill-novice # line z14- (also has pathtext z15-) +# piste:type-hike # line z15- (also has pathtext z15-) +# piste:type-nordic # line z14- (also has pathtext z15-) +# piste:type-skitour # line z14- (also has pathtext z15-) +# piste:type-sled # line z14- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z14- (also has pathtext z16-) +# natural-earth_bank # line z14- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z14- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z16- +# === 60 + +# isoline-step_10 # line z15- (also has pathtext z17-) +# isoline-step_100 # line z12- (also has pathtext z14-) +# isoline-step_1000 # line z11- (also has pathtext z11-) +# isoline-step_50 # line z14- (also has pathtext z16-) +# isoline-step_500 # line z11- (also has pathtext z12-) +# isoline-zero # line z15- (also has pathtext z17-) +# === 50 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# leisure-nature_reserve # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-) +# === 20 + +# piste:type-snow_park # area z14- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z18- +# === 5 diff --git a/data/styles/driving/include/priorities_4_overlays.prio.txt b/data/styles/driving/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..374ff47a1 --- /dev/null +++ b/data/styles/driving/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2537 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-1 # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-3 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-4 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-5 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-6 # icon z11-17 (also has caption(optional) z12-17) +# leisure-nature_reserve # icon z11-17 and caption z18- (also has caption(optional) z12-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z13- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-) +# === 6250 + +# highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-) +# highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z14- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z13- (also has caption(optional) z13-) +# waterway-waterfall # icon z13- (also has caption(optional) z14-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# place-locality # caption z13- +# place-neighbourhood # caption z13- +# === 5700 + +# highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-) +# highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-) +# === 5600 + +# man_made-communications_tower # icon z14- (also has caption(optional) z15-) +# man_made-lighthouse # icon z13- (also has caption(optional) z14-) +# natural-peak # icon z13- (also has caption(optional) z13-) +# natural-volcano # icon z12- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z14- (also has caption(optional) z15-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z14- (also has caption(optional) z14-) +# === 4950 + +# landuse-forest # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-coniferous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-deciduous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-mixed # icon z13- (also has caption(optional) z14-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z14- (also has caption(optional) z15-) +# natural-geyser # icon z14- (also has caption(optional) z14-) +# natural-hot_spring # icon z14- (also has caption(optional) z15-) +# natural-spring # icon z14- (also has caption(optional) z15-) +# === 4650 + +# natural-saddle # icon z15- (also has caption(optional) z16-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z15- (also has caption(optional) z15-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z15- (also has caption(optional) z15-, area z15-) +# tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-) +# amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z16- (also has caption(optional) z16-) +# amenity-shelter-lean_to # icon z16- (also has caption(optional) z16-) +# emergency-mountain_rescue # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-wilderness_hut # icon z16- (also has caption(optional) z16-) +# === 3900 + +# highway-rest_area # icon z15- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-caravan_site # icon z16- (also has caption(optional) z16-) +# tourism-chalet # icon z16- (also has caption(optional) z16-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-) +# === 3751 + +# amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z15- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z17- (also has caption(optional) z18-) +# === 3500 + +# isoline-step_1000 # pathtext z11- (also has line z11-) +# === 3400 + +# isoline-step_500 # pathtext z12- (also has line z11-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z14- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z15- (also has area z10-) +# natural-beach-gravel # caption z15- (also has area z10-) +# natural-beach-sand # caption z15- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z16-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# 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-) +# === 3100 + +# amenity-water_point # icon z17- (also has caption(optional) z18-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z17- (also has caption(optional) z18-) +# man_made-water_well # icon z17- (also has caption(optional) z18-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z14- (also has line z12-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) +# highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z14-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-) +# highway-secondary_link # pathtext z16- (also has line z13-, line::border z15-) +# highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-) +# === 3000 + +# highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-) +# highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-) +# === 2970 + +# highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-) +# highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-) +# === 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-) +# === 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-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z13-) +# highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 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-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z13-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z13-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z16- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z17- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z14-) +# highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z15-) +# highway-path-bicycle # pathtext z15- (also has line z15-, line::cycleline z14-) +# highway-path-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z15-) +# highway-path-expert # pathtext z15- (also has line z15-) +# highway-path-horse # pathtext z15- (also has line z15-) +# 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-) +# === 2810 + +# highway-track # pathtext z15- (also has line z15-) +# highway-track-area # pathtext z15- (also has line z15-) +# highway-track-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z15-) +# 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-) +# 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z14-) +# piste:type-downhill-freeride # pathtext z15- (also has line z14-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z14-) +# piste:type-downhill-novice # pathtext z15- (also has line z14-) +# piste:type-hike # pathtext z15- (also has line z15-) +# piste:type-nordic # pathtext z15- (also has line z14-) +# piste:type-skitour # pathtext z15- (also has line z14-) +# piste:type-sled # pathtext z15- (also has line z14-) +# piste:type-snow_park # caption z15- (also has area z14-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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-) +# 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z18- (also has caption(optional) z18-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z16-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z16- (also has caption(optional) z16-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z16- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z16- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z17- (also has caption(optional) z17-) +# amenity-shelter-public_transport # icon z17- (also has caption(optional) z17-) +# emergency-lifeguard # icon z17- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z16- (also has line z14-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z16- (also has line z14-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z17- (also has caption(optional) z17-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) +# man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) +# natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) +# === 1200 + +# isoline-step_10 # pathtext z17- (also has line z15-) +# isoline-zero # pathtext z17- (also has line z15-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z17- +# man_made-flare # icon z16- (also has caption(optional) z18-) +# man_made-mast-communication # icon z16- +# man_made-tower # icon z16- (also has caption(optional) z18-) +# man_made-tower-communication # icon z16- (also has caption(optional) z18-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z18- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z18- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z18- (also has caption(optional) z18-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z18- (also has caption(optional) z18-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z16- +# man_made-silo # icon z16- (also has caption(optional) z18-) +# man_made-storage_tank # icon z16- (also has caption(optional) z18-) +# man_made-water_tower # icon z16- (also has caption(optional) z18-) +# power-portal # icon z19- +# power-tower # icon z19- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z18- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z15- (also has caption(optional) z16-, area z13-) +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z17- +# spherical_buoy-cardinal-north # icon z17- +# spherical_buoy-cardinal-south # icon z17- +# spherical_buoy-cardinal-west # icon z17- +# spherical_buoy-isolated_danger # icon z17- +# spherical_buoy-lateral-port # icon z17- +# spherical_buoy-lateral-starboard # icon z17- +# spherical_buoy-safe_water # icon z17- +# spherical_buoy-special_purpose # icon z17- +# === 216 + +# beacon-cardinal-east # icon z16- +# beacon-cardinal-north # icon z16- +# beacon-cardinal-south # icon z16- +# beacon-cardinal-west # icon z16- +# beacon-isolated_danger # icon z16- +# beacon-lateral-port # icon z16- +# beacon-lateral-starboard # icon z16- +# beacon-safe_water # icon z16- +# beacon-special_purpose # icon z16- +# buoy-cardinal-east # icon z16- +# buoy-cardinal-north # icon z16- +# buoy-cardinal-south # icon z16- +# buoy-cardinal-west # icon z16- +# buoy-isolated_danger # icon z16- +# buoy-lateral-port # icon z16- +# buoy-lateral-starboard # icon z16- +# buoy-safe_water # icon z16- +# buoy-special_purpose # icon z16- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z17- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z15- (also has caption(optional) z18-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-1 # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-3 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-4 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-5 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-6 # caption(optional) z12-17 (also has icon z11-17) +# leisure-nature_reserve # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z13-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z14-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z13- (also has icon z13-) +# waterway-waterfall # caption(optional) z14- (also has icon z13-) +# === -4200 + +# man_made-communications_tower # caption(optional) z15- (also has icon z14-) +# man_made-lighthouse # caption(optional) z14- (also has icon z13-) +# natural-peak # caption(optional) z13- (also has icon z13-) +# natural-volcano # caption(optional) z13- (also has icon z12-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z15- (also has icon z14-) +# === -4950 + +# tourism-viewpoint # caption(optional) z14- (also has icon z14-) +# === -5050 + +# landuse-forest # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-coniferous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-deciduous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-mixed # caption(optional) z14- (also has icon z13-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z15- (also has icon z14-) +# natural-geyser # caption(optional) z14- (also has icon z14-) +# natural-hot_spring # caption(optional) z15- (also has icon z14-) +# natural-spring # caption(optional) z15- (also has icon z14-) +# === -5350 + +# natural-saddle # caption(optional) z16- (also has icon z15-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z15- (also has icon z15-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z15- (also has icon z15-, area z15-) +# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-) +# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z16- (also has icon z16-) +# amenity-shelter-lean_to # caption(optional) z16- (also has icon z16-) +# emergency-mountain_rescue # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-wilderness_hut # caption(optional) z16- (also has icon z16-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z15-, area z13-) +# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-caravan_site # caption(optional) z16- (also has icon z16-) +# tourism-chalet # caption(optional) z16- (also has icon z16-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z15-) +# === -6400 + +# amenity-drinking_water # caption(optional) z18- (also has icon z17-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z18- (also has icon z17-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z18- (also has icon z17-) +# man_made-water_well # caption(optional) z18- (also has icon z17-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z17-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z18- (also has icon z18-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z16-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z16- (also has icon z16-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z16-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z16-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z17- (also has icon z17-) +# amenity-shelter-public_transport # caption(optional) z17- (also has icon z17-) +# emergency-lifeguard # caption(optional) z18- (also has icon z17-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-) +# leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) +# man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) +# natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flare # caption(optional) z18- (also has icon z16-) +# man_made-tower # caption(optional) z18- (also has icon z16-) +# man_made-tower-communication # caption(optional) z18- (also has icon z16-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z18-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z18-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z18- (also has icon z18-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z18- (also has icon z18-) +# man_made-silo # caption(optional) z18- (also has icon z16-) +# man_made-storage_tank # caption(optional) z18- (also has icon z16-) +# man_made-water_tower # caption(optional) z18- (also has icon z16-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z18-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z15-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z17-) +# power-generator-wind # caption(optional) z18- (also has icon z15-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z19- (also has caption(optional) z19-) +# man_made-survey_point # icon z18- (also has caption(optional) z18-) +# tourism-information # icon z16- (also has caption(optional) z16-) +# tourism-information-board # icon z16- (also has caption(optional) z16-) +# tourism-information-guidepost # icon z16- (also has caption(optional) z16-) +# tourism-information-map # icon z16- (also has caption(optional) z16-) +# tourism-information-tactile_map # icon z16- (also has caption(optional) z16-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z17- (also has icon z17-, caption z17-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z19- (also has icon z19-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z16- (also has icon z16-) +# tourism-information-map # caption(optional) z16- (also has icon z16-) +# tourism-information-tactile_map # caption(optional) z16- (also has icon z16-) +# === -10000 diff --git a/data/styles/driving/include/transit_systems.mapcss b/data/styles/driving/include/transit_systems.mapcss new file mode 100644 index 000000000..7cbd435f6 --- /dev/null +++ b/data/styles/driving/include/transit_systems.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/transit_systems.mapcss"); diff --git a/data/styles/driving/include/ways.mapcss b/data/styles/driving/include/ways.mapcss new file mode 100644 index 000000000..a126f1321 --- /dev/null +++ b/data/styles/driving/include/ways.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways.mapcss"); diff --git a/data/styles/driving/include/ways_label.mapcss b/data/styles/driving/include/ways_label.mapcss new file mode 100644 index 000000000..fb0627ff0 --- /dev/null +++ b/data/styles/driving/include/ways_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways_label.mapcss"); diff --git a/data/styles/driving/light/colors.mapcss b/data/styles/driving/light/colors.mapcss new file mode 100644 index 000000000..0f80e9a02 --- /dev/null +++ b/data/styles/driving/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/light/colors.mapcss"); diff --git a/data/styles/driving/light/style.mapcss b/data/styles/driving/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/driving/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/driving_outdoor/dark/colors.mapcss b/data/styles/driving_outdoor/dark/colors.mapcss new file mode 100644 index 000000000..3f2f2ad7f --- /dev/null +++ b/data/styles/driving_outdoor/dark/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/dark/colors.mapcss"); +@import("../../outdoor/dark/colors.mapcss"); diff --git a/data/styles/driving_outdoor/dark/style.mapcss b/data/styles/driving_outdoor/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/driving_outdoor/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/driving_outdoor/include/basemap.mapcss b/data/styles/driving_outdoor/include/basemap.mapcss new file mode 100644 index 000000000..57e7518b6 --- /dev/null +++ b/data/styles/driving_outdoor/include/basemap.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/basemap.mapcss"); +@import("../../outdoor/include/basemap.mapcss"); diff --git a/data/styles/driving_outdoor/include/basemap_label.mapcss b/data/styles/driving_outdoor/include/basemap_label.mapcss new file mode 100644 index 000000000..2239e1ba4 --- /dev/null +++ b/data/styles/driving_outdoor/include/basemap_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/basemap_label.mapcss"); +@import("../../outdoor/include/basemap_label.mapcss"); diff --git a/data/styles/driving_outdoor/include/icons.mapcss b/data/styles/driving_outdoor/include/icons.mapcss new file mode 100644 index 000000000..1d47b1c5f --- /dev/null +++ b/data/styles/driving_outdoor/include/icons.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/icons.mapcss"); +@import("../../outdoor/include/icons.mapcss"); diff --git a/data/styles/driving_outdoor/include/icons_label_colors.mapcss b/data/styles/driving_outdoor/include/icons_label_colors.mapcss new file mode 100644 index 000000000..90199cade --- /dev/null +++ b/data/styles/driving_outdoor/include/icons_label_colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/icons_label_colors.mapcss"); +@import("../../outdoor/include/icons_label_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/driving_outdoor/include/priorities_1_BG-by-size.prio.txt b/data/styles/driving_outdoor/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..dc6ff2215 --- /dev/null +++ b/data/styles/driving_outdoor/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,266 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../driving/include/priorities_1_BG-by-size.prio.txt") +@import("../../outdoor/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) +# amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon 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-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-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) +# tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +# 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 z16-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z13-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z14-) +# natural-beach-gravel # area z10- (also has caption z14-) +# natural-beach-sand # area z10- (also has caption z14-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/driving_outdoor/include/priorities_2_BG-top.prio.txt b/data/styles/driving_outdoor/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..807962a4a --- /dev/null +++ b/data/styles/driving_outdoor/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,51 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../driving/include/priorities_2_BG-top.prio.txt") +@import("../../outdoor/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z11- (also has caption z13-) +# waterway-canal # line z12- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z12- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/driving_outdoor/include/priorities_3_FG.prio.txt b/data/styles/driving_outdoor/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..d9b1cdd68 --- /dev/null +++ b/data/styles/driving_outdoor/include/priorities_3_FG.prio.txt @@ -0,0 +1,616 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../driving/include/priorities_3_FG.prio.txt") +@import("../../outdoor/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z13- (also has line::dash z13-, pathtext z15-) +# power-minor_line # line z15- (also has line::dash z15-) +# === 350 + +# power-line::dash # line::dash z13- (also has line z13-, pathtext z15-) +# power-minor_line::dash # line::dash z15- (also has line z15-) +# === 340 + +# highway-ladder # line z12- (also has line::border z16-, icon z16-, pathtext z17-) +# highway-steps # line z12- (also has line::border z16-, pathtext z16-) +# highway-steps-bridge # line z12- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z12- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z15- +# barrier-guard_rail # line z16- +# barrier-hedge # line z16- +# barrier-wall # line z15- +# barrier-yes # line z15- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z10-, 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 z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z10-, 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-) +# 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-) +# railway-rail-highspeed::dash # line::dash z15- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z15- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z15- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# 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-) +# === 289 + +# railway-rail-branch # line z10- (also has line::dash z15-) +# railway-rail-branch-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-branch-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z15-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z15-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z15-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border 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 z11-, pathtext z13-) +# highway-unclassified-area # line z11- (also has line::border z11-, pathtext z13-) +# highway-unclassified-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# highway-unclassified-tunnel # line z11- (also has line::border z11-, 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 z11-, pathtext z13-) +# === 249 + +# highway-living_street # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-bridge # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z14-) +# highway-residential # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-bridge # line z12- (also has line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-residential-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road # line z12- (also has line::border z12-, pathtext z14-) +# highway-road-bridge # line z12- (also has line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-road-tunnel # line z12- (also has line::border z12-, pathtext z14-) +# === 230 + +# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z14-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z13-, shield::shield z15-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z11-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border 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-) +# === 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-) +# === 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 z13-, pathtext z16-) +# highway-service-area # line z13- (also has line::border z13-, pathtext z16-) +# highway-service-bridge # line z13- (also has line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z13- (also has line::border z13-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, line::border 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-) +# railway-rail-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z16- (also has line z15-) +# railway-rail-service-bridge::dash # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-service-tunnel::dash # line::dash z16- (also has line(casing) z15-, line z15-) +# railway-rail-spur::dash # line::dash z16- (also has line z14-) +# railway-rail-spur-bridge::dash # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-) +# railway-rail-spur-tunnel::dash # line::dash z16- (also has line(casing) z14-, line z14-) +# railway-rail-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z16- (also has line z12-) +# railway-rail-utility-bridge::dash # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z16- (also has line z12-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z11- (also has line::border z12-, line::cycleline z13-, pathtext z15-) +# highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, line::border z12-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z15-) +# === 219 + +# highway-cycleway # line z11- (also has pathtext z15-) +# highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z10- (also has line::dash z15-) +# railway-rail-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service # line z15- (also has line::dash z16-) +# railway-rail-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-service-tunnel # line z15- (also has line(casing) z15-, line::dash z16-) +# railway-rail-spur # line z14- (also has line::dash z16-) +# railway-rail-spur-bridge # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) +# railway-rail-spur-tunnel # line z14- (also has line(casing) z14-, line::dash z16-) +# railway-rail-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-utility # line z12- (also has line::dash z16-) +# railway-rail-utility-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-utility-tunnel # line z12- (also has line::dash z16-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z15- (also has line z15-, line::dash z16-) +# railway-rail-spur-tunnel # line(casing) z14- (also has line z14-, line::dash z16-) +# railway-rail-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z11- (also has pathtext z15-) +# highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z11- (also has line::border z16-, pathtext z15-) +# highway-footway-area # line z11- and area z14- (also has line::border z16-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z11- (also has pathtext z15-) +# highway-path-difficult # line z11- (also has pathtext z15-) +# highway-path-expert # line z11- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z11- (also has pathtext z15-) +# highway-track-area # line z11- (also has pathtext z15-) +# highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z11- (also has pathtext z15-) +# highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z11- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z13- +# railway-construction # line z13- +# railway-disused # line z13- +# railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z13- +# railway-miniature # line z13- +# railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z13- +# 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 + +# highway-footway-bridge # line z11- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z13- (also has line::border z16-) +# highway-footway-tunnel # line z11- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z11- (also has pathtext z15-) +# highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::border z16-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::border z16-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::border z16-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::border z16-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z10- (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 z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z11- (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 z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z10- (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 z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z11- (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 z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z10- (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 z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z11- (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 z12- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-area::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-driveway::border # line::border z15- (also has line z15-, 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 z11- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z11- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z16- (also has line z11-, pathtext z15-) +# highway-footway-area::border # line::border z16- (also has line z11-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z12- (also has line z11-, line::cycleline z13-, pathtext z15-) +# 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 z16- (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 z16- (also has line z12-, 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 z12- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z13- (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 z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 + +# highway-footway-bridge::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, 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 z12- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z13- (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 z11- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 + +# highway-footway-tunnel::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# === 140 + +# highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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 z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z12-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::border z16-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z16-, line::dash z16-) +# 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 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::border z16-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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 z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z12-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::border z16-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z14-, line::bridgewhite z14-, line::dash z16-) +# 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 + +# 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 + +# piste:type-connection # line z15- +# piste:type-downhill # line z12- (also has pathtext z15-) +# piste:type-downhill-advanced # line z12- (also has pathtext z15-) +# piste:type-downhill-easy # line z12- (also has pathtext z15-) +# piste:type-downhill-expert # line z12- (also has pathtext z15-) +# piste:type-downhill-freeride # line z12- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z12- (also has pathtext z15-) +# piste:type-downhill-novice # line z12- (also has pathtext z15-) +# piste:type-hike # line z12- (also has pathtext z15-) +# piste:type-nordic # line z12- (also has pathtext z15-) +# piste:type-skitour # line z12- (also has pathtext z15-) +# piste:type-sled # line z12- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z12- (also has pathtext z14-) +# natural-earth_bank # line z12- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z13- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z15- +# === 60 + +# 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 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# leisure-nature_reserve # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) +# === 20 + +# piste:type-downhill-advanced-area # area z13- +# piste:type-downhill-area # area z13- +# piste:type-downhill-easy-area # area z13- +# piste:type-downhill-expert-area # area z13- +# piste:type-downhill-intermediate-area # area z13- +# piste:type-downhill-novice-area # area z13- +# piste:type-sled-area # area z13- +# piste:type-snow_park # area z13- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z15- +# === 5 diff --git a/data/styles/driving_outdoor/include/priorities_4_overlays.prio.txt b/data/styles/driving_outdoor/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..c1939c8e7 --- /dev/null +++ b/data/styles/driving_outdoor/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2544 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../driving/include/priorities_4_overlays.prio.txt") +@import("../../outdoor/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-5 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-6 # icon z10-17 (also has caption(optional) z11-17) +# leisure-nature_reserve # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z13- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# 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-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z12- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z11- (also has caption(optional) z11-) +# waterway-waterfall # icon z10- (also has caption(optional) z11-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# 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-) +# === 5600 + +# man_made-communications_tower # icon z12- (also has caption(optional) z13-) +# man_made-lighthouse # icon z11- (also has caption(optional) z14-) +# natural-peak # icon z10- (also has caption(optional) z11-) +# natural-volcano # icon z10- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z11- (also has caption(optional) z12-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z11- (also has caption(optional) z13-) +# === 4950 + +# landuse-forest # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z10- (also has caption(optional) z11-) +# natural-geyser # icon z10- (also has caption(optional) z12-) +# natural-hot_spring # icon z12- (also has caption(optional) z15-) +# natural-spring # icon z12- (also has caption(optional) z14-) +# === 4650 + +# natural-saddle # icon z13- (also has caption(optional) z15-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +# tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-) +# amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) +# amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) +# emergency-mountain_rescue # icon z12- (also has caption(optional) z12-, area z13-) +# tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) +# === 3900 + +# highway-rest_area # icon z14- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) +# tourism-caravan_site # icon z13- (also has caption(optional) z13-) +# tourism-chalet # icon z14- (also has caption(optional) z14-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-) +# === 3751 + +# amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z15- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z12- (also has caption(optional) z14-) +# === 3500 + +# isoline-step_1000 # pathtext z10- (also has line z10-) +# === 3400 + +# isoline-step_500 # pathtext z11- (also has line z10-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z13- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z14- (also has area z10-) +# natural-beach-gravel # caption z14- (also has area z10-) +# natural-beach-sand # caption z14- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z15-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z15-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# waterway-river # pathtext z11- (also has line z10-) +# === 3150 + +# highway-unclassified # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-area # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z11-, line(casing) z16-) +# === 3100 + +# amenity-water_point # icon z12- (also has caption(optional) z14-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z12- (also has caption(optional) z14-) +# man_made-water_well # icon z12- (also has caption(optional) z14-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z13- (also has line z11-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# 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 z12-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z12-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z12-) +# 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-) +# === 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-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-) +# === 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-) +# === 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 z12-) +# highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-) +# highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line(casing) z16-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z11-) +# highway-cycleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2953 + +# area:highway-footway # caption z15- (also has area z14-) +# highway-footway # pathtext z15- (also has line z11-, line::border z16-) +# highway-footway-area # pathtext z15- (also has line z11-, line::border z16-, area z14-) +# highway-footway-bicycle # pathtext z15- (also has line z11-, line::border z12-, line::cycleline z13-) +# highway-footway-bridge # pathtext z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-footway-tunnel # pathtext z15- (also has line z11-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +# highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z12-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z12-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z14- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z11-) +# highway-bridleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z11-) +# highway-path-bicycle # pathtext z15- (also has line z11-, line::cycleline z12-) +# highway-path-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z11-) +# highway-path-expert # pathtext z15- (also has line z11-) +# highway-path-horse # pathtext z15- (also has line z11-) +# highway-path-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2820 + +# highway-steps # pathtext z16- (also has line z12-, line::border z16-) +# highway-steps-bridge # pathtext z16- (also has line z12-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-steps-tunnel # pathtext z16- (also has line z12-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2810 + +# highway-track # pathtext z15- (also has line z11-) +# highway-track-area # pathtext z15- (also has line z11-) +# highway-track-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z11-) +# highway-track-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2780 + +# highway-service # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-area # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-) +# highway-service-driveway # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-tunnel # pathtext z16- (also has line z13-, line::border 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z12-) +# piste:type-downhill-freeride # pathtext z15- (also has line z12-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z12-) +# piste:type-downhill-novice # pathtext z15- (also has line z12-) +# piste:type-hike # pathtext z15- (also has line z12-) +# piste:type-nordic # pathtext z15- (also has line z12-) +# piste:type-skitour # pathtext z15- (also has line z12-) +# piste:type-sled # pathtext z15- (also has line z12-) +# piste:type-snow_park # caption z15- (also has area z13-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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 z12-) +# highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z12-) +# highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z14- (also has caption(optional) z15-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z15-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z14- (also has caption(optional) z14-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z15- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z14- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z12- (also has caption(optional) z13-) +# amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) +# emergency-lifeguard # icon z14- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z14- (also has line z12-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z15- (also has line z13-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z15- (also has caption(optional) z16-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) +# man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) +# natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) +# === 1200 + +# isoline-step_10 # pathtext z16- (also has line z15-) +# isoline-zero # pathtext z15- (also has line z15-) +# power-line # pathtext z15- (also has line z13-, line::dash z13-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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 z16-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z13- (also has caption(optional) z14-) +# man_made-flare # icon z13- (also has caption(optional) z18-) +# man_made-mast-communication # icon z13- (also has caption(optional) z14-) +# man_made-tower # icon z13- (also has caption(optional) z14-) +# man_made-tower-communication # icon z13- (also has caption(optional) z14-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z15- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z17- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z16- (also has caption(optional) z17-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z16- (also has caption(optional) z17-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z13- (also has caption(optional) z14-) +# man_made-silo # icon z13- (also has caption(optional) z14-) +# man_made-storage_tank # icon z13- (also has caption(optional) z14-) +# man_made-water_tower # icon z13- (also has caption(optional) z14-) +# power-portal # icon z13- +# power-tower # icon z13- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# man_made-utility_pole # icon z15- +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z13- (also has caption(optional) z16-, area z13-) +# power-pole # icon z15- +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z15- +# spherical_buoy-cardinal-north # icon z15- +# spherical_buoy-cardinal-south # icon z15- +# spherical_buoy-cardinal-west # icon z15- +# spherical_buoy-isolated_danger # icon z15- +# spherical_buoy-lateral-port # icon z15- +# spherical_buoy-lateral-starboard # icon z15- +# spherical_buoy-safe_water # icon z15- +# spherical_buoy-special_purpose # icon z15- +# === 216 + +# beacon-cardinal-east # icon z13- +# beacon-cardinal-north # icon z13- +# beacon-cardinal-south # icon z13- +# beacon-cardinal-west # icon z13- +# beacon-isolated_danger # icon z13- +# beacon-lateral-port # icon z13- +# beacon-lateral-starboard # icon z13- +# beacon-safe_water # icon z13- +# beacon-special_purpose # icon z13- +# buoy-cardinal-east # icon z13- +# buoy-cardinal-north # icon z13- +# buoy-cardinal-south # icon z13- +# buoy-cardinal-west # icon z13- +# buoy-isolated_danger # icon z13- +# buoy-lateral-port # icon z13- +# buoy-lateral-starboard # icon z13- +# buoy-safe_water # icon z13- +# buoy-special_purpose # icon z13- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z14- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z13- (also has caption(optional) z16-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z15- and caption z16- (also has caption(optional) z16-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-1 # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-3 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-4 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-5 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-6 # caption(optional) z11-17 (also has icon z10-17) +# leisure-nature_reserve # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z13-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z12-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z11- (also has icon z11-) +# waterway-waterfall # caption(optional) z11- (also has icon z10-) +# === -4200 + +# man_made-communications_tower # caption(optional) z13- (also has icon z12-) +# man_made-lighthouse # caption(optional) z14- (also has icon z11-) +# natural-peak # caption(optional) z11- (also has icon z10-) +# natural-volcano # caption(optional) z13- (also has icon z10-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z12- (also has icon z11-) +# === -4950 + +# tourism-viewpoint # caption(optional) z13- (also has icon z11-) +# === -5050 + +# landuse-forest # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-coniferous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-deciduous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-mixed # caption(optional) z13- (also has icon z12-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z11- (also has icon z10-) +# natural-geyser # caption(optional) z12- (also has icon z10-) +# natural-hot_spring # caption(optional) z15- (also has icon z12-) +# natural-spring # caption(optional) z14- (also has icon z12-) +# === -5350 + +# natural-saddle # caption(optional) z15- (also has icon z13-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z14- (also has icon z13-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z14- (also has icon z13-, area z15-) +# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-) +# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z13- (also has icon z12-) +# amenity-shelter-lean_to # caption(optional) z13- (also has icon z12-) +# emergency-mountain_rescue # caption(optional) z12- (also has icon z12-, area z13-) +# tourism-wilderness_hut # caption(optional) z13- (also has icon z12-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z14-, area z13-) +# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-) +# tourism-caravan_site # caption(optional) z13- (also has icon z13-) +# tourism-chalet # caption(optional) z14- (also has icon z14-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z15-) +# === -6400 + +# amenity-drinking_water # caption(optional) z14- (also has icon z12-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z14- (also has icon z12-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z14- (also has icon z12-) +# man_made-water_well # caption(optional) z14- (also has icon z12-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z14-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z15- (also has icon z14-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z15-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z14- (also has icon z14-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z15-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z14-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z13- (also has icon z12-) +# amenity-shelter-public_transport # caption(optional) z14- (also has icon z14-) +# emergency-lifeguard # caption(optional) z18- (also has icon z14-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-) +# leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) +# man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) +# natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flagpole # caption(optional) z14- (also has icon z13-) +# man_made-flare # caption(optional) z18- (also has icon z13-) +# man_made-mast-communication # caption(optional) z14- (also has icon z13-) +# man_made-tower # caption(optional) z14- (also has icon z13-) +# man_made-tower-communication # caption(optional) z14- (also has icon z13-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z15-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z17-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z17- (also has icon z16-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z17- (also has icon z16-) +# man_made-mast # caption(optional) z14- (also has icon z13-) +# man_made-silo # caption(optional) z14- (also has icon z13-) +# man_made-storage_tank # caption(optional) z14- (also has icon z13-) +# man_made-water_tower # caption(optional) z14- (also has icon z13-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z16-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z14-) +# power-generator-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z17- (also has caption(optional) z17-) +# man_made-survey_point # icon z14- (also has caption(optional) z15-) +# tourism-information # icon z15- (also has caption(optional) z15-) +# tourism-information-board # icon z15- (also has caption(optional) z15-) +# tourism-information-guidepost # icon z15- (also has caption(optional) z15-) +# tourism-information-map # icon z15- (also has caption(optional) z15-) +# tourism-information-tactile_map # icon z15- (also has caption(optional) z15-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z16- (also has icon z15-, caption z16-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z17- (also has icon z17-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z15- (also has icon z15-) +# tourism-information-map # caption(optional) z15- (also has icon z15-) +# tourism-information-tactile_map # caption(optional) z15- (also has icon z15-) +# === -10000 diff --git a/data/styles/driving_outdoor/include/transit_systems.mapcss b/data/styles/driving_outdoor/include/transit_systems.mapcss new file mode 100644 index 000000000..f8660e895 --- /dev/null +++ b/data/styles/driving_outdoor/include/transit_systems.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/transit_systems.mapcss"); +@import("../../outdoor/include/transit_systems.mapcss"); diff --git a/data/styles/driving_outdoor/include/ways.mapcss b/data/styles/driving_outdoor/include/ways.mapcss new file mode 100644 index 000000000..6e910f34a --- /dev/null +++ b/data/styles/driving_outdoor/include/ways.mapcss @@ -0,0 +1,23 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/ways.mapcss"); +@import("../../outdoor/include/ways.mapcss"); + +/* Make all roads more contrast */ +line|z6[highway=trunk], +line|z6[highway=motorway], +{opacity: 0.7;} +line|z7-[highway=trunk], +line|z7-[highway=motorway], +line|z10-[highway=motorway_link], +line|z10-[highway=trunk_link], +line|z8-[highway=primary], +line|z11-[highway=primary_link], +line|z10-[highway=secondary], +line|z13-[highway=secondary_link], +line|z12-[highway=residential], +line|z11-[highway=tertiary], +line|z14-[highway=tertiary_link], +line|z11-[highway=unclassified], +line|z12-[highway=road], +line|z12-[highway=living_street], +{opacity: 1;} diff --git a/data/styles/driving_outdoor/include/ways_label.mapcss b/data/styles/driving_outdoor/include/ways_label.mapcss new file mode 100644 index 000000000..df07a190a --- /dev/null +++ b/data/styles/driving_outdoor/include/ways_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/include/ways_label.mapcss"); +@import("../../outdoor/include/ways_label.mapcss"); diff --git a/data/styles/driving_outdoor/light/colors.mapcss b/data/styles/driving_outdoor/light/colors.mapcss new file mode 100644 index 000000000..f1e0242dc --- /dev/null +++ b/data/styles/driving_outdoor/light/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../driving/light/colors.mapcss"); +@import("../../outdoor/light/colors.mapcss"); diff --git a/data/styles/driving_outdoor/light/style.mapcss b/data/styles/driving_outdoor/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/driving_outdoor/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/outdoors/dark/colors.mapcss b/data/styles/outdoor/dark/colors.mapcss similarity index 71% rename from data/styles/outdoors/dark/colors.mapcss rename to data/styles/outdoor/dark/colors.mapcss index 7df685894..17fb784db 100644 --- a/data/styles/outdoors/dark/colors.mapcss +++ b/data/styles/outdoor/dark/colors.mapcss @@ -1,6 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/dark/colors.mapcss"); - @railway_dark: #434343; @tertiary: #616060; diff --git a/data/styles/outdoor/dark/style.mapcss b/data/styles/outdoor/dark/style.mapcss new file mode 100644 index 000000000..830006c93 --- /dev/null +++ b/data/styles/outdoor/dark/style.mapcss @@ -0,0 +1,8 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoor/include/basemap.mapcss similarity index 98% rename from data/styles/outdoors/include/Basemap.mapcss rename to data/styles/outdoor/include/basemap.mapcss index 8d3a0b760..b51e77b4c 100644 --- a/data/styles/outdoors/include/Basemap.mapcss +++ b/data/styles/outdoor/include/basemap.mapcss @@ -1,7 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/include/Basemap.mapcss"); - - /* 6.WATER */ line|z10-[waterway=river], diff --git a/data/styles/outdoors/include/Basemap_label.mapcss b/data/styles/outdoor/include/basemap_label.mapcss similarity index 91% rename from data/styles/outdoors/include/Basemap_label.mapcss rename to data/styles/outdoor/include/basemap_label.mapcss index 14a074212..87d4dc4f0 100644 --- a/data/styles/outdoors/include/Basemap_label.mapcss +++ b/data/styles/outdoor/include/basemap_label.mapcss @@ -1,6 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/include/Basemap_label.mapcss"); - /* Barriers, cliffs */ line|z14-[natural=cliff], diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoor/include/icons.mapcss similarity index 99% rename from data/styles/outdoors/include/Icons.mapcss rename to data/styles/outdoor/include/icons.mapcss index 6e411a311..0783a957c 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoor/include/icons.mapcss @@ -1,7 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/include/Icons.mapcss"); - - /* 2. NATURAL */ node|z11-[natural=cave_entrance], diff --git a/data/styles/outdoor/include/icons_label_colors.mapcss b/data/styles/outdoor/include/icons_label_colors.mapcss new file mode 100644 index 000000000..e69de29bb diff --git a/data/styles/outdoor/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoor/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..eb6ed288a --- /dev/null +++ b/data/styles/outdoor/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,2 @@ +amenity-courthouse +=== 180 diff --git a/data/styles/outdoor/include/priorities_2_BG-top.prio.txt b/data/styles/outdoor/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..e69de29bb diff --git a/data/styles/outdoor/include/priorities_3_FG.prio.txt b/data/styles/outdoor/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..8bc289b87 --- /dev/null +++ b/data/styles/outdoor/include/priorities_3_FG.prio.txt @@ -0,0 +1,14 @@ +power-minor_line +=== 350 + +power-minor_line::dash +=== 340 + +piste:type-downhill-advanced-area +piste:type-downhill-area +piste:type-downhill-easy-area +piste:type-downhill-expert-area +piste:type-downhill-intermediate-area +piste:type-downhill-novice-area +piste:type-sled-area +=== 15 diff --git a/data/styles/outdoor/include/priorities_4_overlays.prio.txt b/data/styles/outdoor/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..24cce1186 --- /dev/null +++ b/data/styles/outdoor/include/priorities_4_overlays.prio.txt @@ -0,0 +1,6 @@ +power-line +=== 1000 + +man_made-utility_pole +power-pole +=== 230 diff --git a/data/styles/outdoor/include/transit_systems.mapcss b/data/styles/outdoor/include/transit_systems.mapcss new file mode 100644 index 000000000..e69de29bb diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoor/include/ways.mapcss similarity index 99% rename from data/styles/outdoors/include/Roads.mapcss rename to data/styles/outdoor/include/ways.mapcss index 0e7b7f342..a73b48c48 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoor/include/ways.mapcss @@ -1,7 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/include/Roads.mapcss"); - - /* Make all roads more contrast */ line|z6[highway=trunk], line|z6[highway=motorway], diff --git a/data/styles/outdoor/include/ways_label.mapcss b/data/styles/outdoor/include/ways_label.mapcss new file mode 100644 index 000000000..e69de29bb diff --git a/data/styles/outdoors/light/colors.mapcss b/data/styles/outdoor/light/colors.mapcss similarity index 75% rename from data/styles/outdoors/light/colors.mapcss rename to data/styles/outdoor/light/colors.mapcss index 69949afed..067e67156 100644 --- a/data/styles/outdoors/light/colors.mapcss +++ b/data/styles/outdoor/light/colors.mapcss @@ -1,6 +1,3 @@ -/* Keep here changes of the base map style file only. */ -@import("../../default/light/colors.mapcss"); - @cycleway: #534DEB; /* slightly darker than in main */ @pedestrian: #FFFFFF; /* slightly lighter than in main */ @@ -17,4 +14,4 @@ @primary1_border: #806021; @primary2_border: #75581F; @secondary0_border: #80682D; -@secondary1_border: #755F2A; +@secondary1_border: #755F2A; \ No newline at end of file diff --git a/data/styles/outdoor/light/style.mapcss b/data/styles/outdoor/light/style.mapcss new file mode 100644 index 000000000..830006c93 --- /dev/null +++ b/data/styles/outdoor/light/style.mapcss @@ -0,0 +1,8 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); diff --git a/data/styles/outdoors/dark/style.mapcss b/data/styles/outdoors/dark/style.mapcss deleted file mode 100644 index 6e5b0cc51..000000000 --- a/data/styles/outdoors/dark/style.mapcss +++ /dev/null @@ -1,134 +0,0 @@ -@import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - -colors -{ - GuiText-color: #FFFFFF; - GuiText-opacity: 0.7; - MyPositionAccuracy-color: #FFFFFF; - MyPositionAccuracy-opacity: 0.06; - Selection-color: #FFFFFF; - Selection-opacity: 0.64; - Route-color: #0087FF; - RouteOutline-color: #055FCD; - RouteTrafficG0-color: #5E0F0D; - RouteTrafficG1-color: #7F1311; - RouteTrafficG2-color: #7F1311; - RouteTrafficG3-color: #9E8216; - RouteTrafficG3-opacity: 0.0; - RoutePedestrian-color: #FFB94B; - RoutePedestrian-opacity: 0.7; - RouteBicycle-color: #FF4B8C; - RouteBicycle-opacity: 0.7; - RouteRuler-color: #924ab5; - RouteRuler-opacity: 0.7; - RoutePreview-color: #FFFFFF; - RoutePreview-opacity: 0.3; - RouteMaskCar-color: #000000; - RouteMaskCar-opacity: 0.5; - RouteFirstSegmentArrowsMaskCar-color: #055FCD; - RouteFirstSegmentArrowsMaskCar-opacity: 0.0; - RouteArrowsMaskCar-color: #055FCD; - RouteArrowsMaskCar-opacity: 0.3; - RouteMaskBicycle-color: #000000; - RouteMaskBicycle-opacity: 0.5; - RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C; - RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0; - RouteArrowsMaskBicycle-color: #FF4B8C; - RouteArrowsMaskBicycle-opacity: 0.5; - RouteMaskPedestrian-color: #000000; - RouteMaskPedestrian-opacity: 0.5; - RouteFake-color: #A8A8A8; - RouteFakeOutline-color: #717171; - Arrow3D-color: #41C8FF; - Arrow3DObsolete-color: #82AAC8; - Arrow3DObsolete-opacity: 0.72; - Arrow3DShadow-color: #3C3C3C; - Arrow3DShadow-opacity: 0.24; - Arrow3DOutline-color: #FFFFFF; - TrackHumanSpeed-color: #FF9800; - TrackCarSpeed-color: #FFCA28; - TrackPlaneSpeed-color: #FFF5A0; - TrackUnknownDistance-color: #969696; - TrafficG0-color: #4C120F; - TrafficG1-color: #731816; - TrafficG2-color: #731816; - TrafficG3-color: #8C7012; - TrafficG3-opacity: 0.0; - TrafficG4-color: #376222; - TrafficG5-color: #376222; - TrafficTempBlock-color: #232323; - TrafficUnknown-color: #000000; - TrafficArrowLight-color: #C4C4C4; - TrafficArrowDark-color: #191919; - TrafficOutline-color: #383838; - RoadShieldBlackText-color: #212121; - RoadShieldWhiteText-color: #B7B6B6; - RoadShieldUKYellowText-color: #B49E0E; - RoadShieldWhiteBackground-color: #999999; - RoadShieldGreenBackground-color: #136C30; - RoadShieldBlueBackground-color: #294C88; - RoadShieldRedBackground-color: #9F1A17; - RoadShieldOrangeBackground-color: #B58E1B; - PoiHotelTextOutline-color: #000000; - PoiHotelTextOutline-opacity: 0.6; - PoiDeletedMask-color: #FFFFFF; - PoiDeletedMask-opacity: 0.3; - PoiVisitedMask-color: #FFFFFF; - PoiVisitedMask-opacity: 0.7; - DefaultTrackColor-color: #1E96F0; - RouteMarkPrimaryText-color: #888888; - RouteMarkPrimaryTextOutline-color: #000000; - RouteMarkSecondaryText-color: #888888; - RouteMarkSecondaryTextOutline-color: #000000; - TransitMarkPrimaryText-color: #888888; - TransitMarkPrimaryTextOutline-color: #000000; - TransitMarkSecondaryText-color: #888888; - TransitMarkSecondaryTextOutline-color: #000000; - TransitTransferOuterMarker-color: #000000; - TransitTransferInnerMarker-color: #888888; - TransitStopInnerMarker-color: #000000; - LocalAdsPrimaryText-color: #888888; - LocalAdsPrimaryTextOutline-color: #000000; - LocalAdsSecondaryText-color: #888888; - LocalAdsSecondaryTextOutline-color: #000000; - TransitBackground-color: #000000; - TransitBackground-opacity: 0.4; - BookmarkRed-color: #E51B23; - BookmarkPink-color: #FF4182; - BookmarkPurple-color: #9B24B2; - BookmarkDeepPurple-color: #6639BF; - BookmarkBlue-color: #0066CC; - BookmarkLightBlue-color: #249CF2; - BookmarkCyan-color: #14BECD; - BookmarkTeal-color: #00A58C; - BookmarkGreen-color: #3C8C3C; - BookmarkLime-color: #93BF39; - BookmarkYellow-color: #FFC800; - BookmarkOrange-color: #FF9600; - BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #804633; - BookmarkGray-color: #737373; - BookmarkBlueGray-color: #597380; - SearchmarkPreparing-color: #597380; - SearchmarkNotAvailable-color: #597380; - SearchmarkSelectedNotAvailable-color: #F06432; - RatingBad-color: #F06432; - RatingGood-color: #3C8C3C; - RatingNone-color: #249CF2; - SearchmarkDefault-color: #249CF2; - RatingText-color: #FFFFFF; - UGCRatingText-color: #B8B8B8; - SpeedCameraMarkText-color: #FFFFFF; - SpeedCameraMarkBg-color: #F51E30; - SpeedCameraMarkOutline-color: #FFFFFF; - GuideCityMarkText-color: #6639BF; - GuideOutdoorMarkText-color: #3C8C3C; - HotelPriceText-color: #000000; -} diff --git a/data/styles/outdoors/include/defaults_new.mapcss b/data/styles/outdoors/include/defaults_new.mapcss deleted file mode 100644 index b8a843af6..000000000 --- a/data/styles/outdoors/include/defaults_new.mapcss +++ /dev/null @@ -1,24 +0,0 @@ -way|z1-12::* -{ - linejoin: bevel; -} - -way|z13-::* -{ - linejoin: round; -} - -way|z1-15::* -{ - linecap: butt; -} - -way|z16-::* -{ - linecap: round; -} - -*::int_name -{ - text-offset: 1; -} diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt deleted file mode 100644 index 6bd26284d..000000000 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ /dev/null @@ -1,261 +0,0 @@ -# This file is automatically re-formatted and re-sorted in priorities descending order -# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) -# are generated automatically for information only. Custom formatting and comments are not preserved. -# -# BG-by-size geometry: background areas rendered below BG-top and everything else. -# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). -# So effectively priority values of BG-by-size areas are not used at the moment. -# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. -# Keep them in a logical importance order please. -# -# Priorities ranges' rendering order overview: -# - overlays (icons, captions...) -# - FG: foreground areas and lines -# - BG-top: water (linear and areal) -# - BG-by-size: landcover areas sorted by their size - -leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) -=== 250 - -amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) -landuse-religious # area z13- -=== 240 - -amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) -leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) -leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) -=== 230 - -landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) -=== 220 - -leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) -=== 200 - -amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) -leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) -leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) -leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) -=== 190 - -amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) -amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) -amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) -landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) -landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) -=== 180 - -amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) -amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) -amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-) -amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) -amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) -amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) -amenity-police # area z15- (also has icon z16-, caption(optional) z17-) -amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) -amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) -amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) -amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) -emergency-mountain_rescue # area z13- (also has icon 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-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-) -leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) -leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) -leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) -office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) -tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) -tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) -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 z16-, pathtext z13-) -leisure-track-area # area z15- (also has caption z16-) -=== 160 - -aeroway-terminal # area z14- (also has caption z15-) -=== 150 - -leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) -leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) -=== 140 - -landuse-flowerbed # area z16- -natural-scrub # area z11- -=== 130 - -landuse-grass # area z11- -natural-grassland # area z11- -natural-heath # area z11- -=== 120 - -area:highway-footway # area z14- (also has caption z15-) -area:highway-living_street # area z14- -area:highway-pedestrian # area z14- (also has caption z15-) -public_transport-platform # area z16- (also has caption z17-) -railway-platform # area z16- (also has caption z16-) -=== 110 - -amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) -amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) -amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) -amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) -amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) -amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) -amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) -amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) -amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) -amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) -amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) -amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) -amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) -=== 100 - -natural-wetland # area z11- (also has caption z16-) -natural-wetland-bog # area z11- (also has caption z16-) -natural-wetland-fen # area z11- (also has caption z16-) -natural-wetland-mangrove # area z11- (also has caption z16-) -natural-wetland-marsh # area z11- (also has caption z16-) -natural-wetland-reedbed # area z11- (also has caption z16-) -natural-wetland-saltmarsh # area z11- (also has caption z16-) -natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) -natural-wetland-swamp # area z11- (also has caption z16-) -natural-wetland-tidalflat # area z11- (also has caption z16-) -=== 90 - -landuse-farmyard # area z10- (also has caption z15-) -=== 81 - -landuse-allotments # area z12- (also has caption z15-) -landuse-farmland # area z10- (also has caption z15-) -landuse-meadow # area z11- -landuse-orchard # area z12- (also has caption z15-) -landuse-recreation_ground # area z12- (also has caption z15-) -landuse-village_green # area z12- -landuse-vineyard # area z12- (also has caption z15-) -leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) -leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) -natural-bare_rock # area z11- (also has caption z13-) -natural-scree # area z11- -natural-shingle # area z12- -=== 80 - -landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) -leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) -leisure-garden-residential # area z12- -leisure-park # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-) -=== 70 - -landuse-forest # area z10- (also has icon z12-, caption(optional) z13-) -landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-) -landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-) -landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) -=== 60 - -amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) -landuse-construction # area z13- (also has caption z15-) -landuse-industrial # area z13- (also has caption z15-) -landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) -landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) -landuse-railway # area z13- (also has caption z15-) -man_made-wastewater_plant # area z13- (also has caption z15-) -man_made-works # area z13- (also has icon z16-, caption(optional) z17-) -power-generator # area z13- (also has icon z17-) -power-generator-gas # area z13- (also has icon z17-) -power-generator-hydro # area z13- (also has icon z17-) -power-generator-solar # area z13- -power-generator-wind # area z13- (also has icon z13-, caption(optional) z16-) -power-plant # area z13- (also has icon z17-) -power-plant-coal # area z13- (also has icon z17-) -power-plant-gas # area z13- (also has icon z17-) -power-plant-hydro # area z13- (also has icon z17-) -power-plant-solar # area z13- (also has icon z17-) -power-plant-wind # area z13- (also has icon z13-, caption(optional) z16-) -power-substation # area z13- (also has icon z17-, caption(optional) z18-) -=== 50 - -amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) -amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) -amenity-college # area z13- (also has icon z16-, caption(optional) z16-) -amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) -amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) -amenity-school # area z13- (also has icon z16-, caption(optional) z16-) -amenity-university # area z13- (also has icon z14-, caption(optional) z14-) -=== 40 - -aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) -aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) -landuse-education # area z13- -landuse-retail # area z13- (also has caption z16-) -leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) -natural-beach # area z10- (also has caption z14-) -natural-beach-gravel # area z10- (also has caption z14-) -natural-beach-sand # area z10- (also has caption z14-) -natural-desert # area z1- (also has caption z14-) -natural-glacier # area z1- -natural-sand # area z1- (also has caption z15-) -=== 30 - -natural-land # area z1- -place-islet # area z10- (also has caption z14-) -=== 20 - -natural-coastline # area z1- -=== 10 diff --git a/data/styles/outdoors/include/priorities_2_BG-top.prio.txt b/data/styles/outdoors/include/priorities_2_BG-top.prio.txt deleted file mode 100644 index 5ebe324b5..000000000 --- a/data/styles/outdoors/include/priorities_2_BG-top.prio.txt +++ /dev/null @@ -1,46 +0,0 @@ -# This file is automatically re-formatted and re-sorted in priorities descending order -# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) -# are generated automatically for information only. Custom formatting and comments are not preserved. -# -# BG-top geometry: background lines and areas that should be always below foreground ones -# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), -# because ordering by size doesn't always work with e.g. water mapped over a forest, -# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. -# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature -# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas -# are displayed above layer=0 BG-top. -# -# Priorities ranges' rendering order overview: -# - overlays (icons, captions...) -# - FG: foreground areas and lines -# - BG-top: water (linear and areal) -# - BG-by-size: landcover areas sorted by their size - -landuse-basin # area z12- -landuse-reservoir # area z12- (also has caption z10-) -landuse-salt_pond # area z1- -natural-water # area z1- (also has caption z10-) -natural-water-basin # area z1- (also has caption z10-) -natural-water-ditch # area z13- (also has caption z17-) -natural-water-drain # area z13- (also has caption z17-) -natural-water-lake # area z1- (also has caption z10-) -natural-water-lock # area z1- (also has caption z10-) -natural-water-moat # area z1- (also has caption z17-) -natural-water-pond # area z1- (also has caption z10-) -natural-water-reservoir # area z1- (also has caption z10-) -natural-water-river # area z1- (also has caption z10-) -natural-water-tunnel # area z15- -natural-water-wastewater # area z12- (also has caption z17-) -waterway-dock # area z1- -=== 20 - -natural-strait # line z11- (also has caption z13-) -waterway-canal # line z12- (also has pathtext z13-) -waterway-ditch # line z13- -waterway-drain # line z13- -waterway-fish_pass # line z13- (also has pathtext z13-) -waterway-river # line z10- (also has pathtext z11-) -waterway-stream # line z12- (also has pathtext z13-) -waterway-stream-ephemeral # line z13- (also has pathtext z13-) -waterway-stream-intermittent # line z13- (also has pathtext z13-) -=== 10 diff --git a/data/styles/outdoors/light/style.mapcss b/data/styles/outdoors/light/style.mapcss deleted file mode 100644 index 1b8a3c6e1..000000000 --- a/data/styles/outdoors/light/style.mapcss +++ /dev/null @@ -1,136 +0,0 @@ -@import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - -/* TODO: move to a separete base file */ - -colors -{ - GuiText-color: #4D4D4D; - GuiText-opacity: 0.86; - MyPositionAccuracy-color: #000000; - MyPositionAccuracy-opacity: 0.08; - Selection-color: #1E96F0; - Selection-opacity: 0.64; - Route-color: #0087FF; - RouteOutline-color: #055FCD; - RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #E82705; - RouteTrafficG2-color: #E82705; - RouteTrafficG3-color: #FFE500; - RouteTrafficG3-opacity: 0.0; - RoutePedestrian-color: #1D339E; - RoutePedestrian-opacity: 0.8; - RouteBicycle-color: #9C27B0; - RouteBicycle-opacity: 0.8; - RouteRuler-color: #66347F; - RouteRuler-opacity: 0.9; - RoutePreview-color: #000000; - RoutePreview-opacity: 0.3; - RouteMaskCar-color: #000000; - RouteMaskCar-opacity: 0.3; - RouteFirstSegmentArrowsMaskCar-color: #033B80; - RouteFirstSegmentArrowsMaskCar-opacity: 0.0; - RouteArrowsMaskCar-color: #033B80; - RouteArrowsMaskCar-opacity: 0.2; - RouteMaskBicycle-color: #000000; - RouteMaskBicycle-opacity: 0.5; - RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0; - RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0; - RouteArrowsMaskBicycle-color: #9C27B0; - RouteArrowsMaskBicycle-opacity: 0.2; - RouteMaskPedestrian-color: #000000; - RouteMaskPedestrian-opacity: 0.5; - RouteFake-color: #A8A8A8; - RouteFakeOutline-color: #717171; - Arrow3D-color: #50AAFF; - Arrow3DObsolete-color: #82AAC8; - Arrow3DObsolete-opacity: 0.72; - Arrow3DShadow-color: #3C3C3C; - Arrow3DShadow-opacity: 0.24; - Arrow3DOutline-color: #FFFFFF; - TrackHumanSpeed-color: #1D339E; - TrackCarSpeed-color: #7C8EDE; - TrackPlaneSpeed-color: #A8B7ED; - TrackUnknownDistance-color: #616161; - TrafficG0-color: #7E1712; - TrafficG1-color: #E42300; - TrafficG2-color: #E42300; - TrafficG3-color: #FCDE00; - TrafficG3-opacity: 0.0; - TrafficG4-color: #39962E; - TrafficG5-color: #39962E; - TrafficTempBlock-color: #525252; - TrafficUnknown-color: #000000; - TrafficArrowLight-color: #FFFFFF; - TrafficArrowDark-color: #473635; - TrafficOutline-color: #E8E6DC; - RoadShieldBlackText-color: #000000; - RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFD400; - RoadShieldWhiteBackground-color: #FFFFFF; - RoadShieldGreenBackground-color: #309302; - RoadShieldBlueBackground-color: #1A5EC1; - RoadShieldRedBackground-color: #E63534; - RoadShieldOrangeBackground-color: #FFBE00; - PoiHotelTextOutline-color: #FFFFFF; - PoiHotelTextOutline-opacity: 0.6; - PoiDeletedMask-color: #FFFFFF; - PoiDeletedMask-opacity: 0.3; - PoiVisitedMask-color: #FFFFFF; - PoiVisitedMask-opacity: 0.7; - DefaultTrackColor-color: #1E96F0; - RouteMarkPrimaryText-color: #000000; - RouteMarkPrimaryTextOutline-color: #FFFFFF; - RouteMarkSecondaryText-color: #000000; - RouteMarkSecondaryTextOutline-color: #FFFFFF; - TransitMarkPrimaryText-color: #000000; - TransitMarkPrimaryTextOutline-color: #FFFFFF; - TransitMarkSecondaryText-color: #000000; - TransitMarkSecondaryTextOutline-color: #FFFFFF; - TransitTransferOuterMarker-color: #000000; - TransitTransferInnerMarker-color: #FFFFFF; - TransitStopInnerMarker-color: #FFFFFF; - LocalAdsPrimaryText-color: #000000; - LocalAdsPrimaryTextOutline-color: #FFFFFF; - LocalAdsSecondaryText-color: #000000; - LocalAdsSecondaryTextOutline-color: #FFFFFF; - TransitBackground-color: #FFFFFF; - TransitBackground-opacity: 0.4; - BookmarkRed-color: #E51B23; - BookmarkPink-color: #FF4182; - BookmarkPurple-color: #9B24B2; - BookmarkDeepPurple-color: #6639BF; - BookmarkBlue-color: #0066CC; - BookmarkLightBlue-color: #249CF2; - BookmarkCyan-color: #14BECD; - BookmarkTeal-color: #00A58C; - BookmarkGreen-color: #3C8C3C; - BookmarkLime-color: #93BF39; - BookmarkYellow-color: #FFC800; - BookmarkOrange-color: #FF9600; - BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #804633; - BookmarkGray-color: #737373; - BookmarkBlueGray-color: #597380; - SearchmarkPreparing-color: #597380; - SearchmarkNotAvailable-color: #597380; - SearchmarkSelectedNotAvailable-color: #F06432; - RatingBad-color: #F06432; - RatingGood-color: #3C8C3C; - RatingNone-color: #249CF2; - SearchmarkDefault-color: #249CF2; - RatingText-color: #FFFFFF; - UGCRatingText-color: #000000; - SpeedCameraMarkText-color: #FFFFFF; - SpeedCameraMarkBg-color: #F51E30; - SpeedCameraMarkOutline-color: #FFFFFF; - GuideCityMarkText-color: #6639BF; - GuideOutdoorMarkText-color: #3C8C3C; - HotelPriceText-color: #000000; -} diff --git a/data/styles/public-transport/dark/colors.mapcss b/data/styles/public-transport/dark/colors.mapcss new file mode 100644 index 000000000..2cfa81948 --- /dev/null +++ b/data/styles/public-transport/dark/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/dark/colors.mapcss"); diff --git a/data/styles/public-transport/dark/style.mapcss b/data/styles/public-transport/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/public-transport/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/public-transport/include/basemap.mapcss b/data/styles/public-transport/include/basemap.mapcss new file mode 100644 index 000000000..aed9a1f23 --- /dev/null +++ b/data/styles/public-transport/include/basemap.mapcss @@ -0,0 +1,25 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap.mapcss"); + + +/* Buildings */ + +area|z14[building], +area|z14[waterway=dam], +{fill-opacity: 0.5;} + +area|z15[building], +area|z15[waterway=dam], +{fill-opacity: 0.6;} + +area|z14-15[aeroway=terminal], +area|z16[building], +area|z16[building:part], +area|z16[waterway=dam], +{fill-opacity: 0.7; casing-opacity: 0.9;} + +area|z16-[aeroway=terminal], +area|z17-[building], +area|z17-[building:part], +area|z17-[waterway=dam], +{fill-opacity: 0.8;} diff --git a/data/styles/public-transport/include/basemap_label.mapcss b/data/styles/public-transport/include/basemap_label.mapcss new file mode 100644 index 000000000..f1eba831d --- /dev/null +++ b/data/styles/public-transport/include/basemap_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap_label.mapcss"); diff --git a/data/styles/public-transport/include/icons.mapcss b/data/styles/public-transport/include/icons.mapcss new file mode 100644 index 000000000..55fd98e25 --- /dev/null +++ b/data/styles/public-transport/include/icons.mapcss @@ -0,0 +1,7 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons.mapcss"); + +/* 3.4 Bus Station */ + +node|z14[highway=bus_stop], +{icon-image: bus-xvs.svg;icon-min-distance: 1;} diff --git a/data/styles/public-transport/include/icons_label_colors.mapcss b/data/styles/public-transport/include/icons_label_colors.mapcss new file mode 100644 index 000000000..ed0b61b6a --- /dev/null +++ b/data/styles/public-transport/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons_label_colors.mapcss"); diff --git a/data/styles/public-transport/include/priorities_1_BG-by-size.prio.txt b/data/styles/public-transport/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..c2452bbbf --- /dev/null +++ b/data/styles/public-transport/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,265 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) +# highway-pedestrian-area # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-pedestrian-square # area z14- (also has line z13-, line::border z14-, pathtext z14-) +# highway-rest_area # area z13- (also has icon z15-, caption(optional) z15-) +# highway-services # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-garages # area z13- (also has caption z15-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z16-, caption(optional) z16-) +# tourism-information-office # area z15- (also has icon z15-, caption(optional) z15-) +# tourism-information-visitor_centre # area z13- (also has icon z15-, caption(optional) z15-) +# === 170 + +# highway-footway-area # area z14- (also has line z15-, line::border z15-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z14-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-coniferous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-deciduous # area z10- (also has icon z13-, caption(optional) z14-) +# landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z15-, caption(optional) z18-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z15-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z15-) +# natural-beach-gravel # area z10- (also has caption z15-) +# natural-beach-sand # area z10- (also has caption z15-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/public-transport/include/priorities_2_BG-top.prio.txt b/data/styles/public-transport/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..cbb6a5a25 --- /dev/null +++ b/data/styles/public-transport/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,50 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z13- (also has caption z13-) +# waterway-canal # line z13- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z13- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/public-transport/include/priorities_3_FG.prio.txt b/data/styles/public-transport/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..10cc8b73e --- /dev/null +++ b/data/styles/public-transport/include/priorities_3_FG.prio.txt @@ -0,0 +1,606 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z19- (also has line::dash z19-) +# === 350 + +# power-line::dash # line::dash z19- (also has line z19-) +# === 340 + +# highway-ladder # line z15- (also has line::border z15-, icon z17-, pathtext z17-) +# highway-steps # line z15- (also has line::border z15-, pathtext z16-) +# highway-steps-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z16- +# barrier-guard_rail # line z17- +# barrier-hedge # line z16- +# barrier-wall # line z16- +# barrier-yes # line z16- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-world_level # line z4-9 +# highway-world_towns_level # line z6-9 +# === 310 + +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 309 + +# highway-primary # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-) +# highway-primary-bridge # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary-tunnel # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# railway-rail-branch::dash # line::dash z16- (also has line z11-) +# railway-rail-branch-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-branch-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-highspeed::dash # line::dash z16- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z16- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z16- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# railway-rail-tourism-tunnel::dash # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-) +# === 290 + +# highway-primary-tunnel # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-) +# === 289 + +# railway-rail-branch # line z11- (also has line::dash z16-) +# railway-rail-branch-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-branch-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z16-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z16-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-tunnel # line z10- (also has line::dash z16-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z16-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-tunnel # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-) +# === 279 + +# highway-secondary # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-) +# highway-secondary-bridge # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary-tunnel # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border z11-, 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-) +# === 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-) +# === 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-) +# === 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-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-) +# === 225 + +# highway-secondary_link # line z13- (also has line::border z15-, pathtext z16-) +# highway-secondary_link-bridge # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# highway-secondary_link-tunnel # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-) +# === 224 + +# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-) +# highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +# highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) +# === 223 + +# highway-busway # line z15- (also has line::border z15-, pathtext z16-) +# highway-busway-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-busway-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-service # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-area # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-bridge # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z16- (also has line::border z16-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# railway-light_rail::dash # line::dash z16- (also has line z13-) +# railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail::dash # line::dash z16- (also has line z11-) +# railway-rail-bridge::dash # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z17- (also has line z16-) +# railway-rail-service-bridge::dash # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-) +# railway-rail-service-tunnel::dash # line::dash z17- (also has line(casing) z16-, line z16-) +# railway-rail-spur::dash # line::dash z17- (also has line z15-) +# railway-rail-spur-bridge::dash # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-spur-tunnel::dash # line::dash z17- (also has line(casing) z15-, line z15-) +# railway-rail-tunnel::dash # line::dash z16- (also has line z11-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z17- (also has line z13-) +# railway-rail-utility-bridge::dash # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z17- (also has line z13-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-) +# highway-path-bicycle # line z15- (also has line::cycleline z14-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z14- (also has line z15-, pathtext z15-) +# === 219 + +# highway-cycleway # line z13- (also has pathtext z15-) +# highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z11- (also has line::dash z16-) +# railway-rail-bridge # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service # line z16- (also has line::dash z17-) +# railway-rail-service-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-service-tunnel # line z16- (also has line(casing) z16-, line::dash z17-) +# railway-rail-spur # line z15- (also has line::dash z17-) +# railway-rail-spur-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-spur-tunnel # line z15- (also has line(casing) z15-, line::dash z17-) +# railway-rail-tunnel # line z11- (also has line::dash z16-, line(casing) z14-) +# railway-rail-utility # line z13- (also has line::dash z17-) +# railway-rail-utility-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-) +# railway-rail-utility-tunnel # line z13- (also has line::dash z17-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z16- (also has line z16-, line::dash z17-) +# railway-rail-spur-tunnel # line(casing) z15- (also has line z15-, line::dash z17-) +# railway-rail-tunnel # line(casing) z14- (also has line z11-, line::dash z16-) +# railway-rail-utility-tunnel # line(casing) z14- (also has line z13-, line::dash z17-) +# === 209 + +# highway-ford # line z13- (also has line::border z14-, icon z16-, pathtext z16-) +# highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z14- (also has pathtext z15-) +# highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z15- (also has line::border z15-, pathtext z15-) +# highway-footway-area # line z15- and area z14- (also has line::border z15-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z15- (also has pathtext z15-) +# highway-path-difficult # line z15- (also has pathtext z15-) +# highway-path-expert # line z15- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z15- (also has pathtext z15-) +# highway-track-area # line z15- (also has pathtext z15-) +# highway-track-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z15- (also has pathtext z15-) +# highway-track-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z13- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z16- +# railway-construction # line z15- +# railway-disused # line z16- +# railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z16- +# railway-miniature # line z16- +# railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z16- +# railway-preserved # line z15- +# railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) +# railway-preserved-tunnel # line z15- +# railway-turntable # line z17- +# === 180 + +# highway-footway-bridge # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z16- (also has line::border z16-) +# highway-footway-tunnel # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z15- (also has pathtext z15-) +# highway-path-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# === 163 + +# highway-primary::border # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-) +# === 162 + +# highway-secondary::border # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-) +# === 161 + +# highway-motorway_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-) +# === 159 + +# highway-secondary_link::border # line::border z15- (also has line z13-, pathtext z16-) +# === 158 + +# highway-motorway-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# === 157 + +# highway-primary-bridge::border # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 156 + +# highway-secondary-bridge::border # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# === 155 + +# highway-motorway_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# === 153 + +# highway-secondary_link-bridge::border # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) +# === 152 + +# highway-motorway-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# === 151 + +# highway-primary-tunnel::border # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-) +# === 150 + +# highway-secondary-tunnel::border # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-) +# === 149 + +# highway-motorway_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 147 + +# highway-secondary_link-tunnel::border # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-) +# === 146 + +# highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-living_street::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-area::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-service-driveway::border # line::border z16- (also has line z16-, pathtext z16-) +# highway-service-parking_aisle::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-tertiary::border # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-) +# highway-tertiary-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link::border # line::border z14- (also has line z14-, pathtext z18-) +# highway-unclassified::border # line::border z13- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z13- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z15- (also has line z15-, pathtext z15-) +# highway-footway-area::border # line::border z15- (also has line z15-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-) +# highway-footway-crossing::border # line::border z16- (also has line z16-) +# highway-footway-sidewalk::border # line::border z16- (also has line z16-) +# highway-ford::border # line::border z14- (also has line z13-, icon z16-, pathtext z16-) +# highway-ladder::border # line::border z15- (also has line z15-, icon z17-, pathtext z17-) +# highway-pedestrian::border # line::border z14- (also has line z13-, pathtext z14-) +# highway-pedestrian-area::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +# highway-pedestrian-square::border # line::border z14- (also has line z13-, area z14-, pathtext z14-) +# highway-steps::border # line::border z15- (also has line z15-, pathtext z16-) +# === 144 + +# highway-busway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-living_street-bridge::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary_link-bridge::border # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-unclassified-bridge::border # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 + +# highway-footway-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-pedestrian-bridge::border # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-steps-bridge::border # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# === 142 + +# highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +# highway-living_street-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z14- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +# highway-tertiary-tunnel::border # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-tunnel::border # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-) +# highway-unclassified-tunnel::border # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 + +# highway-footway-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-pedestrian-tunnel::border # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-) +# highway-steps-tunnel::border # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# === 140 + +# highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) +# highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +# highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-) +# highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-) +# highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-) +# railway-rail-tourism-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-) +# railway-subway-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# === 135 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) +# highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-) +# highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-) +# highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-) +# railway-rail-tourism-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-) +# railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-) +# railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# === 130 + +# building # area z14- (also has caption z17-) +# building-garage # area z14- (also has caption z17-) +# building-guardhouse # area z14- (also has icon z18-, caption(optional) z18-) +# building-has_parts # area z14- (also has caption z17-) +# building-train_station # area z14- (also has icon z17-, caption(optional) z17-) +# === 120 + +# piste:type-connection # line z15- +# piste:type-downhill # line z14- (also has pathtext z15-) +# piste:type-downhill-advanced # line z14- (also has pathtext z15-) +# piste:type-downhill-easy # line z14- (also has pathtext z15-) +# piste:type-downhill-expert # line z14- (also has pathtext z15-) +# piste:type-downhill-freeride # line z14- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z14- (also has pathtext z15-) +# piste:type-downhill-novice # line z14- (also has pathtext z15-) +# piste:type-hike # line z15- (also has pathtext z15-) +# piste:type-nordic # line z14- (also has pathtext z15-) +# piste:type-skitour # line z14- (also has pathtext z15-) +# piste:type-sled # line z14- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z14- (also has pathtext z16-) +# natural-earth_bank # line z14- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z14- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z16- +# === 60 + +# isoline-step_10 # line z15- (also has pathtext z17-) +# isoline-step_100 # line z12- (also has pathtext z14-) +# isoline-step_1000 # line z11- (also has pathtext z11-) +# isoline-step_50 # line z14- (also has pathtext z16-) +# isoline-step_500 # line z11- (also has pathtext z12-) +# isoline-zero # line z15- (also has pathtext z17-) +# === 50 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +# leisure-nature_reserve # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-) +# === 20 + +# piste:type-snow_park # area z14- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z18- +# === 5 diff --git a/data/styles/public-transport/include/priorities_4_overlays.prio.txt b/data/styles/public-transport/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..1e93f6b9c --- /dev/null +++ b/data/styles/public-transport/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2537 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-1 # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-3 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-4 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-5 # icon z11-17 (also has caption(optional) z12-17) +# boundary-protected_area-6 # icon z11-17 (also has caption(optional) z12-17) +# leisure-nature_reserve # icon z11-17 and caption z18- (also has caption(optional) z12-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z16- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yokohama # icon z13- (also has caption(optional) z14-) +# === 6250 + +# highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-) +# highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z14- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z13- (also has caption(optional) z13-) +# waterway-waterfall # icon z13- (also has caption(optional) z14-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# place-locality # caption z13- +# place-neighbourhood # caption z13- +# === 5700 + +# highway-secondary # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-) +# highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-) +# === 5600 + +# man_made-communications_tower # icon z14- (also has caption(optional) z15-) +# man_made-lighthouse # icon z13- (also has caption(optional) z14-) +# natural-peak # icon z13- (also has caption(optional) z13-) +# natural-volcano # icon z12- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z14- (also has caption(optional) z15-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z14- (also has caption(optional) z14-) +# === 4950 + +# landuse-forest # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-coniferous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-deciduous # icon z13- (also has caption(optional) z14-, area z10-) +# landuse-forest-mixed # icon z13- (also has caption(optional) z14-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z14- (also has caption(optional) z15-) +# natural-geyser # icon z14- (also has caption(optional) z14-) +# natural-hot_spring # icon z14- (also has caption(optional) z15-) +# natural-spring # icon z14- (also has caption(optional) z15-) +# === 4650 + +# natural-saddle # icon z15- (also has caption(optional) z16-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z15- (also has caption(optional) z15-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z15- (also has caption(optional) z15-, area z15-) +# tourism-information-visitor_centre # icon z15- (also has caption(optional) z15-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z16- (also has caption(optional) z16-) +# amenity-shelter-lean_to # icon z16- (also has caption(optional) z16-) +# emergency-mountain_rescue # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-wilderness_hut # icon z16- (also has caption(optional) z16-) +# === 3900 + +# highway-rest_area # icon z15- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-caravan_site # icon z16- (also has caption(optional) z16-) +# tourism-chalet # icon z16- (also has caption(optional) z16-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3751 + +# amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z14- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z17- (also has caption(optional) z18-) +# === 3500 + +# isoline-step_1000 # pathtext z11- (also has line z11-) +# === 3400 + +# isoline-step_500 # pathtext z12- (also has line z11-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z14- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z15- (also has area z10-) +# natural-beach-gravel # caption z15- (also has area z10-) +# natural-beach-sand # caption z15- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z16-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z16-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# 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-) +# === 3100 + +# amenity-water_point # icon z17- (also has caption(optional) z18-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z17- (also has caption(optional) z18-) +# man_made-water_well # icon z17- (also has caption(optional) z18-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z14- (also has line z12-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-platter # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) +# highway-residential # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z14-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z14-) +# highway-secondary_link # pathtext z16- (also has line z13-, line::border z15-) +# highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-) +# === 3000 + +# highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-) +# highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-) +# === 2970 + +# highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-) +# highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-) +# === 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-) +# === 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-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z13-) +# highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 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-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z13-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z13-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z16- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z17- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z14-) +# highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z15-) +# highway-path-bicycle # pathtext z15- (also has line z15-, line::cycleline z14-) +# highway-path-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z15-) +# highway-path-expert # pathtext z15- (also has line z15-) +# highway-path-horse # pathtext z15- (also has line z15-) +# 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-) +# === 2810 + +# highway-track # pathtext z15- (also has line z15-) +# highway-track-area # pathtext z15- (also has line z15-) +# highway-track-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z15-) +# 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-) +# 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z14-) +# piste:type-downhill-freeride # pathtext z15- (also has line z14-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z14-) +# piste:type-downhill-novice # pathtext z15- (also has line z14-) +# piste:type-hike # pathtext z15- (also has line z15-) +# piste:type-nordic # pathtext z15- (also has line z14-) +# piste:type-skitour # pathtext z15- (also has line z14-) +# piste:type-sled # pathtext z15- (also has line z14-) +# piste:type-snow_park # caption z15- (also has area z14-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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-) +# 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z18- (also has caption(optional) z18-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z16-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z16- (also has caption(optional) z16-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z16- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z16- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z17- (also has caption(optional) z17-) +# amenity-shelter-public_transport # icon z17- (also has caption(optional) z17-) +# emergency-lifeguard # icon z17- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z16- (also has line z14-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z16- (also has line z14-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z17- (also has caption(optional) z17-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) +# man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) +# natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) +# === 1200 + +# isoline-step_10 # pathtext z17- (also has line z15-) +# isoline-zero # pathtext z17- (also has line z15-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z17- +# man_made-flare # icon z16- (also has caption(optional) z18-) +# man_made-mast-communication # icon z16- +# man_made-tower # icon z16- (also has caption(optional) z18-) +# man_made-tower-communication # icon z16- (also has caption(optional) z18-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z18- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z18- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z18- (also has caption(optional) z18-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z18- (also has caption(optional) z18-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z16- +# man_made-silo # icon z16- (also has caption(optional) z18-) +# man_made-storage_tank # icon z16- (also has caption(optional) z18-) +# man_made-water_tower # icon z16- (also has caption(optional) z18-) +# power-portal # icon z19- +# power-tower # icon z19- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z18- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z15- (also has caption(optional) z16-, area z13-) +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z17- +# spherical_buoy-cardinal-north # icon z17- +# spherical_buoy-cardinal-south # icon z17- +# spherical_buoy-cardinal-west # icon z17- +# spherical_buoy-isolated_danger # icon z17- +# spherical_buoy-lateral-port # icon z17- +# spherical_buoy-lateral-starboard # icon z17- +# spherical_buoy-safe_water # icon z17- +# spherical_buoy-special_purpose # icon z17- +# === 216 + +# beacon-cardinal-east # icon z16- +# beacon-cardinal-north # icon z16- +# beacon-cardinal-south # icon z16- +# beacon-cardinal-west # icon z16- +# beacon-isolated_danger # icon z16- +# beacon-lateral-port # icon z16- +# beacon-lateral-starboard # icon z16- +# beacon-safe_water # icon z16- +# beacon-special_purpose # icon z16- +# buoy-cardinal-east # icon z16- +# buoy-cardinal-north # icon z16- +# buoy-cardinal-south # icon z16- +# buoy-cardinal-west # icon z16- +# buoy-isolated_danger # icon z16- +# buoy-lateral-port # icon z16- +# buoy-lateral-starboard # icon z16- +# buoy-safe_water # icon z16- +# buoy-special_purpose # icon z16- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z17- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z15- (also has caption(optional) z18-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-1 # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-3 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-4 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-5 # caption(optional) z12-17 (also has icon z11-17) +# boundary-protected_area-6 # caption(optional) z12-17 (also has icon z11-17) +# leisure-nature_reserve # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z14-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z13- (also has icon z13-) +# waterway-waterfall # caption(optional) z14- (also has icon z13-) +# === -4200 + +# man_made-communications_tower # caption(optional) z15- (also has icon z14-) +# man_made-lighthouse # caption(optional) z14- (also has icon z13-) +# natural-peak # caption(optional) z13- (also has icon z13-) +# natural-volcano # caption(optional) z13- (also has icon z12-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z15- (also has icon z14-) +# === -4950 + +# tourism-viewpoint # caption(optional) z14- (also has icon z14-) +# === -5050 + +# landuse-forest # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-coniferous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-deciduous # caption(optional) z14- (also has icon z13-, area z10-) +# landuse-forest-mixed # caption(optional) z14- (also has icon z13-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z15- (also has icon z14-) +# natural-geyser # caption(optional) z14- (also has icon z14-) +# natural-hot_spring # caption(optional) z15- (also has icon z14-) +# natural-spring # caption(optional) z15- (also has icon z14-) +# === -5350 + +# natural-saddle # caption(optional) z16- (also has icon z15-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z15- (also has icon z15-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z15- (also has icon z15-, area z15-) +# tourism-information-visitor_centre # caption(optional) z15- (also has icon z15-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z16- (also has icon z16-) +# amenity-shelter-lean_to # caption(optional) z16- (also has icon z16-) +# emergency-mountain_rescue # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-wilderness_hut # caption(optional) z16- (also has icon z16-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z15-, area z13-) +# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-caravan_site # caption(optional) z16- (also has icon z16-) +# tourism-chalet # caption(optional) z16- (also has icon z16-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z14-) +# === -6400 + +# amenity-drinking_water # caption(optional) z18- (also has icon z17-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z18- (also has icon z17-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z18- (also has icon z17-) +# man_made-water_well # caption(optional) z18- (also has icon z17-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z17-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z18- (also has icon z18-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z16-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z16- (also has icon z16-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z16-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z16-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z17- (also has icon z17-) +# amenity-shelter-public_transport # caption(optional) z17- (also has icon z17-) +# emergency-lifeguard # caption(optional) z18- (also has icon z17-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-) +# leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) +# man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) +# natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flare # caption(optional) z18- (also has icon z16-) +# man_made-tower # caption(optional) z18- (also has icon z16-) +# man_made-tower-communication # caption(optional) z18- (also has icon z16-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z18-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z18-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z18- (also has icon z18-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z18- (also has icon z18-) +# man_made-silo # caption(optional) z18- (also has icon z16-) +# man_made-storage_tank # caption(optional) z18- (also has icon z16-) +# man_made-water_tower # caption(optional) z18- (also has icon z16-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z18-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z15-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z17-) +# power-generator-wind # caption(optional) z18- (also has icon z15-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z19- (also has caption(optional) z19-) +# man_made-survey_point # icon z18- (also has caption(optional) z18-) +# tourism-information # icon z16- (also has caption(optional) z16-) +# tourism-information-board # icon z16- (also has caption(optional) z16-) +# tourism-information-guidepost # icon z16- (also has caption(optional) z16-) +# tourism-information-map # icon z16- (also has caption(optional) z16-) +# tourism-information-tactile_map # icon z16- (also has caption(optional) z16-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z17- (also has icon z17-, caption z17-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z19- (also has icon z19-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z16- (also has icon z16-) +# tourism-information-map # caption(optional) z16- (also has icon z16-) +# tourism-information-tactile_map # caption(optional) z16- (also has icon z16-) +# === -10000 diff --git a/data/styles/public-transport/include/transit_systems.mapcss b/data/styles/public-transport/include/transit_systems.mapcss new file mode 100644 index 000000000..7cbd435f6 --- /dev/null +++ b/data/styles/public-transport/include/transit_systems.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/transit_systems.mapcss"); diff --git a/data/styles/public-transport/include/ways.mapcss b/data/styles/public-transport/include/ways.mapcss new file mode 100644 index 000000000..a126f1321 --- /dev/null +++ b/data/styles/public-transport/include/ways.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways.mapcss"); diff --git a/data/styles/public-transport/include/ways_label.mapcss b/data/styles/public-transport/include/ways_label.mapcss new file mode 100644 index 000000000..fb0627ff0 --- /dev/null +++ b/data/styles/public-transport/include/ways_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways_label.mapcss"); diff --git a/data/styles/public-transport/light/colors.mapcss b/data/styles/public-transport/light/colors.mapcss new file mode 100644 index 000000000..0f80e9a02 --- /dev/null +++ b/data/styles/public-transport/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/light/colors.mapcss"); diff --git a/data/styles/public-transport/light/style.mapcss b/data/styles/public-transport/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/public-transport/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/public-transport_outdoor/dark/colors.mapcss b/data/styles/public-transport_outdoor/dark/colors.mapcss new file mode 100644 index 000000000..d9bfc1fe2 --- /dev/null +++ b/data/styles/public-transport_outdoor/dark/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/dark/colors.mapcss"); +@import("../../outdoor/dark/colors.mapcss"); diff --git a/data/styles/public-transport_outdoor/dark/style.mapcss b/data/styles/public-transport_outdoor/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/public-transport_outdoor/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/basemap.mapcss b/data/styles/public-transport_outdoor/include/basemap.mapcss new file mode 100644 index 000000000..0ddc0c920 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/basemap.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/basemap.mapcss"); +@import("../../outdoor/include/basemap.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/basemap_label.mapcss b/data/styles/public-transport_outdoor/include/basemap_label.mapcss new file mode 100644 index 000000000..05d0cd665 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/basemap_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/basemap_label.mapcss"); +@import("../../outdoor/include/basemap_label.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/icons.mapcss b/data/styles/public-transport_outdoor/include/icons.mapcss new file mode 100644 index 000000000..100e5599a --- /dev/null +++ b/data/styles/public-transport_outdoor/include/icons.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/icons.mapcss"); +@import("../../outdoor/include/icons.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/icons_label_colors.mapcss b/data/styles/public-transport_outdoor/include/icons_label_colors.mapcss new file mode 100644 index 000000000..f345bd9b1 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/icons_label_colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/icons_label_colors.mapcss"); +@import("../../outdoor/include/icons_label_colors.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/priorities_1_BG-by-size.prio.txt b/data/styles/public-transport_outdoor/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..60f0310c8 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,266 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../public-transport/include/priorities_1_BG-by-size.prio.txt") +@import("../../outdoor/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon 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-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-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) +# tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +# 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 z16-, pathtext z15-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z13-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z14-) +# natural-beach-gravel # area z10- (also has caption z14-) +# natural-beach-sand # area z10- (also has caption z14-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/public-transport_outdoor/include/priorities_2_BG-top.prio.txt b/data/styles/public-transport_outdoor/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..7e540f7cf --- /dev/null +++ b/data/styles/public-transport_outdoor/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,51 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../public-transport/include/priorities_2_BG-top.prio.txt") +@import("../../outdoor/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z11- (also has caption z13-) +# waterway-canal # line z12- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z12- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/public-transport_outdoor/include/priorities_3_FG.prio.txt b/data/styles/public-transport_outdoor/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..4e04816d0 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/priorities_3_FG.prio.txt @@ -0,0 +1,616 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays +# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature +# is layer=-10 (as tunnels should be visibile over landcover and water). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../public-transport/include/priorities_3_FG.prio.txt") +@import("../../outdoor/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z13- (also has line::dash z13-, pathtext z15-) +# power-minor_line # line z15- (also has line::dash z15-) +# === 350 + +# power-line::dash # line::dash z13- (also has line z13-, pathtext z15-) +# power-minor_line::dash # line::dash z15- (also has line z15-) +# === 340 + +# highway-ladder # line z12- (also has line::border z16-, icon z16-, pathtext z17-) +# highway-steps # line z12- (also has line::border z16-, pathtext z16-) +# highway-steps-bridge # line z12- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-tunnel # line z12- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# hwtag-oneway::arrows # line::arrows z15- +# waterway-weir # line z14- (also has pathtext z15-) +# === 330 + +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z15- +# barrier-guard_rail # line z16- +# barrier-hedge # line z16- +# barrier-wall # line z15- +# barrier-yes # line z15- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z10-, 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 z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z10-, 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-) +# 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-) +# railway-rail-highspeed::dash # line::dash z15- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z15- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z15- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# 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-) +# === 289 + +# railway-rail-branch # line z10- (also has line::dash z15-) +# railway-rail-branch-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-branch-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z15-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z15-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z15-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) +# === 280 + +# railway-rail-branch-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# railway-rail-main-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 270 + +# highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border 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 z11-, pathtext z13-) +# highway-unclassified-area # line z11- (also has line::border z11-, pathtext z13-) +# highway-unclassified-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# highway-unclassified-tunnel # line z11- (also has line::border z11-, 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 z11-, pathtext z13-) +# === 249 + +# highway-living_street # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-bridge # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z14-) +# highway-residential # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-bridge # line z12- (also has line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-residential-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road # line z12- (also has line::border z12-, pathtext z14-) +# highway-road-bridge # line z12- (also has line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-road-tunnel # line z12- (also has line::border z12-, pathtext z14-) +# === 230 + +# highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z14-) +# highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z13-, shield::shield z15-) +# === 229 + +# highway-motorway_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 + +# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) +# === 227 + +# highway-primary_link # line z11- (also has line::border z11-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 + +# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border 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-) +# === 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-) +# === 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 z13-, pathtext z16-) +# highway-service-area # line z13- (also has line::border z13-, pathtext z16-) +# highway-service-bridge # line z13- (also has line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z13- (also has line::border z13-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) +# === 222 + +# highway-busway-tunnel # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-) +# highway-service-tunnel # line(casing) z15- (also has line z13-, line::border 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-) +# railway-rail-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z16- (also has line z15-) +# railway-rail-service-bridge::dash # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-service-tunnel::dash # line::dash z16- (also has line(casing) z15-, line z15-) +# railway-rail-spur::dash # line::dash z16- (also has line z14-) +# railway-rail-spur-bridge::dash # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-) +# railway-rail-spur-tunnel::dash # line::dash z16- (also has line(casing) z14-, line z14-) +# railway-rail-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z16- (also has line z12-) +# railway-rail-utility-bridge::dash # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z16- (also has line z12-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 + +# highway-footway-bicycle # line z11- (also has line::border z12-, line::cycleline z13-, pathtext z15-) +# highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z15-) +# === 220 + +# highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, line::border z12-, pathtext z15-) +# highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z15-) +# === 219 + +# highway-cycleway # line z11- (also has pathtext z15-) +# highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z10- (also has line::dash z15-) +# railway-rail-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service # line z15- (also has line::dash z16-) +# railway-rail-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-service-tunnel # line z15- (also has line(casing) z15-, line::dash z16-) +# railway-rail-spur # line z14- (also has line::dash z16-) +# railway-rail-spur-bridge # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) +# railway-rail-spur-tunnel # line z14- (also has line(casing) z14-, line::dash z16-) +# railway-rail-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-utility # line z12- (also has line::dash z16-) +# railway-rail-utility-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-utility-tunnel # line z12- (also has line::dash z16-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 + +# railway-rail-service-tunnel # line(casing) z15- (also has line z15-, line::dash z16-) +# railway-rail-spur-tunnel # line(casing) z14- (also has line z14-, line::dash z16-) +# railway-rail-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) +# 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-) +# === 200 + +# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) +# === 199 + +# highway-bridleway # line z11- (also has pathtext z15-) +# highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway # line z11- (also has line::border z16-, pathtext z15-) +# highway-footway-area # line z11- and area z14- (also has line::border z16-, pathtext z15-) +# highway-footway-crossing # line z16- (also has line::border z16-) +# highway-path # line z11- (also has pathtext z15-) +# highway-path-difficult # line z11- (also has pathtext z15-) +# highway-path-expert # line z11- (also has pathtext z15-) +# highway-raceway # line z14- (also has pathtext z16-) +# highway-track # line z11- (also has pathtext z15-) +# highway-track-area # line z11- (also has pathtext z15-) +# highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-track-no-access # line z11- (also has pathtext z15-) +# highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 190 + +# highway-construction # line z11- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z13- +# railway-construction # line z13- +# railway-disused # line z13- +# railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z13- +# railway-miniature # line z13- +# railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z13- +# 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 + +# highway-footway-bridge # line z11- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-sidewalk # line z13- (also has line::border z16-) +# highway-footway-tunnel # line z11- (also has line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) +# highway-path-horse # line z11- (also has pathtext z15-) +# highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +# === 170 + +# highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::border z16-, line::tunnelCasing z17-, pathtext z15-) +# highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::border z16-, line::tunnelCasing z17-, pathtext z16-) +# highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z15-) +# === 169 + +# highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::border z16-, line::tunnelBackground z17-, pathtext z15-) +# highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::border z16-, line::tunnelBackground z17-, pathtext z16-) +# highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z15-) +# === 168 + +# highway-motorway::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z10- (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 z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 + +# highway-primary_link::border # line::border z11- (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 z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z10- (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 z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 + +# highway-primary_link-bridge::border # line::border z11- (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 z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z10- (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 z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 + +# highway-primary_link-tunnel::border # line::border z11- (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 z12- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-area::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-driveway::border # line::border z15- (also has line z15-, 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 z11- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z11- (also has line z11-, pathtext z13-) +# === 145 + +# highway-footway::border # line::border z16- (also has line z11-, pathtext z15-) +# highway-footway-area::border # line::border z16- (also has line z11-, area z14-, pathtext z15-) +# highway-footway-bicycle::border # line::border z12- (also has line z11-, line::cycleline z13-, pathtext z15-) +# 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 z16- (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 z16- (also has line z12-, 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 z12- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z13- (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 z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 + +# highway-footway-bridge::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, 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 z12- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z13- (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 z11- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 + +# highway-footway-tunnel::border # line::border z16- (also has line z11-, 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 z16- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) +# === 140 + +# highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, pathtext z15-) +# highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, 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 z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::border z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::border z12-, line::bridgeblack z16-, pathtext z14-) +# highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgeblack z15-, pathtext z16-) +# highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::border z16-, line::bridgeblack z17-, pathtext z16-) +# highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-) +# highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z15-) +# highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::border z10-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::border z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z13-) +# railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +# railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) +# railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-) +# railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-main-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) +# railway-rail-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z16-) +# railway-rail-spur-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z16-, line::dash z16-) +# 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 + +# highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::border z16-, line::bridgewhite z15-, pathtext z15-) +# highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, 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 z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::border z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::border z12-, line::bridgewhite z16-, pathtext z14-) +# highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) +# highway-secondary_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 z13-, line::bridgewhite z15-, pathtext z16-) +# highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::border z16-, line::bridgewhite z15-, pathtext z16-) +# highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) +# highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-) +# highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z15-) +# highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::border z10-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::border z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z13-) +# railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +# railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) +# railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-) +# railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-spur-bridge::bridgeblack # line::bridgeblack z16- (also has line z14-, line::bridgewhite z14-, line::dash z16-) +# 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 + +# 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 + +# piste:type-connection # line z15- +# piste:type-downhill # line z12- (also has pathtext z15-) +# piste:type-downhill-advanced # line z12- (also has pathtext z15-) +# piste:type-downhill-easy # line z12- (also has pathtext z15-) +# piste:type-downhill-expert # line z12- (also has pathtext z15-) +# piste:type-downhill-freeride # line z12- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z12- (also has pathtext z15-) +# piste:type-downhill-novice # line z12- (also has pathtext z15-) +# piste:type-hike # line z12- (also has pathtext z15-) +# piste:type-nordic # line z12- (also has pathtext z15-) +# piste:type-skitour # line z12- (also has pathtext z15-) +# piste:type-sled # line z12- (also has pathtext z15-) +# === 110 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z12- (also has pathtext z14-) +# natural-earth_bank # line z12- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z13- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z15- +# === 60 + +# 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 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# leisure-nature_reserve # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) +# === 20 + +# piste:type-downhill-advanced-area # area z13- +# piste:type-downhill-area # area z13- +# piste:type-downhill-easy-area # area z13- +# piste:type-downhill-expert-area # area z13- +# piste:type-downhill-intermediate-area # area z13- +# piste:type-downhill-novice-area # area z13- +# piste:type-sled-area # area z13- +# piste:type-snow_park # area z13- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z15- +# === 5 diff --git a/data/styles/public-transport_outdoor/include/priorities_4_overlays.prio.txt b/data/styles/public-transport_outdoor/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..2dafe8382 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/priorities_4_overlays.prio.txt @@ -0,0 +1,2544 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# Overlays (icons, captions, path texts and shields) are rendered on top of all the geometry (lines, areas). +# Overlays don't overlap each other, instead the ones with higher priority displace the less important ones. +# Optional captions (which have an icon) are usually displayed only if there are no other overlays in their way +# (technically, max overlays priority value (10000) is subtracted from their priorities automatically). +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../public-transport/include/priorities_4_overlays.prio.txt") +@import("../../outdoor/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 + +# place-ocean # caption z1- +# === 7650 + +# place-country # caption z3- +# === 7600 + +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-5 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-6 # icon z10-17 (also has caption(optional) z11-17) +# leisure-nature_reserve # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z16- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# 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-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z12- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z11- (also has caption(optional) z11-) +# waterway-waterfall # icon z10- (also has caption(optional) z11-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# 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-) +# === 5600 + +# man_made-communications_tower # icon z12- (also has caption(optional) z13-) +# man_made-lighthouse # icon z11- (also has caption(optional) z14-) +# natural-peak # icon z10- (also has caption(optional) z11-) +# natural-volcano # icon z10- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z11- (also has caption(optional) z12-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z11- (also has caption(optional) z13-) +# === 4950 + +# landuse-forest # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z10- (also has caption(optional) z11-) +# natural-geyser # icon z10- (also has caption(optional) z12-) +# natural-hot_spring # icon z12- (also has caption(optional) z15-) +# natural-spring # icon z12- (also has caption(optional) z14-) +# === 4650 + +# natural-saddle # icon z13- (also has caption(optional) z15-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +# tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) +# amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) +# emergency-mountain_rescue # icon z12- (also has caption(optional) z12-, area z13-) +# tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) +# === 3900 + +# highway-rest_area # icon z14- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) +# tourism-caravan_site # icon z13- (also has caption(optional) z13-) +# tourism-chalet # icon z14- (also has caption(optional) z14-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3751 + +# amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z14- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z12- (also has caption(optional) z14-) +# === 3500 + +# isoline-step_1000 # pathtext z10- (also has line z10-) +# === 3400 + +# isoline-step_500 # pathtext z11- (also has line z10-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z13- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z14- (also has area z10-) +# natural-beach-gravel # caption z14- (also has area z10-) +# natural-beach-sand # caption z14- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z15-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z15-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# waterway-river # pathtext z11- (also has line z10-) +# === 3150 + +# highway-unclassified # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-area # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z11-, line(casing) z16-) +# === 3100 + +# amenity-water_point # icon z12- (also has caption(optional) z14-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z12- (also has caption(optional) z14-) +# man_made-water_well # icon z12- (also has caption(optional) z14-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z13- (also has line z11-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# 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 z12-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z12-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z12-) +# 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-) +# === 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-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-) +# === 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-) +# === 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 z12-) +# highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-) +# highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line(casing) z16-) +# === 2955 + +# highway-cycleway # pathtext z15- (also has line z11-) +# highway-cycleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2953 + +# area:highway-footway # caption z15- (also has area z14-) +# highway-footway # pathtext z15- (also has line z11-, line::border z16-) +# highway-footway-area # pathtext z15- (also has line z11-, line::border z16-, area z14-) +# highway-footway-bicycle # pathtext z15- (also has line z11-, line::border z12-, line::cycleline z13-) +# highway-footway-bridge # pathtext z15- (also has line z11-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-footway-tunnel # pathtext z15- (also has line z11-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +# highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z12-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z12-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z14- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z15- (also has line z11-) +# highway-bridleway-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z15- (also has line z11-) +# highway-path-bicycle # pathtext z15- (also has line z11-, line::cycleline z12-) +# highway-path-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z15- (also has line z11-) +# highway-path-expert # pathtext z15- (also has line z11-) +# highway-path-horse # pathtext z15- (also has line z11-) +# highway-path-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2820 + +# highway-steps # pathtext z16- (also has line z12-, line::border z16-) +# highway-steps-bridge # pathtext z16- (also has line z12-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-steps-tunnel # pathtext z16- (also has line z12-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2810 + +# highway-track # pathtext z15- (also has line z11-) +# highway-track-area # pathtext z15- (also has line z11-) +# highway-track-bridge # pathtext z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z15- (also has line z11-) +# highway-track-tunnel # pathtext z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2780 + +# highway-service # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-area # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-) +# highway-service-driveway # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-tunnel # pathtext z16- (also has line z13-, line::border 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z12-) +# piste:type-downhill-freeride # pathtext z15- (also has line z12-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z12-) +# piste:type-downhill-novice # pathtext z15- (also has line z12-) +# piste:type-hike # pathtext z15- (also has line z12-) +# piste:type-nordic # pathtext z15- (also has line z12-) +# piste:type-skitour # pathtext z15- (also has line z12-) +# piste:type-sled # pathtext z15- (also has line z12-) +# piste:type-snow_park # caption z15- (also has area z13-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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 z12-) +# highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z12-) +# highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z14- (also has caption(optional) z15-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z15-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z14- (also has caption(optional) z14-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z15- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z14- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z12- (also has caption(optional) z13-) +# amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) +# emergency-lifeguard # icon z14- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z14- (also has line z12-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z15- (also has line z13-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z15- (also has caption(optional) z16-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) +# man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) +# natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) +# === 1200 + +# isoline-step_10 # pathtext z16- (also has line z15-) +# isoline-zero # pathtext z15- (also has line z15-) +# power-line # pathtext z15- (also has line z13-, line::dash z13-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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 z16-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z13- (also has caption(optional) z14-) +# man_made-flare # icon z13- (also has caption(optional) z18-) +# man_made-mast-communication # icon z13- (also has caption(optional) z14-) +# man_made-tower # icon z13- (also has caption(optional) z14-) +# man_made-tower-communication # icon z13- (also has caption(optional) z14-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z15- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z17- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z16- (also has caption(optional) z17-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z16- (also has caption(optional) z17-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z13- (also has caption(optional) z14-) +# man_made-silo # icon z13- (also has caption(optional) z14-) +# man_made-storage_tank # icon z13- (also has caption(optional) z14-) +# man_made-water_tower # icon z13- (also has caption(optional) z14-) +# power-portal # icon z13- +# power-tower # icon z13- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# man_made-utility_pole # icon z15- +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z13- (also has caption(optional) z16-, area z13-) +# power-pole # icon z15- +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z15- +# spherical_buoy-cardinal-north # icon z15- +# spherical_buoy-cardinal-south # icon z15- +# spherical_buoy-cardinal-west # icon z15- +# spherical_buoy-isolated_danger # icon z15- +# spherical_buoy-lateral-port # icon z15- +# spherical_buoy-lateral-starboard # icon z15- +# spherical_buoy-safe_water # icon z15- +# spherical_buoy-special_purpose # icon z15- +# === 216 + +# beacon-cardinal-east # icon z13- +# beacon-cardinal-north # icon z13- +# beacon-cardinal-south # icon z13- +# beacon-cardinal-west # icon z13- +# beacon-isolated_danger # icon z13- +# beacon-lateral-port # icon z13- +# beacon-lateral-starboard # icon z13- +# beacon-safe_water # icon z13- +# beacon-special_purpose # icon z13- +# buoy-cardinal-east # icon z13- +# buoy-cardinal-north # icon z13- +# buoy-cardinal-south # icon z13- +# buoy-cardinal-west # icon z13- +# buoy-isolated_danger # icon z13- +# buoy-lateral-port # icon z13- +# buoy-lateral-starboard # icon z13- +# buoy-safe_water # icon z13- +# buoy-special_purpose # icon z13- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z14- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z13- (also has caption(optional) z16-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z15- and caption z16- (also has caption(optional) z16-) +# === 6 + +# +# All automatic optional captions priorities are below 0. +# They follow the order of their correspoding icons. +# + +# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-) +# === -2800 + +# railway-station-subway-moscow # caption(optional) z12-15 (also has icon z11-15) +# railway-station-subway-spb # caption(optional) z12-16 (also has icon z11-16) +# === -3000 + +# aeroway-aerodrome # caption(optional) z14- (also has icon z14-, area z10-) +# === -3050 + +# amenity-ferry_terminal # caption(optional) z16- (also has icon z11-) +# railway-station # caption(optional) z12- (also has icon z12-) +# === -3200 + +# boundary-national_park # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-1 # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) +# boundary-protected_area-2 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-3 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-4 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-5 # caption(optional) z11-17 (also has icon z10-17) +# boundary-protected_area-6 # caption(optional) z11-17 (also has icon z10-17) +# leisure-nature_reserve # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17) +# === -3300 + +# barrier-toll_booth # caption(optional) z16- (also has icon z16-) +# === -3400 + +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) +# === -3449 + +# historic-castle # caption(optional) z12- (also has icon z12-) +# historic-castle-castrum # caption(optional) z12- (also has icon z12-) +# historic-castle-defensive # caption(optional) z12- (also has icon z12-) +# historic-castle-fortified_church # caption(optional) z12- (also has icon z12-) +# historic-castle-fortress # caption(optional) z12- (also has icon z12-) +# historic-castle-hillfort # caption(optional) z12- (also has icon z12-) +# historic-castle-kremlin # caption(optional) z12- (also has icon z12-) +# historic-castle-manor # caption(optional) z12- (also has icon z12-) +# historic-castle-palace # caption(optional) z12- (also has icon z12-) +# historic-castle-shiro # caption(optional) z12- (also has icon z12-) +# historic-castle-stately # caption(optional) z12- (also has icon z12-) +# historic-fort # caption(optional) z12- (also has icon z12-) +# === -3450 + +# aerialway-station # caption(optional) z15- (also has icon z12-) +# === -3500 + +# amenity-bus_station # caption(optional) z14- (also has icon z13-) +# === -3650 + +# railway-station-funicular # caption(optional) z12- (also has icon z12-) +# railway-station-light_rail # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-) +# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-) +# railway-station-monorail # caption(optional) z14- (also has icon z13-) +# railway-station-subway # caption(optional) z14- (also has icon z13-) +# railway-station-subway-adana # caption(optional) z14- (also has icon z12-) +# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-) +# railway-station-subway-almaty # caption(optional) z14- (also has icon z12-) +# railway-station-subway-amsterdam # caption(optional) z14- (also has icon z12-) +# railway-station-subway-ankara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-athens # caption(optional) z14- (also has icon z13-) +# railway-station-subway-baku # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bangkok # caption(optional) z14- (also has icon z13-) +# railway-station-subway-barcelona # caption(optional) z14- (also has icon z13-) +# railway-station-subway-beijing # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bengalore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-berlin # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bilbao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-boston # caption(optional) z14- (also has icon z12-) +# railway-station-subway-brasilia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brescia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-brussels # caption(optional) z14- (also has icon z13-) +# railway-station-subway-bucharest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-budapest # caption(optional) z14- (also has icon z13-) +# railway-station-subway-buenos_aires # caption(optional) z14- (also has icon z12-) +# railway-station-subway-bursa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-cairo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-caracas # caption(optional) z14- (also has icon z13-) +# railway-station-subway-catania # caption(optional) z14- (also has icon z13-) +# railway-station-subway-changchun # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chengdu # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chicago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-chongqing # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dalian # caption(optional) z14- (also has icon z13-) +# railway-station-subway-delhi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dnepro # caption(optional) z14- (also has icon z13-) +# railway-station-subway-dubai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-ekb # caption(optional) z14- (also has icon z13-) +# railway-station-subway-fukuoka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-glasgow # caption(optional) z14- (also has icon z13-) +# railway-station-subway-guangzhou # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-) +# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-) +# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-) +# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kazan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kharkiv # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kiev # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-kobe # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kolkata # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kunming # caption(optional) z14- (also has icon z13-) +# railway-station-subway-kyoto # caption(optional) z14- (also has icon z13-) +# railway-station-subway-la # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lausanne # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lille # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lima # caption(optional) z14- (also has icon z13-) +# railway-station-subway-lisboa # caption(optional) z14- (also has icon z12-) +# railway-station-subway-london # caption(optional) z14- (also has icon z12-) +# railway-station-subway-lyon # caption(optional) z14- (also has icon z13-) +# railway-station-subway-madrid # caption(optional) z14- (also has icon z12-) +# railway-station-subway-malaga # caption(optional) z14- (also has icon z13-) +# railway-station-subway-manila # caption(optional) z14- (also has icon z13-) +# railway-station-subway-maracaibo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mashhad # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mecca # caption(optional) z14- (also has icon z13-) +# railway-station-subway-medellin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-mexico # caption(optional) z14- (also has icon z12-) +# railway-station-subway-milan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-minsk # caption(optional) z12-16 (also has icon z12-16) +# railway-station-subway-montreal # caption(optional) z14- (also has icon z13-) +# railway-station-subway-munchen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-nagoya # caption(optional) z14- (also has icon z13-) +# railway-station-subway-newyork # caption(optional) z14- (also has icon z12-) +# railway-station-subway-nnov # caption(optional) z14- (also has icon z13-) +# railway-station-subway-novosibirsk # caption(optional) z14- (also has icon z13-) +# railway-station-subway-osaka # caption(optional) z14- (also has icon z13-) +# railway-station-subway-oslo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-palma # caption(optional) z14- (also has icon z13-) +# railway-station-subway-panama # caption(optional) z14- (also has icon z13-) +# railway-station-subway-paris # caption(optional) z14- (also has icon z12-) +# railway-station-subway-philadelphia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-pyongyang # caption(optional) z14- (also has icon z13-) +# railway-station-subway-qingdao # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rennes # caption(optional) z14- (also has icon z13-) +# railway-station-subway-rio # caption(optional) z14- (also has icon z13-) +# railway-station-subway-roma # caption(optional) z14-16 (also has icon z12-16) +# railway-station-subway-rotterdam # caption(optional) z14- (also has icon z13-) +# railway-station-subway-samara # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santiago # caption(optional) z14- (also has icon z13-) +# railway-station-subway-santo_domingo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-saopaulo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sapporo # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sf # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-) +# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-) +# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-) +# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-stockholm # caption(optional) z14- (also has icon z12-) +# railway-station-subway-tabriz # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taipei # caption(optional) z14- (also has icon z13-) +# railway-station-subway-taoyuan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tashkent # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tbilisi # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tehran # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tianjin # caption(optional) z14- (also has icon z13-) +# railway-station-subway-tokyo # caption(optional) z14- (also has icon z14-) +# railway-station-subway-valencia # caption(optional) z14- (also has icon z13-) +# railway-station-subway-vienna # caption(optional) z14- (also has icon z12-) +# railway-station-subway-warszawa # caption(optional) z14- (also has icon z13-) +# railway-station-subway-washington # caption(optional) z14- (also has icon z13-) +# railway-station-subway-wuhan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yerevan # caption(optional) z14- (also has icon z13-) +# railway-station-subway-yokohama # caption(optional) z14- (also has icon z13-) +# === -3750 + +# barrier-border_control # caption(optional) z14- (also has icon z12-) +# railway-halt # caption(optional) z13- (also has icon z13-) +# tourism-alpine_hut # caption(optional) z11- (also has icon z11-) +# waterway-waterfall # caption(optional) z11- (also has icon z10-) +# === -4200 + +# man_made-communications_tower # caption(optional) z13- (also has icon z12-) +# man_made-lighthouse # caption(optional) z14- (also has icon z11-) +# natural-peak # caption(optional) z11- (also has icon z10-) +# natural-volcano # caption(optional) z13- (also has icon z10-) +# === -4600 + +# amenity-theatre # caption(optional) z14- (also has icon z14-) +# historic-battlefield # caption(optional) z15- (also has icon z15-) +# historic-city_gate # caption(optional) z13- (also has icon z13-) +# historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) +# leisure-water_park # caption(optional) z16- (also has icon z16-, area z13-) +# shop-mall # caption(optional) z14- (also has icon z14-) +# tourism-aquarium # caption(optional) z16- (also has icon z16-) +# tourism-museum # caption(optional) z13- (also has icon z13-) +# tourism-theme_park # caption(optional) z14- (also has icon z14-) +# tourism-zoo # caption(optional) z13- (also has icon z13-) +# === -4800 + +# amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) +# leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) +# === -4900 + +# leisure-marina # caption(optional) z16- (also has icon z16-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# mountain_pass # caption(optional) z12- (also has icon z11-) +# === -4950 + +# tourism-viewpoint # caption(optional) z13- (also has icon z11-) +# === -5050 + +# landuse-forest # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-coniferous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-deciduous # caption(optional) z13- (also has icon z12-, area z10-) +# landuse-forest-mixed # caption(optional) z13- (also has icon z12-, area z10-) +# === -5200 + +# natural-cave_entrance # caption(optional) z11- (also has icon z10-) +# natural-geyser # caption(optional) z12- (also has icon z10-) +# natural-hot_spring # caption(optional) z15- (also has icon z12-) +# natural-spring # caption(optional) z14- (also has icon z12-) +# === -5350 + +# natural-saddle # caption(optional) z15- (also has icon z13-) +# === -5500 + +# railway-subway_entrance-moscow # caption(optional) z15- (also has icon z15-) +# railway-subway_entrance-spb # caption(optional) z16- (also has icon z15-) +# === -5550 + +# amenity-ranger_station # caption(optional) z14- (also has icon z13-, area z13-) +# historic-monument # caption(optional) z13- (also has icon z13-) +# tourism-information-office # caption(optional) z14- (also has icon z13-, area z15-) +# tourism-information-visitor_centre # caption(optional) z14- (also has icon z13-, area z13-) +# === -5600 + +# amenity-community_centre # caption(optional) z15- (also has icon z15-) +# amenity-community_centre-youth_centre # caption(optional) z15- (also has icon z15-) +# amenity-conference_centre # caption(optional) z16- (also has icon z16-) +# amenity-events_venue # caption(optional) z16- (also has icon z16-) +# amenity-exhibition_centre # caption(optional) z16- (also has icon z16-) +# tourism-attraction # caption(optional) z14- (also has icon z14-) +# tourism-gallery # caption(optional) z15- (also has icon z15-) +# === -5700 + +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) +# === -5720 + +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) +# waterway-fuel # caption(optional) z16- (also has icon z16-) +# === -5730 + +# highway-services # caption(optional) z14- (also has icon z14-, area z13-) +# === -5750 + +# amenity-place_of_worship-buddhist # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-christian-mormon # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-hindu # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-jewish # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-muslim # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-shinto # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-place_of_worship-taoist # caption(optional) z14- (also has icon z14-, area z13-) +# === -5800 + +# amenity-place_of_worship # caption(optional) z14- (also has icon z14-, area z13-) +# historic-memorial # caption(optional) z15- (also has icon z15-) +# === -5850 + +# amenity-cafe # caption(optional) z15- (also has icon z15-) +# amenity-restaurant # caption(optional) z15- (also has icon z15-) +# === -5900 + +# amenity-fast_food # caption(optional) z15- (also has icon z15-) +# amenity-food_court # caption(optional) z15- (also has icon z15-) +# === -5950 + +# amenity-bar # caption(optional) z15- (also has icon z15-) +# === -6000 + +# amenity-biergarten # caption(optional) z15- (also has icon z15-) +# amenity-pub # caption(optional) z15- (also has icon z15-) +# === -6050 + +# amenity-shelter-basic_hut # caption(optional) z13- (also has icon z12-) +# amenity-shelter-lean_to # caption(optional) z13- (also has icon z12-) +# emergency-mountain_rescue # caption(optional) z12- (also has icon z12-, area z13-) +# tourism-wilderness_hut # caption(optional) z13- (also has icon z12-) +# === -6100 + +# highway-rest_area # caption(optional) z15- (also has icon z14-, area z13-) +# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-) +# tourism-caravan_site # caption(optional) z13- (also has icon z13-) +# tourism-chalet # caption(optional) z14- (also has icon z14-) +# === -6150 + +# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) +# === -6200 + +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6248 + +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) +# === -6249 + +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) +# === -6250 + +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) +# === -6251 + +# railway-subway_entrance # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-almaty # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-amsterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ankara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-athens # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-baku # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bangkok # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-barcelona # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-beijing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bengalore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-berlin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bilbao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-boston # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brasilia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brescia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-brussels # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bucharest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-budapest # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-buenos_aires # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-bursa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-cairo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-caracas # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-catania # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-changchun # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chengdu # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chicago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-chongqing # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dalian # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-delhi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dnepro # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-dubai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-ekb # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-fukuoka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-glasgow # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-guangzhou # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kazan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kharkiv # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kiev # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kobe # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kolkata # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kunming # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-kyoto # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-la # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lausanne # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lille # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lima # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lisboa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-london # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-lyon # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-madrid # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-malaga # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-manila # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-maracaibo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mashhad # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mecca # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-medellin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-mexico # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-milan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-minsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-montreal # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-munchen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nagoya # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-newyork # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-nnov # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-novosibirsk # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-osaka # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-oslo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-palma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-panama # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-paris # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-philadelphia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-pyongyang # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-qingdao # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rennes # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rio # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-roma # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-rotterdam # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-samara # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santiago # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-santo_domingo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-saopaulo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sapporo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-stockholm # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tabriz # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taipei # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-taoyuan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tashkent # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tbilisi # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tehran # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tianjin # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-tokyo # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-valencia # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-vienna # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-warszawa # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-washington # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-wuhan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yerevan # caption(optional) z17- (also has icon z16-) +# railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) +# === -6300 + +# railway-tram_stop # caption(optional) z17- (also has icon z14-) +# === -6350 + +# highway-bus_stop # caption(optional) z17- (also has icon z14-) +# === -6400 + +# amenity-drinking_water # caption(optional) z14- (also has icon z12-) +# === -6500 + +# leisure-beach_resort # caption(optional) z16- (also has icon z16-, area z10-) +# === -6700 + +# shop-supermarket # caption(optional) z16- (also has icon z16-) +# === -6800 + +# amenity-water_point # caption(optional) z14- (also has icon z12-) +# historic-aircraft # caption(optional) z16- (also has icon z16-) +# historic-locomotive # caption(optional) z16- (also has icon z16-) +# historic-mine # caption(optional) z15- (also has icon z15-) +# historic-ship # caption(optional) z15- (also has icon z15-) +# historic-tank # caption(optional) z16- (also has icon z16-) +# historic-wreck # caption(optional) z16- (also has icon z16-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, area z10-) +# man_made-water_tap # caption(optional) z14- (also has icon z12-) +# man_made-water_well # caption(optional) z14- (also has icon z12-) +# man_made-windmill # caption(optional) z16- (also has icon z16-) +# === -6950 + +# natural-rock # caption(optional) z17- (also has icon z14-) +# === -7150 + +# amenity-townhall # caption(optional) z15- (also has icon z15-) +# leisure-resort # caption(optional) z16- (also has icon z16-, area z13-) +# tourism-hotel # caption(optional) z16- (also has icon z16-) +# === -7250 + +# amenity-arts_centre # caption(optional) z17- (also has icon z17-) +# amenity-bank # caption(optional) z16- (also has icon z16-) +# amenity-library # caption(optional) z17- (also has icon z17-) +# amenity-marketplace # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-pharmacy # caption(optional) z17- (also has icon z16-) +# shop-convenience # caption(optional) z16- (also has icon z16-) +# shop-deli # caption(optional) z16- (also has icon z16-) +# shop-farm # caption(optional) z16- (also has icon z16-) +# shop-greengrocer # caption(optional) z16- (also has icon z16-) +# shop-grocery # caption(optional) z16- (also has icon z16-) +# shop-health_food # caption(optional) z16- (also has icon z16-) +# === -7300 + +# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-) +# amenity-boat_rental # caption(optional) z17- (also has icon z17-) +# amenity-car_sharing # caption(optional) z18- (also has icon z18-) +# amenity-taxi # caption(optional) z16- (also has icon z16-) +# === -7400 + +# historic-memorial-sculpture # caption(optional) z15- (also has icon z15-) +# historic-memorial-statue # caption(optional) z15- (also has icon z15-) +# tourism-artwork-sculpture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-statue # caption(optional) z15- (also has icon z15-) +# === -7410 + +# tourism-motel # caption(optional) z16- (also has icon z16-) +# === -7420 + +# tourism-apartment # caption(optional) z16- (also has icon z16-) +# tourism-guest_house # caption(optional) z16- (also has icon z16-) +# tourism-hostel # caption(optional) z16- (also has icon z16-) +# === -7430 + +# amenity-ice_cream # caption(optional) z17- (also has icon z16-) +# shop-bakery # caption(optional) z16- (also has icon z16-) +# shop-butcher # caption(optional) z16- (also has icon z16-) +# shop-cheese # caption(optional) z16- (also has icon z16-) +# shop-chocolate # caption(optional) z16- (also has icon z16-) +# shop-confectionery # caption(optional) z16- (also has icon z16-) +# shop-pasta # caption(optional) z16- (also has icon z16-) +# shop-pastry # caption(optional) z16- (also has icon z16-) +# shop-seafood # caption(optional) z16- (also has icon z16-) +# shop-water # caption(optional) z16- (also has icon z16-) +# === -7450 + +# aeroway-helipad # caption(optional) z16- (also has icon z16-) +# amenity-bicycle_repair_station # caption(optional) z17- (also has icon z17-) +# amenity-car_rental # caption(optional) z18- (also has icon z18-) +# amenity-motorcycle_rental # caption(optional) z17- (also has icon z17-) +# === -7500 + +# amenity-cinema # caption(optional) z17- (also has icon z17-) +# amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-nightclub # caption(optional) z16- (also has icon z16-) +# amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction # caption(optional) z16- (also has icon z16-) +# attraction-amusement_ride # caption(optional) z16- (also has icon z16-) +# attraction-animal # caption(optional) z16- (also has icon z16-) +# attraction-big_wheel # caption(optional) z16- (also has icon z16-) +# attraction-bumper_car # caption(optional) z16- (also has icon z16-) +# attraction-carousel # caption(optional) z16- (also has icon z16-) +# attraction-historic # caption(optional) z16- (also has icon z16-) +# attraction-maze # caption(optional) z16- (also has icon z16-) +# attraction-roller_coaster # caption(optional) z16- (also has icon z16-) +# attraction-water_slide # caption(optional) z17- (also has icon z17-) +# landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) +# leisure-bowling_alley # caption(optional) z17- (also has icon z17-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) +# leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) +# office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -7550 + +# amenity-bureau_de_change # caption(optional) z18- (also has icon z17-) +# amenity-public_bath # caption(optional) z17- (also has icon z17-) +# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-, area z15-) +# craft-brewery # caption(optional) z18- (also has icon z17-) +# craft-confectionery # caption(optional) z18- (also has icon z17-) +# craft-winery # caption(optional) z18- (also has icon z17-) +# shop-alcohol # caption(optional) z16- (also has icon z16-) +# shop-antiques # caption(optional) z16- (also has icon z16-) +# shop-appliance # caption(optional) z18- (also has icon z18-) +# shop-baby_goods # caption(optional) z18- (also has icon z18-) +# shop-beauty # caption(optional) z16- (also has icon z16-) +# shop-beauty-day_spa # caption(optional) z16- (also has icon z16-) +# shop-beauty-nails # caption(optional) z16- (also has icon z16-) +# shop-beverages # caption(optional) z16- (also has icon z16-) +# shop-boutique # caption(optional) z18- (also has icon z18-) +# shop-car_repair # caption(optional) z16- (also has icon z16-) +# shop-caravan # caption(optional) z16- (also has icon z16-) +# shop-charity # caption(optional) z16- (also has icon z16-) +# shop-chemist # caption(optional) z16- (also has icon z16-) +# shop-clothes # caption(optional) z16- (also has icon z16-) +# shop-computer # caption(optional) z16- (also has icon z16-) +# shop-cosmetics # caption(optional) z16- (also has icon z16-) +# shop-dairy # caption(optional) z18- (also has icon z18-) +# shop-department_store # caption(optional) z16- (also has icon z16-) +# shop-electronics # caption(optional) z16- (also has icon z16-) +# shop-fashion_accessories # caption(optional) z18- (also has icon z18-) +# shop-florist # caption(optional) z16- (also has icon z16-) +# shop-hairdresser # caption(optional) z16- (also has icon z16-) +# shop-laundry # caption(optional) z16- (also has icon z16-) +# shop-mobile_phone # caption(optional) z16- (also has icon z16-) +# shop-newsagent # caption(optional) z18- (also has icon z17-) +# shop-second_hand # caption(optional) z16- (also has icon z16-) +# shop-shoes # caption(optional) z16- (also has icon z16-) +# shop-sports # caption(optional) z16- (also has icon z16-) +# shop-stationery # caption(optional) z16- (also has icon z16-) +# shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) +# shop-toys # caption(optional) z16- (also has icon z16-) +# shop-travel_agency # caption(optional) z18- (also has icon z18-) +# shop-wine # caption(optional) z16- (also has icon z16-) +# === -7600 + +# amenity-hunting_stand # caption(optional) z15- (also has icon z14-) +# barrier-block # caption(optional) z16- (also has icon z16-) +# barrier-bollard # caption(optional) z16- (also has icon z16-) +# barrier-chain # caption(optional) z16- (also has icon z16-) +# barrier-cycle_barrier # caption(optional) z16- (also has icon z16-) +# barrier-gate # caption(optional) z16- (also has icon z16-) +# barrier-kissing_gate # caption(optional) z16- (also has icon z16-) +# barrier-lift_gate # caption(optional) z16- (also has icon z16-) +# barrier-stile # caption(optional) z16- (also has icon z16-) +# barrier-swing_gate # caption(optional) z16- (also has icon z16-) +# barrier-turnstile # caption(optional) z16- (also has icon z16-) +# barrier-wicket_gate # caption(optional) z17- (also has icon z17-) +# barrier-yes # caption(optional) z16- (also has icon z16-, line z15-) +# leisure-dog_park # caption(optional) z16- (also has icon z16-, area z15-) +# === -7700 + +# amenity-clinic # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-college # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-courthouse # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-dentist # caption(optional) z17- (also has icon z17-) +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -8000 + +# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-) +# leisure-golf_course # caption(optional) z17- (also has icon z15-, area z12-) +# leisure-miniature_golf # caption(optional) z17- (also has icon z16-, area z14-) +# tourism-picnic_site # caption(optional) z14- (also has icon z14-) +# === -8200 + +# building-train_station # caption(optional) z17- (also has icon z17-, area z14-) +# === -8300 + +# leisure-sports_centre-sport-swimming # caption(optional) z15- (also has icon z15-, area z13-) +# === -8380 + +# leisure-fitness_centre-sport-yoga # caption(optional) z17- (also has icon z16-, area z16-) +# leisure-sports_centre-sport-american_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-archery # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-athletics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-australian_football # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-badminton # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-baseball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-basketball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-boules # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-bowls # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-climbing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-cricket # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-curling # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-equestrian # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-four_square # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-futsal # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-golf # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-handball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-multi # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-padel # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pelota # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-pickleball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-shooting # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skateboard # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-skiing # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-soccer # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-tennis # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-volleyball # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_centre-sport-yoga # caption(optional) z16- (also has icon z16-, area z13-) +# === -8390 + +# amenity-animal_shelter # caption(optional) z17- (also has icon z17-) +# amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-flight_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) +# amenity-money_transfer # caption(optional) z18- (also has icon z17-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-payment_centre # caption(optional) z18- (also has icon z17-) +# amenity-prep_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-sailing_school # caption(optional) z17- (also has icon z17-) +# amenity-veterinary # caption(optional) z16- (also has icon z16-) +# craft-electrician # caption(optional) z18- (also has icon z17-) +# craft-electronics_repair # caption(optional) z18- (also has icon z17-) +# craft-photographer # caption(optional) z18- (also has icon z17-) +# craft-plumber # caption(optional) z18- (also has icon z17-) +# craft-shoemaker # caption(optional) z18- (also has icon z17-) +# craft-tailor # caption(optional) z18- (also has icon z17-) +# healthcare-blood_donation # caption(optional) z17- (also has icon z17-) +# healthcare-laboratory # caption(optional) z17- (also has icon z17-) +# healthcare-optometrist # caption(optional) z17- (also has icon z17-) +# healthcare-physiotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-sample_collection # caption(optional) z17- (also has icon z17-) +# leisure-escape_game # caption(optional) z17- (also has icon z17-) +# leisure-fitness_centre # caption(optional) z17- (also has icon z16-) +# leisure-hackerspace # caption(optional) z17- (also has icon z17-) +# leisure-sauna # caption(optional) z17- (also has icon z17-) +# man_made-observatory # caption(optional) z16- (also has icon z15-) +# office-estate_agent # caption(optional) z18- (also has icon z18-) +# office-government # caption(optional) z18- (also has icon z18-) +# office-insurance # caption(optional) z18- (also has icon z18-) +# office-lawyer # caption(optional) z17- (also has icon z17-) +# shop-art # caption(optional) z16- (also has icon z16-) +# shop-bag # caption(optional) z18- (also has icon z18-) +# shop-bathroom_furnishing # caption(optional) z18- (also has icon z18-) +# shop-bed # caption(optional) z18- (also has icon z18-) +# shop-bicycle # caption(optional) z16- (also has icon z16-) +# shop-books # caption(optional) z16- (also has icon z16-) +# shop-camera # caption(optional) z16- (also has icon z16-) +# shop-cannabis # caption(optional) z18- (also has icon z18-) +# shop-car # caption(optional) z16- (also has icon z16-) +# shop-car_parts # caption(optional) z16- (also has icon z16-) +# shop-coffee # caption(optional) z18- (also has icon z18-) +# shop-copyshop # caption(optional) z16- (also has icon z16-) +# shop-doityourself # caption(optional) z16- (also has icon z16-) +# shop-dry_cleaning # caption(optional) z16- (also has icon z16-) +# shop-electrical # caption(optional) z18- (also has icon z18-) +# shop-erotic # caption(optional) z16- (also has icon z16-) +# shop-furniture # caption(optional) z16- (also has icon z16-) +# shop-garden_centre # caption(optional) z16- (also has icon z16-) +# shop-gift # caption(optional) z16- (also has icon z16-) +# shop-hardware # caption(optional) z16- (also has icon z16-) +# shop-houseware # caption(optional) z16- (also has icon z16-) +# shop-interior_decoration # caption(optional) z16- (also has icon z16-) +# shop-jewelry # caption(optional) z16- (also has icon z16-) +# shop-kiosk # caption(optional) z16- (also has icon z16-) +# shop-kitchen # caption(optional) z16- (also has icon z16-) +# shop-lighting # caption(optional) z16- (also has icon z16-) +# shop-massage # caption(optional) z18- (also has icon z17-) +# shop-money_lender # caption(optional) z17- (also has icon z17-) +# shop-motorcycle # caption(optional) z16- (also has icon z16-) +# shop-motorcycle_repair # caption(optional) z18- (also has icon z16-) +# shop-music # caption(optional) z16- (also has icon z16-) +# shop-musical_instrument # caption(optional) z16- (also has icon z16-) +# shop-nutrition_supplements # caption(optional) z18- (also has icon z18-) +# shop-optician # caption(optional) z16- (also has icon z16-) +# shop-outdoor # caption(optional) z16- (also has icon z16-) +# shop-paint # caption(optional) z18- (also has icon z18-) +# shop-pawnbroker # caption(optional) z17- (also has icon z17-) +# shop-perfumery # caption(optional) z18- (also has icon z18-) +# shop-pet # caption(optional) z16- (also has icon z16-) +# shop-photo # caption(optional) z16- (also has icon z16-) +# shop-rental # caption(optional) z16- (also has icon z16-) +# shop-rental-bike # caption(optional) z16- (also has icon z16-) +# shop-sewing # caption(optional) z16- (also has icon z16-) +# shop-tattoo # caption(optional) z16- (also has icon z16-) +# shop-ticket # caption(optional) z16- (also has icon z16-) +# shop-tobacco # caption(optional) z18- (also has icon z18-) +# shop-tyres # caption(optional) z16- (also has icon z16-) +# shop-variety_store # caption(optional) z17- (also has icon z17-) +# shop-video # caption(optional) z16- (also has icon z16-) +# shop-video_games # caption(optional) z16- (also has icon z16-) +# === -8400 + +# aeroway-gate # caption(optional) z17- (also has icon z17-) +# amenity-kindergarten # caption(optional) z17- (also has icon z17-, area z13-) +# amenity-school # caption(optional) z16- (also has icon z16-, area z13-) +# amenity-studio # caption(optional) z16- (also has icon z16-) +# historic-archaeological_site # caption(optional) z17- (also has icon z17-) +# historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# historic-gallows # caption(optional) z17- (also has icon z16-) +# historic-memorial-cross # caption(optional) z17- (also has icon z17-) +# historic-pillory # caption(optional) z17- (also has icon z16-) +# historic-tomb # caption(optional) z16- (also has icon z16-) +# historic-wayside_cross # caption(optional) z16- (also has icon z16-) +# historic-wayside_shrine # caption(optional) z17- (also has icon z16-) +# man_made-cross # caption(optional) z16- (also has icon z14-) +# tourism-artwork # caption(optional) z15- (also has icon z15-) +# tourism-artwork-architecture # caption(optional) z15- (also has icon z15-) +# tourism-artwork-painting # caption(optional) z15- (also has icon z15-) +# === -8450 + +# amenity-shelter # caption(optional) z13- (also has icon z12-) +# amenity-shelter-public_transport # caption(optional) z14- (also has icon z14-) +# emergency-lifeguard # caption(optional) z18- (also has icon z14-) +# leisure-bandstand # caption(optional) z17- (also has icon z17-) +# leisure-fitness_station # caption(optional) z17- (also has icon z17-, area z15-) +# leisure-playground # caption(optional) z17- (also has icon z17-, area z15-) +# === -8500 + +# sport-american_football # caption(optional) z17- (also has icon z17-) +# sport-athletics # caption(optional) z17- (also has icon z17-) +# sport-badminton # caption(optional) z17- (also has icon z17-) +# sport-baseball # caption(optional) z17- (also has icon z17-) +# sport-basketball # caption(optional) z17- (also has icon z17-) +# sport-beachvolleyball # caption(optional) z17- (also has icon z17-) +# sport-climbing # caption(optional) z17- (also has icon z17-) +# sport-field_hockey # caption(optional) z17- (also has icon z17-) +# sport-four_square # caption(optional) z17- (also has icon z17-) +# sport-golf # caption(optional) z17- (also has icon z17-) +# sport-gymnastics # caption(optional) z17- (also has icon z17-) +# sport-handball # caption(optional) z17- (also has icon z17-) +# sport-ice_hockey # caption(optional) z17- (also has icon z17-) +# sport-padel # caption(optional) z17- (also has icon z17-) +# sport-pelota # caption(optional) z17- (also has icon z17-) +# sport-pickleball # caption(optional) z17- (also has icon z17-) +# sport-skateboard # caption(optional) z17- (also has icon z17-) +# sport-skiing # caption(optional) z17- (also has icon z17-) +# sport-swimming # caption(optional) z17- (also has icon z17-) +# sport-table_tennis # caption(optional) z17- (also has icon z17-) +# sport-tennis # caption(optional) z17- (also has icon z17-) +# sport-volleyball # caption(optional) z17- (also has icon z17-) +# sport-yoga # caption(optional) z17- (also has icon z17-) +# === -8600 + +# sport-10pin # caption(optional) z17- (also has icon z17-) +# sport-9pin # caption(optional) z17- (also has icon z17-) +# sport-archery # caption(optional) z17- (also has icon z17-) +# sport-australian_football # caption(optional) z17- (also has icon z17-) +# sport-boules # caption(optional) z17- (also has icon z17-) +# sport-bowls # caption(optional) z17- (also has icon z17-) +# sport-chess # caption(optional) z17- (also has icon z17-) +# sport-cricket # caption(optional) z17- (also has icon z17-) +# sport-curling # caption(optional) z17- (also has icon z17-) +# sport-diving # caption(optional) z17- (also has icon z17-) +# sport-equestrian # caption(optional) z17- (also has icon z17-) +# sport-futsal # caption(optional) z17- (also has icon z17-) +# sport-scuba_diving # caption(optional) z17- (also has icon z17-) +# sport-shooting # caption(optional) z17- (also has icon z17-) +# === -8650 + +# sport-multi # caption(optional) z17- (also has icon z17-) +# sport-soccer # caption(optional) z17- (also has icon z17-) +# === -8700 + +# amenity-atm # caption(optional) z18- (also has icon z18-) +# amenity-dojo # caption(optional) z18- (also has icon z16-) +# leisure-dance # caption(optional) z17- (also has icon z16-) +# leisure-sports_centre # caption(optional) z16- (also has icon z16-, area z13-) +# leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# === -8750 + +# amenity-compressed_air # caption(optional) z19- (also has icon z18-) +# amenity-parcel_locker # caption(optional) z17- (also has icon z17-) +# amenity-payment_terminal # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) +# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) +# amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-) +# leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-) +# man_made-telescope-radio # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) +# man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) +# natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) +# === -8800 + +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-nursing_home # caption(optional) z17- (also has icon z17-) +# amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) +# amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) +# leisure-ice_rink # caption(optional) z17- (also has icon z17-) +# leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) +# man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) +# man_made-flagpole # caption(optional) z14- (also has icon z13-) +# man_made-flare # caption(optional) z18- (also has icon z13-) +# man_made-mast-communication # caption(optional) z14- (also has icon z13-) +# man_made-tower # caption(optional) z14- (also has icon z13-) +# man_made-tower-communication # caption(optional) z14- (also has icon z13-) +# === -9150 + +# man_made-works # caption(optional) z17- (also has icon z16-, area z13-) +# === -9300 + +# amenity-brothel # caption(optional) z18- (also has icon z18-) +# amenity-casino # caption(optional) z17- (also has icon z17-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-gambling # caption(optional) z17- (also has icon z17-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) +# amenity-love_hotel # caption(optional) z18- (also has icon z18-) +# amenity-police # caption(optional) z17- (also has icon z16-, area z15-) +# amenity-stripclub # caption(optional) z18- (also has icon z18-) +# craft # caption(optional) z18- (also has icon z18-) +# craft-beekeeper # caption(optional) z18- (also has icon z17-) +# craft-blacksmith # caption(optional) z18- (also has icon z17-) +# craft-carpenter # caption(optional) z18- (also has icon z17-) +# craft-caterer # caption(optional) z18- (also has icon z17-) +# craft-gardener # caption(optional) z18- (also has icon z17-) +# craft-grinding_mill # caption(optional) z18- (also has icon z17-) +# craft-handicraft # caption(optional) z18- (also has icon z17-) +# craft-hvac # caption(optional) z18- (also has icon z17-) +# craft-key_cutter # caption(optional) z18- (also has icon z17-) +# craft-locksmith # caption(optional) z18- (also has icon z17-) +# craft-metal_construction # caption(optional) z18- (also has icon z17-) +# craft-painter # caption(optional) z18- (also has icon z17-) +# craft-sawmill # caption(optional) z18- (also has icon z17-) +# healthcare-alternative # caption(optional) z17- (also has icon z17-) +# healthcare-audiologist # caption(optional) z17- (also has icon z17-) +# healthcare-podiatrist # caption(optional) z17- (also has icon z17-) +# healthcare-psychotherapist # caption(optional) z17- (also has icon z17-) +# healthcare-speech_therapist # caption(optional) z17- (also has icon z17-) +# leisure-adult_gaming_centre # caption(optional) z17- (also has icon z17-) +# leisure-amusement_arcade # caption(optional) z17- (also has icon z17-) +# leisure-indoor_play # caption(optional) z17- (also has icon z17-) +# office-company # caption(optional) z18- (also has icon z18-) +# office-ngo # caption(optional) z18- (also has icon z18-) +# office-telecommunication # caption(optional) z18- (also has icon z18-) +# shop-agrarian # caption(optional) z16- (also has icon z16-) +# shop-auction # caption(optional) z18- (also has icon z18-) +# shop-bookmaker # caption(optional) z18- (also has icon z18-) +# shop-carpet # caption(optional) z18- (also has icon z18-) +# shop-collector # caption(optional) z18- (also has icon z18-) +# shop-craft # caption(optional) z18- (also has icon z18-) +# shop-curtain # caption(optional) z18- (also has icon z18-) +# shop-fabric # caption(optional) z18- (also has icon z18-) +# shop-fishing # caption(optional) z18- (also has icon z18-) +# shop-funeral_directors # caption(optional) z18- (also has icon z18-) +# shop-gas # caption(optional) z16- (also has icon z16-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) +# shop-herbalist # caption(optional) z18- (also has icon z18-) +# shop-hifi # caption(optional) z18- (also has icon z18-) +# shop-lottery # caption(optional) z18- (also has icon z18-) +# shop-medical_supply # caption(optional) z18- (also has icon z18-) +# shop-outpost # caption(optional) z18- (also has icon z18-) +# shop-pet_grooming # caption(optional) z18- (also has icon z18-) +# shop-storage_rental # caption(optional) z18- (also has icon z18-) +# shop-trade # caption(optional) z16- (also has icon z16-) +# shop-watches # caption(optional) z18- (also has icon z18-) +# shop-wholesale # caption(optional) z18- (also has icon z18-) +# === -9500 + +# amenity-shower # caption(optional) z17- (also has icon z17-) +# amenity-toilets # caption(optional) z18- (also has icon z15-) +# office # caption(optional) z18- (also has icon z18-) +# office-security # caption(optional) z18- (also has icon z17-) +# post_office-post_partner # caption(optional) z18- (also has icon z18-) +# shop # caption(optional) z18- (also has icon z18-) +# === -9530 + +# xmas-tree # icon z18- +# === -9540 + +# amenity-bbq # caption(optional) z17- (also has icon z16-) +# amenity-luggage_locker # caption(optional) z19- (also has icon z17-) +# amenity-public_bookcase # caption(optional) z18- (also has icon z18-) +# cemetery-grave # caption(optional) z17- (also has icon z17-) +# leisure-firepit # caption(optional) z17- (also has icon z16-) +# man_made-mast # caption(optional) z14- (also has icon z13-) +# man_made-silo # caption(optional) z14- (also has icon z13-) +# man_made-storage_tank # caption(optional) z14- (also has icon z13-) +# man_made-water_tower # caption(optional) z14- (also has icon z13-) +# === -9550 + +# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-multi-storey-fee # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-park_and_ride # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking-underground # caption(optional) z18- (also has icon z16-) +# amenity-parking-underground-fee # caption(optional) z18- (also has icon z16-) +# === -9700 + +# amenity-bicycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-bicycle_parking-covered # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-motorcycle_parking # caption(optional) z17- (also has icon z17-, area z15-) +# amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) +# amenity-parking_entrance # caption(optional) z19- (also has icon z17-) +# amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) +# === -9750 + +# building-guardhouse # caption(optional) z18- (also has icon z16-, area z14-) +# power-plant-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9770 + +# barrier-entrance # caption(optional) z16- (also has icon z16-) +# entrance-main # caption(optional) z18- (also has icon z17-) +# === -9775 + +# entrance # caption(optional) z19- (also has icon z18-) +# entrance-entry # caption(optional) z19- (also has icon z17-) +# entrance-exit # caption(optional) z19- (also has icon z17-) +# === -9780 + +# entrance-emergency # caption(optional) z20- (also has icon z20-) +# === -9785 + +# historic-anchor # caption(optional) z18- (also has icon z18-) +# historic-cannon # caption(optional) z18- (also has icon z18-) +# historic-memorial-plaque # caption(optional) z18- (also has icon z18-) +# historic-stone # caption(optional) z18- (also has icon z18-) +# === -9790 + +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) +# historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) +# === -9800 + +# amenity-parking-lane # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-lane-fee # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) +# === -9850 + +# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-) +# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-) +# leisure-slipway # caption(optional) z17- (also has icon z17-) +# man_made-petroleum_well # caption(optional) z18- (also has icon z14-) +# power-generator-wind # caption(optional) z16- (also has icon z13-, area z13-) +# === -9880 + +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) +# amenity-parking-no-access # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) +# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) +# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) +# === -9900 + +# man_made-cairn # icon z17- (also has caption(optional) z17-) +# man_made-survey_point # icon z14- (also has caption(optional) z15-) +# tourism-information # icon z15- (also has caption(optional) z15-) +# tourism-information-board # icon z15- (also has caption(optional) z15-) +# tourism-information-guidepost # icon z15- (also has caption(optional) z15-) +# tourism-information-map # icon z15- (also has caption(optional) z15-) +# tourism-information-tactile_map # icon z15- (also has caption(optional) z15-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z16- (also has icon z15-, caption z16-) +# === -9994 + +# amenity-bench # caption(optional) z19- (also has icon z18-) +# amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +# amenity-lounger # caption(optional) z19- (also has icon z18-) +# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) +# amenity-telephone # caption(optional) z19- (also has icon z17-) +# amenity-vending_machine # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-cigarettes # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-coffee # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-condoms # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-drinks # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-excrement_bags # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-food # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-newspapers # caption(optional) z18- (also has icon z18-) +# amenity-vending_machine-sweets # caption(optional) z18- (also has icon z18-) +# amenity-waste_basket # caption(optional) z19- (also has icon z18-) +# amenity-waste_disposal # caption(optional) z18- (also has icon z18-) +# emergency-access_point # caption(optional) z18- (also has icon z18-) +# emergency-assembly_point # caption(optional) z19- (also has icon z19-) +# emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # caption(optional) z18- (also has icon z18-) +# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) +# emergency-phone # caption(optional) z19- (also has icon z17-) +# entrance-garage # caption(optional) z19- (also has icon z19-) +# entrance-house # caption(optional) z19- (also has icon z18-) +# entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # caption(optional) z19- (also has icon z19-) +# man_made-cairn # caption(optional) z17- (also has icon z17-) +# 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-) +# 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-) +# tourism-information-guidepost # caption(optional) z15- (also has icon z15-) +# tourism-information-map # caption(optional) z15- (also has icon z15-) +# tourism-information-tactile_map # caption(optional) z15- (also has icon z15-) +# === -10000 diff --git a/data/styles/public-transport_outdoor/include/transit_systems.mapcss b/data/styles/public-transport_outdoor/include/transit_systems.mapcss new file mode 100644 index 000000000..d5dbfc876 --- /dev/null +++ b/data/styles/public-transport_outdoor/include/transit_systems.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/transit_systems.mapcss"); +@import("../../outdoor/include/transit_systems.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/ways.mapcss b/data/styles/public-transport_outdoor/include/ways.mapcss new file mode 100644 index 000000000..f307cb21d --- /dev/null +++ b/data/styles/public-transport_outdoor/include/ways.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/ways.mapcss"); +@import("../../outdoor/include/ways.mapcss"); diff --git a/data/styles/public-transport_outdoor/include/ways_label.mapcss b/data/styles/public-transport_outdoor/include/ways_label.mapcss new file mode 100644 index 000000000..9c411e7dd --- /dev/null +++ b/data/styles/public-transport_outdoor/include/ways_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/include/ways_label.mapcss"); +@import("../../outdoor/include/ways_label.mapcss"); diff --git a/data/styles/public-transport_outdoor/light/colors.mapcss b/data/styles/public-transport_outdoor/light/colors.mapcss new file mode 100644 index 000000000..cbfc4a834 --- /dev/null +++ b/data/styles/public-transport_outdoor/light/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../public-transport/light/colors.mapcss"); +@import("../../outdoor/light/colors.mapcss"); diff --git a/data/styles/public-transport_outdoor/light/style.mapcss b/data/styles/public-transport_outdoor/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/public-transport_outdoor/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/vehicle/dark/style.mapcss b/data/styles/vehicle/dark/style.mapcss index 3057c2490..b01d326b3 100644 --- a/data/styles/vehicle/dark/style.mapcss +++ b/data/styles/vehicle/dark/style.mapcss @@ -1,135 +1,9 @@ @import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - - -colors -{ - GuiText-color: #FFFFFF; - GuiText-opacity: 0.7; - MyPositionAccuracy-color: #FFFFFF; - MyPositionAccuracy-opacity: 0.06; - Selection-color: #FFFFFF; - Selection-opacity: 0.64; - Route-color: #0087FF; - RouteOutline-color: #055FCD; - RouteTrafficG0-color: #5E0F0D; - RouteTrafficG1-color: #7F1311; - RouteTrafficG2-color: #7F1311; - RouteTrafficG3-color: #9E8216; - RouteTrafficG3-opacity: 0.0; - RoutePedestrian-color: #FFB94B; - RoutePedestrian-opacity: 0.7; - RouteBicycle-color: #FF4B8C; - RouteBicycle-opacity: 0.7; - RouteRuler-color: #FFB94B; - RouteRuler-opacity: 0.7; - RoutePreview-color: #FFFFFF; - RoutePreview-opacity: 0.3; - RouteMaskCar-color: #000000; - RouteMaskCar-opacity: 0.5; - RouteFirstSegmentArrowsMaskCar-color: #055FCD; - RouteFirstSegmentArrowsMaskCar-opacity: 0.0; - RouteArrowsMaskCar-color: #055FCD; - RouteArrowsMaskCar-opacity: 0.3; - RouteMaskBicycle-color: #000000; - RouteMaskBicycle-opacity: 0.5; - RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C; - RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0; - RouteArrowsMaskBicycle-color: #FF4B8C; - RouteArrowsMaskBicycle-opacity: 0.5; - RouteMaskPedestrian-color: #000000; - RouteMaskPedestrian-opacity: 0.5; - RouteFake-color: #A8A8A8; - RouteFakeOutline-color: #717171; - Arrow3D-color: #41C8FF; - Arrow3DObsolete-color: #82AAC8; - Arrow3DObsolete-opacity: 0.72; - Arrow3DShadow-color: #3C3C3C; - Arrow3DShadow-opacity: 0.24; - Arrow3DOutline-color: #FFFFFF; - TrackHumanSpeed-color: #FF9800; - TrackCarSpeed-color: #FFCA28; - TrackPlaneSpeed-color: #FFF5A0; - TrackUnknownDistance-color: #969696; - TrafficG0-color: #4C120F; - TrafficG1-color: #731816; - TrafficG2-color: #731816; - TrafficG3-color: #8C7012; - TrafficG3-opacity: 0.0; - TrafficG4-color: #376222; - TrafficG5-color: #376222; - TrafficTempBlock-color: #232323; - TrafficUnknown-color: #000000; - TrafficArrowLight-color: #AAAAAA; - TrafficArrowDark-color: #1E1E1E; - TrafficOutline-color: #383838; - RoadShieldBlackText-color: #212121; - RoadShieldWhiteText-color: #B7B6B6; - RoadShieldUKYellowText-color: #B49E0E; - RoadShieldWhiteBackground-color: #999999; - RoadShieldGreenBackground-color: #136C30; - RoadShieldBlueBackground-color: #294C88; - RoadShieldRedBackground-color: #9F1A17; - RoadShieldOrangeBackground-color: #B58E1B; - PoiHotelTextOutline-color: #000000; - PoiHotelTextOutline-opacity: 0.6; - PoiDeletedMask-color: #FFFFFF; - PoiDeletedMask-opacity: 0.3; - PoiVisitedMask-color: #FFFFFF; - PoiVisitedMask-opacity: 0.7; - DefaultTrackColor-color: #1E96F0; - RouteMarkPrimaryText-color: #888888; - RouteMarkPrimaryTextOutline-color: #000000; - RouteMarkSecondaryText-color: #888888; - RouteMarkSecondaryTextOutline-color: #000000; - TransitMarkPrimaryText-color: #888888; - TransitMarkPrimaryTextOutline-color: #000000; - TransitMarkSecondaryText-color: #888888; - TransitMarkSecondaryTextOutline-color: #000000; - TransitTransferOuterMarker-color: #000000; - TransitTransferInnerMarker-color: #888888; - TransitStopInnerMarker-color: #000000; - LocalAdsPrimaryText-color: #888888; - LocalAdsPrimaryTextOutline-color: #000000; - LocalAdsSecondaryText-color: #888888; - LocalAdsSecondaryTextOutline-color: #000000; - TransitBackground-color: #000000; - TransitBackground-opacity: 0.4; - BookmarkRed-color: #E51B23; - BookmarkPink-color: #FF4182; - BookmarkPurple-color: #9B24B2; - BookmarkDeepPurple-color: #6639BF; - BookmarkBlue-color: #0066CC; - BookmarkLightBlue-color: #249CF2; - BookmarkCyan-color: #14BECD; - BookmarkTeal-color: #00A58C; - BookmarkGreen-color: #3C8C3C; - BookmarkLime-color: #93BF39; - BookmarkYellow-color: #FFC800; - BookmarkOrange-color: #FF9600; - BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #737373; - BookmarkGray-color: #808080; - BookmarkBlueGray-color: #597380; - SearchmarkPreparing-color: #597380; - SearchmarkNotAvailable-color: #597380; - SearchmarkSelectedNotAvailable-color: #F06432; - RatingBad-color: #F06432; - RatingGood-color: #3C8C3C; - RatingNone-color: #249CF2; - SearchmarkDefault-color: #249CF2; - RatingText-color: #FFFFFF; - UGCRatingText-color: #B8B8B8; - SpeedCameraMarkText-color: #FFFFFF; - SpeedCameraMarkBg-color: #F51E30; - SpeedCameraMarkOutline-color: #FFFFFF; - GuideCityMarkText-color: #6639BF; - GuideOutdoorMarkText-color: #3C8C3C; - HotelPriceText-color: #000000; -} +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/basemap.mapcss similarity index 100% rename from data/styles/vehicle/include/Basemap.mapcss rename to data/styles/vehicle/include/basemap.mapcss diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/basemap_label.mapcss similarity index 100% rename from data/styles/vehicle/include/Basemap_label.mapcss rename to data/styles/vehicle/include/basemap_label.mapcss diff --git a/data/styles/vehicle/include/defaults_new.mapcss b/data/styles/vehicle/include/defaults_new.mapcss deleted file mode 100644 index b8a843af6..000000000 --- a/data/styles/vehicle/include/defaults_new.mapcss +++ /dev/null @@ -1,24 +0,0 @@ -way|z1-12::* -{ - linejoin: bevel; -} - -way|z13-::* -{ - linejoin: round; -} - -way|z1-15::* -{ - linecap: butt; -} - -way|z16-::* -{ - linecap: round; -} - -*::int_name -{ - text-offset: 1; -} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/icons.mapcss similarity index 99% rename from data/styles/vehicle/include/Icons.mapcss rename to data/styles/vehicle/include/icons.mapcss index 525952538..ee98dc73e 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/icons.mapcss @@ -85,10 +85,10 @@ node|z17-[railway=tram_stop]::int_name, node|z10-[aeroway=aerodrome][aerodrome=international], node|z14-[aeroway=aerodrome], -{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} +{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;} node|z12-[aeroway=aerodrome][aerodrome=international]::int_name, node|z14-[aeroway=aerodrome]::int_name, -{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} +{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center; text-offset: 1;} /* 3.1 Train Station */ @@ -803,7 +803,3 @@ node|z19-[amenity=parking_entrance][access=private], node|z17-[amenity=motorcycle_parking], {icon-image: motorcycle-parking-m.svg;} - -/* 8. Colored Labels */ - -@import("../../default/include/Icons_Label_Colors.mapcss"); \ No newline at end of file diff --git a/data/styles/vehicle/include/icons_label_colors.mapcss b/data/styles/vehicle/include/icons_label_colors.mapcss new file mode 100644 index 000000000..ed0b61b6a --- /dev/null +++ b/data/styles/vehicle/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons_label_colors.mapcss"); diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 5dfe50a47..9a3547c4d 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -135,7 +135,7 @@ place-country # caption z3- === 3700 place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) -# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) === 3650 place-city-capital-3 # caption z4- @@ -280,7 +280,7 @@ boundary-protected_area-6 # icon z12- (also has captio leisure-nature_reserve # icon z12- (also has caption(optional) z12-, area z10-) === 2500 -historic-ruins # icon z17- (also has caption(optional) z17-) +historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) === 2451 historic-castle # icon z12- (also has caption(optional) z15-) @@ -526,7 +526,7 @@ amenity-cafe # icon z15- (also has captio amenity-theatre # icon z15- (also has caption(optional) z15-) === 1100 -amenity-university # icon z15- (also has caption(optional) z15-) +amenity-university # icon z15- and caption z15- (also has caption(optional) z15-) === 1050 amenity-hospital # icon z15- (also has caption(optional) z15-) @@ -870,7 +870,7 @@ entrance-emergency # icon z19- (also has captio # leisure-nature_reserve # caption(optional) z12- (also has icon z12-, area z10-) # === -7500 -# historic-ruins # caption(optional) z17- (also has icon z17-) +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) # === -7549 # historic-castle # caption(optional) z15- (also has icon z12-) @@ -1070,7 +1070,7 @@ entrance-emergency # icon z19- (also has captio # amenity-theatre # caption(optional) z15- (also has icon z15-) # === -8900 -# amenity-university # caption(optional) z15- (also has icon z15-) +# amenity-university # caption(optional) z15- (also has icon z15-, caption z15-) # === -8950 # amenity-hospital # caption(optional) z15- (also has icon z15-) @@ -1275,9 +1275,9 @@ entrance-house # icon z19- (also has captio # === -9990 amenity-loading_dock # icon z19- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +amenity-loading_dock # caption(optional) z19- (also has icon z19-) # entrance-garage # caption(optional) z19- (also has icon z19-) # entrance-house # caption(optional) z19- (also has icon z19-) entrance-service # icon z19- (also has caption(optional) z19-) -# entrance-service # caption(optional) z19- (also has icon z19-) +entrance-service # caption(optional) z19- (also has icon z19-) === -10000 diff --git a/data/styles/vehicle/include/Subways.mapcss b/data/styles/vehicle/include/transit_systems.mapcss similarity index 85% rename from data/styles/vehicle/include/Subways.mapcss rename to data/styles/vehicle/include/transit_systems.mapcss index 5d728c321..83990a23d 100644 --- a/data/styles/vehicle/include/Subways.mapcss +++ b/data/styles/vehicle/include/transit_systems.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Subways.mapcss"); +@import("../../walking/include/transit_systems.mapcss"); /*only render captions from z16*/ @@ -10,4 +10,3 @@ node|z1-14[railway=station][station=light_rail], node|z1-14[railway=station][transport=subway]::int_name, node|z1-14[railway=station][station=light_rail]::int_name, {text: none;} - diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/ways.mapcss similarity index 100% rename from data/styles/vehicle/include/Roads.mapcss rename to data/styles/vehicle/include/ways.mapcss diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/ways_label.mapcss similarity index 100% rename from data/styles/vehicle/include/Roads_label.mapcss rename to data/styles/vehicle/include/ways_label.mapcss diff --git a/data/styles/vehicle/light/style.mapcss b/data/styles/vehicle/light/style.mapcss index 5568310f8..db4bbe110 100644 --- a/data/styles/vehicle/light/style.mapcss +++ b/data/styles/vehicle/light/style.mapcss @@ -1,135 +1,9 @@ @import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - - -colors -{ - GuiText-color: #4D4D4D; - GuiText-opacity: 0.86; - MyPositionAccuracy-color: #000000; - MyPositionAccuracy-opacity: 0.08; - Selection-color: #1E96F0; - Selection-opacity: 0.64; - Route-color: #0087FF; - RouteOutline-color: #055FCD; - RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #E82705; - RouteTrafficG2-color: #E82705; - RouteTrafficG3-color: #FFE500; - RouteTrafficG3-opacity: 0.0; - RoutePedestrian-color: #1D339E; - RoutePedestrian-opacity: 0.8; - RouteBicycle-color: #9C27B0; - RouteBicycle-opacity: 0.8; - RouteRuler-color: #1D339E; - RouteRuler-opacity: 0.8; - RoutePreview-color: #000000; - RoutePreview-opacity: 0.3; - RouteMaskCar-color: #000000; - RouteMaskCar-opacity: 0.3; - RouteFirstSegmentArrowsMaskCar-color: #033B80; - RouteFirstSegmentArrowsMaskCar-opacity: 0.0; - RouteArrowsMaskCar-color: #033B80; - RouteArrowsMaskCar-opacity: 0.2; - RouteMaskBicycle-color: #000000; - RouteMaskBicycle-opacity: 0.5; - RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0; - RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0; - RouteArrowsMaskBicycle-color: #9C27B0; - RouteArrowsMaskBicycle-opacity: 0.2; - RouteMaskPedestrian-color: #000000; - RouteMaskPedestrian-opacity: 0.5; - RouteFake-color: #A8A8A8; - RouteFakeOutline-color: #717171; - Arrow3D-color: #50AAFF; - Arrow3DObsolete-color: #82AAC8; - Arrow3DObsolete-opacity: 0.72; - Arrow3DShadow-color: #3C3C3C; - Arrow3DShadow-opacity: 0.24; - Arrow3DOutline-color: #FFFFFF; - TrackHumanSpeed-color: #1D339E; - TrackCarSpeed-color: #7C8EDE; - TrackPlaneSpeed-color: #A8B7ED; - TrackUnknownDistance-color: #616161; - TrafficG0-color: #7E1712; - TrafficG1-color: #E42300; - TrafficG2-color: #E42300; - TrafficG3-color: #FCDE00; - TrafficG3-opacity: 0.0; - TrafficG4-color: #39962E; - TrafficG5-color: #39962E; - TrafficTempBlock-color: #464646; - TrafficUnknown-color: #000000; - TrafficArrowLight-color: #FFFFFF; - TrafficArrowDark-color: #473635; - TrafficOutline-color: #F0F0F0; - RoadShieldBlackText-color: #000000; - RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFD400; - RoadShieldWhiteBackground-color: #FFFFFF; - RoadShieldGreenBackground-color: #309302; - RoadShieldBlueBackground-color: #1A5EC1; - RoadShieldRedBackground-color: #E63534; - RoadShieldOrangeBackground-color: #FFBE00; - PoiHotelTextOutline-color: #FFFFFF; - PoiHotelTextOutline-opacity: 0.6; - PoiDeletedMask-color: #FFFFFF; - PoiDeletedMask-opacity: 0.3; - PoiVisitedMask-color: #FFFFFF; - PoiVisitedMask-opacity: 0.7; - DefaultTrackColor-color: #1E96F0; - RouteMarkPrimaryText-color: #000000; - RouteMarkPrimaryTextOutline-color: #FFFFFF; - RouteMarkSecondaryText-color: #000000; - RouteMarkSecondaryTextOutline-color: #FFFFFF; - TransitMarkPrimaryText-color: #000000; - TransitMarkPrimaryTextOutline-color: #FFFFFF; - TransitMarkSecondaryText-color: #000000; - TransitMarkSecondaryTextOutline-color: #FFFFFF; - TransitTransferOuterMarker-color: #000000; - TransitTransferInnerMarker-color: #FFFFFF; - TransitStopInnerMarker-color: #FFFFFF; - LocalAdsPrimaryText-color: #000000; - LocalAdsPrimaryTextOutline-color: #FFFFFF; - LocalAdsSecondaryText-color: #000000; - LocalAdsSecondaryTextOutline-color: #FFFFFF; - TransitBackground-color: #FFFFFF; - TransitBackground-opacity: 0.4; - BookmarkRed-color: #E51B23; - BookmarkPink-color: #FF4182; - BookmarkPurple-color: #9B24B2; - BookmarkDeepPurple-color: #6639BF; - BookmarkBlue-color: #0066CC; - BookmarkLightBlue-color: #249CF2; - BookmarkCyan-color: #14BECD; - BookmarkTeal-color: #00A58C; - BookmarkGreen-color: #3C8C3C; - BookmarkLime-color: #93BF39; - BookmarkYellow-color: #FFC800; - BookmarkOrange-color: #FF9600; - BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #804633; - BookmarkGray-color: #737373; - BookmarkBlueGray-color: #597380; - SearchmarkPreparing-color: #597380; - SearchmarkNotAvailable-color: #597380; - SearchmarkSelectedNotAvailable-color: #F06432; - RatingBad-color: #F06432; - RatingGood-color: #3C8C3C; - RatingNone-color: #249CF2; - SearchmarkDefault-color: #249CF2; - RatingText-color: #FFFFFF; - UGCRatingText-color: #000000; - SpeedCameraMarkText-color: #FFFFFF; - SpeedCameraMarkBg-color: #F51E30; - SpeedCameraMarkOutline-color: #FFFFFF; - GuideCityMarkText-color: #6639BF; - GuideOutdoorMarkText-color: #3C8C3C; - HotelPriceText-color: #000000; -} +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/walking/dark/colors.mapcss similarity index 98% rename from data/styles/default/dark/colors.mapcss rename to data/styles/walking/dark/colors.mapcss index 42526858d..eb7f5fb2f 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/walking/dark/colors.mapcss @@ -3,16 +3,16 @@ 1.BASEMAP 2.BOUNDARY 3.NATURAL - 3.1 Main natural - 3.2 Vegetation + 3.1 Main natural + 3.2 Vegetation 4.LANDUSE - 4.1 Main landuse - 4.2 Aerodrome + 4.1 Main landuse + 4.2 Aerodrome 4.3 Barriers 4.4 Buildings 5.ROADS 5.1 All roads - 5.2 Bridges + 5.2 Bridges 5.3 Tunnels 5.4 Piste 5.5 Transport diff --git a/data/styles/default/dark/style.mapcss b/data/styles/walking/dark/dynamic_colors.mapcss similarity index 93% rename from data/styles/default/dark/style.mapcss rename to data/styles/walking/dark/dynamic_colors.mapcss index 55344b15e..80873d086 100644 --- a/data/styles/default/dark/style.mapcss +++ b/data/styles/walking/dark/dynamic_colors.mapcss @@ -1,12 +1,3 @@ -@import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - colors { GuiText-color: #FFFFFF; diff --git a/data/styles/walking/dark/style.mapcss b/data/styles/walking/dark/style.mapcss new file mode 100644 index 000000000..a0e78c2b1 --- /dev/null +++ b/data/styles/walking/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("dynamic_colors.mapcss"); diff --git a/data/styles/default/dark/symbols-ad/00000_keep.svg b/data/styles/walking/dark/symbols-ad/00000_keep.svg similarity index 100% rename from data/styles/default/dark/symbols-ad/00000_keep.svg rename to data/styles/walking/dark/symbols-ad/00000_keep.svg diff --git a/data/styles/default/dark/symbols/access_point-m.svg b/data/styles/walking/dark/symbols/access_point-m.svg similarity index 100% rename from data/styles/default/dark/symbols/access_point-m.svg rename to data/styles/walking/dark/symbols/access_point-m.svg diff --git a/data/styles/default/dark/symbols/aircraft-m.svg b/data/styles/walking/dark/symbols/aircraft-m.svg similarity index 100% rename from data/styles/default/dark/symbols/aircraft-m.svg rename to data/styles/walking/dark/symbols/aircraft-m.svg diff --git a/data/styles/default/dark/symbols/airport-m.svg b/data/styles/walking/dark/symbols/airport-m.svg similarity index 100% rename from data/styles/default/dark/symbols/airport-m.svg rename to data/styles/walking/dark/symbols/airport-m.svg diff --git a/data/styles/default/dark/symbols/airport-s.svg b/data/styles/walking/dark/symbols/airport-s.svg similarity index 100% rename from data/styles/default/dark/symbols/airport-s.svg rename to data/styles/walking/dark/symbols/airport-s.svg diff --git a/data/styles/default/dark/symbols/airport_gate-m.svg b/data/styles/walking/dark/symbols/airport_gate-m.svg similarity index 100% rename from data/styles/default/dark/symbols/airport_gate-m.svg rename to data/styles/walking/dark/symbols/airport_gate-m.svg diff --git a/data/styles/default/dark/symbols/alcohol-m.svg b/data/styles/walking/dark/symbols/alcohol-m.svg similarity index 100% rename from data/styles/default/dark/symbols/alcohol-m.svg rename to data/styles/walking/dark/symbols/alcohol-m.svg diff --git a/data/styles/default/dark/symbols/alpine_hut-m.svg b/data/styles/walking/dark/symbols/alpine_hut-m.svg similarity index 100% rename from data/styles/default/dark/symbols/alpine_hut-m.svg rename to data/styles/walking/dark/symbols/alpine_hut-m.svg diff --git a/data/styles/default/dark/symbols/alpine_hut-s.svg b/data/styles/walking/dark/symbols/alpine_hut-s.svg similarity index 100% rename from data/styles/default/dark/symbols/alpine_hut-s.svg rename to data/styles/walking/dark/symbols/alpine_hut-s.svg diff --git a/data/styles/default/dark/symbols/alternative-m.svg b/data/styles/walking/dark/symbols/alternative-m.svg similarity index 100% rename from data/styles/default/dark/symbols/alternative-m.svg rename to data/styles/walking/dark/symbols/alternative-m.svg diff --git a/data/styles/default/dark/symbols/america-football-centre-m.svg b/data/styles/walking/dark/symbols/america-football-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/america-football-centre-m.svg rename to data/styles/walking/dark/symbols/america-football-centre-m.svg diff --git a/data/styles/default/dark/symbols/america-football-m.svg b/data/styles/walking/dark/symbols/america-football-m.svg similarity index 100% rename from data/styles/default/dark/symbols/america-football-m.svg rename to data/styles/walking/dark/symbols/america-football-m.svg diff --git a/data/styles/default/dark/symbols/anchor-m.svg b/data/styles/walking/dark/symbols/anchor-m.svg similarity index 100% rename from data/styles/default/dark/symbols/anchor-m.svg rename to data/styles/walking/dark/symbols/anchor-m.svg diff --git a/data/styles/default/dark/symbols/animal-m.svg b/data/styles/walking/dark/symbols/animal-m.svg similarity index 100% rename from data/styles/default/dark/symbols/animal-m.svg rename to data/styles/walking/dark/symbols/animal-m.svg diff --git a/data/styles/default/dark/symbols/animal_shelter-m.svg b/data/styles/walking/dark/symbols/animal_shelter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/animal_shelter-m.svg rename to data/styles/walking/dark/symbols/animal_shelter-m.svg diff --git a/data/styles/default/dark/symbols/antiques-m.svg b/data/styles/walking/dark/symbols/antiques-m.svg similarity index 100% rename from data/styles/default/dark/symbols/antiques-m.svg rename to data/styles/walking/dark/symbols/antiques-m.svg diff --git a/data/styles/default/dark/symbols/apartment-m.svg b/data/styles/walking/dark/symbols/apartment-m.svg similarity index 100% rename from data/styles/default/dark/symbols/apartment-m.svg rename to data/styles/walking/dark/symbols/apartment-m.svg diff --git a/data/styles/default/dark/symbols/aquarium-m.svg b/data/styles/walking/dark/symbols/aquarium-m.svg similarity index 100% rename from data/styles/default/dark/symbols/aquarium-m.svg rename to data/styles/walking/dark/symbols/aquarium-m.svg diff --git a/data/styles/default/dark/symbols/arcade-m.svg b/data/styles/walking/dark/symbols/arcade-m.svg similarity index 100% rename from data/styles/default/dark/symbols/arcade-m.svg rename to data/styles/walking/dark/symbols/arcade-m.svg diff --git a/data/styles/default/dark/symbols/archaeological-site-m.svg b/data/styles/walking/dark/symbols/archaeological-site-m.svg similarity index 100% rename from data/styles/default/dark/symbols/archaeological-site-m.svg rename to data/styles/walking/dark/symbols/archaeological-site-m.svg diff --git a/data/styles/default/dark/symbols/archery-centre-m.svg b/data/styles/walking/dark/symbols/archery-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/archery-centre-m.svg rename to data/styles/walking/dark/symbols/archery-centre-m.svg diff --git a/data/styles/default/dark/symbols/archery-m.svg b/data/styles/walking/dark/symbols/archery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/archery-m.svg rename to data/styles/walking/dark/symbols/archery-m.svg diff --git a/data/styles/default/dark/symbols/arrow-m.svg b/data/styles/walking/dark/symbols/arrow-m.svg similarity index 100% rename from data/styles/default/dark/symbols/arrow-m.svg rename to data/styles/walking/dark/symbols/arrow-m.svg diff --git a/data/styles/default/dark/symbols/arrow-s.svg b/data/styles/walking/dark/symbols/arrow-s.svg similarity index 100% rename from data/styles/default/dark/symbols/arrow-s.svg rename to data/styles/walking/dark/symbols/arrow-s.svg diff --git a/data/styles/default/dark/symbols/arrow-xs.svg b/data/styles/walking/dark/symbols/arrow-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/arrow-xs.svg rename to data/styles/walking/dark/symbols/arrow-xs.svg diff --git a/data/styles/default/dark/symbols/art-m.svg b/data/styles/walking/dark/symbols/art-m.svg similarity index 100% rename from data/styles/default/dark/symbols/art-m.svg rename to data/styles/walking/dark/symbols/art-m.svg diff --git a/data/styles/default/dark/symbols/artwork-m.svg b/data/styles/walking/dark/symbols/artwork-m.svg similarity index 100% rename from data/styles/default/dark/symbols/artwork-m.svg rename to data/styles/walking/dark/symbols/artwork-m.svg diff --git a/data/styles/default/dark/symbols/assembly_point-m.svg b/data/styles/walking/dark/symbols/assembly_point-m.svg similarity index 100% rename from data/styles/default/dark/symbols/assembly_point-m.svg rename to data/styles/walking/dark/symbols/assembly_point-m.svg diff --git a/data/styles/default/dark/symbols/atm-m.svg b/data/styles/walking/dark/symbols/atm-m.svg similarity index 100% rename from data/styles/default/dark/symbols/atm-m.svg rename to data/styles/walking/dark/symbols/atm-m.svg diff --git a/data/styles/default/dark/symbols/attraction-m.svg b/data/styles/walking/dark/symbols/attraction-m.svg similarity index 100% rename from data/styles/default/dark/symbols/attraction-m.svg rename to data/styles/walking/dark/symbols/attraction-m.svg diff --git a/data/styles/default/dark/symbols/auction-m.svg b/data/styles/walking/dark/symbols/auction-m.svg similarity index 100% rename from data/styles/default/dark/symbols/auction-m.svg rename to data/styles/walking/dark/symbols/auction-m.svg diff --git a/data/styles/default/dark/symbols/audiologist-m.svg b/data/styles/walking/dark/symbols/audiologist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/audiologist-m.svg rename to data/styles/walking/dark/symbols/audiologist-m.svg diff --git a/data/styles/default/dark/symbols/australian-football-centre-m.svg b/data/styles/walking/dark/symbols/australian-football-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/australian-football-centre-m.svg rename to data/styles/walking/dark/symbols/australian-football-centre-m.svg diff --git a/data/styles/default/dark/symbols/australian-football-m.svg b/data/styles/walking/dark/symbols/australian-football-m.svg similarity index 100% rename from data/styles/default/dark/symbols/australian-football-m.svg rename to data/styles/walking/dark/symbols/australian-football-m.svg diff --git a/data/styles/default/dark/symbols/badminton-centre-m.svg b/data/styles/walking/dark/symbols/badminton-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/badminton-centre-m.svg rename to data/styles/walking/dark/symbols/badminton-centre-m.svg diff --git a/data/styles/default/dark/symbols/badminton-m.svg b/data/styles/walking/dark/symbols/badminton-m.svg similarity index 100% rename from data/styles/default/dark/symbols/badminton-m.svg rename to data/styles/walking/dark/symbols/badminton-m.svg diff --git a/data/styles/default/dark/symbols/bakery-m.svg b/data/styles/walking/dark/symbols/bakery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bakery-m.svg rename to data/styles/walking/dark/symbols/bakery-m.svg diff --git a/data/styles/default/dark/symbols/bandstand-m.svg b/data/styles/walking/dark/symbols/bandstand-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bandstand-m.svg rename to data/styles/walking/dark/symbols/bandstand-m.svg diff --git a/data/styles/default/dark/symbols/bank-m.svg b/data/styles/walking/dark/symbols/bank-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bank-m.svg rename to data/styles/walking/dark/symbols/bank-m.svg diff --git a/data/styles/default/dark/symbols/banknote-m.svg b/data/styles/walking/dark/symbols/banknote-m.svg similarity index 100% rename from data/styles/default/dark/symbols/banknote-m.svg rename to data/styles/walking/dark/symbols/banknote-m.svg diff --git a/data/styles/default/dark/symbols/bar-m.svg b/data/styles/walking/dark/symbols/bar-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bar-m.svg rename to data/styles/walking/dark/symbols/bar-m.svg diff --git a/data/styles/default/dark/symbols/baseball-centre-m.svg b/data/styles/walking/dark/symbols/baseball-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/baseball-centre-m.svg rename to data/styles/walking/dark/symbols/baseball-centre-m.svg diff --git a/data/styles/default/dark/symbols/baseball-m.svg b/data/styles/walking/dark/symbols/baseball-m.svg similarity index 100% rename from data/styles/default/dark/symbols/baseball-m.svg rename to data/styles/walking/dark/symbols/baseball-m.svg diff --git a/data/styles/default/dark/symbols/basketball-centre-m.svg b/data/styles/walking/dark/symbols/basketball-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/basketball-centre-m.svg rename to data/styles/walking/dark/symbols/basketball-centre-m.svg diff --git a/data/styles/default/dark/symbols/basketball-m.svg b/data/styles/walking/dark/symbols/basketball-m.svg similarity index 100% rename from data/styles/default/dark/symbols/basketball-m.svg rename to data/styles/walking/dark/symbols/basketball-m.svg diff --git a/data/styles/default/dark/symbols/bbq-m.svg b/data/styles/walking/dark/symbols/bbq-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bbq-m.svg rename to data/styles/walking/dark/symbols/bbq-m.svg diff --git a/data/styles/default/dark/symbols/bcontrol-m.svg b/data/styles/walking/dark/symbols/bcontrol-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bcontrol-m.svg rename to data/styles/walking/dark/symbols/bcontrol-m.svg diff --git a/data/styles/default/dark/symbols/bcontrol-s.svg b/data/styles/walking/dark/symbols/bcontrol-s.svg similarity index 100% rename from data/styles/default/dark/symbols/bcontrol-s.svg rename to data/styles/walking/dark/symbols/bcontrol-s.svg diff --git a/data/styles/default/dark/symbols/beach-m.svg b/data/styles/walking/dark/symbols/beach-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beach-m.svg rename to data/styles/walking/dark/symbols/beach-m.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-east-m.svg b/data/styles/walking/dark/symbols/beacon-cardinal-east-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-east-m.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-east-m.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-east-s.svg b/data/styles/walking/dark/symbols/beacon-cardinal-east-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-east-s.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-east-s.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-north-m.svg b/data/styles/walking/dark/symbols/beacon-cardinal-north-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-north-m.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-north-m.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-north-s.svg b/data/styles/walking/dark/symbols/beacon-cardinal-north-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-north-s.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-north-s.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-south-m.svg b/data/styles/walking/dark/symbols/beacon-cardinal-south-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-south-m.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-south-m.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-south-s.svg b/data/styles/walking/dark/symbols/beacon-cardinal-south-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-south-s.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-south-s.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-west-m.svg b/data/styles/walking/dark/symbols/beacon-cardinal-west-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-west-m.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-west-m.svg diff --git a/data/styles/default/dark/symbols/beacon-cardinal-west-s.svg b/data/styles/walking/dark/symbols/beacon-cardinal-west-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-cardinal-west-s.svg rename to data/styles/walking/dark/symbols/beacon-cardinal-west-s.svg diff --git a/data/styles/default/dark/symbols/beacon-isolated_danger-m.svg b/data/styles/walking/dark/symbols/beacon-isolated_danger-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-isolated_danger-m.svg rename to data/styles/walking/dark/symbols/beacon-isolated_danger-m.svg diff --git a/data/styles/default/dark/symbols/beacon-isolated_danger-s.svg b/data/styles/walking/dark/symbols/beacon-isolated_danger-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-isolated_danger-s.svg rename to data/styles/walking/dark/symbols/beacon-isolated_danger-s.svg diff --git a/data/styles/default/dark/symbols/beacon-lateral-port-m.svg b/data/styles/walking/dark/symbols/beacon-lateral-port-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-lateral-port-m.svg rename to data/styles/walking/dark/symbols/beacon-lateral-port-m.svg diff --git a/data/styles/default/dark/symbols/beacon-lateral-port-s.svg b/data/styles/walking/dark/symbols/beacon-lateral-port-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-lateral-port-s.svg rename to data/styles/walking/dark/symbols/beacon-lateral-port-s.svg diff --git a/data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg b/data/styles/walking/dark/symbols/beacon-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-lateral-starboard-s.svg rename to data/styles/walking/dark/symbols/beacon-lateral-starboard-s.svg diff --git a/data/styles/default/dark/symbols/beacon-lateral-starboard.svg b/data/styles/walking/dark/symbols/beacon-lateral-starboard.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-lateral-starboard.svg rename to data/styles/walking/dark/symbols/beacon-lateral-starboard.svg diff --git a/data/styles/default/dark/symbols/beacon-safe_water-m.svg b/data/styles/walking/dark/symbols/beacon-safe_water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-safe_water-m.svg rename to data/styles/walking/dark/symbols/beacon-safe_water-m.svg diff --git a/data/styles/default/dark/symbols/beacon-safe_water-s.svg b/data/styles/walking/dark/symbols/beacon-safe_water-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-safe_water-s.svg rename to data/styles/walking/dark/symbols/beacon-safe_water-s.svg diff --git a/data/styles/default/dark/symbols/beacon-special_purpose-m.svg b/data/styles/walking/dark/symbols/beacon-special_purpose-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-special_purpose-m.svg rename to data/styles/walking/dark/symbols/beacon-special_purpose-m.svg diff --git a/data/styles/default/dark/symbols/beacon-special_purpose-s.svg b/data/styles/walking/dark/symbols/beacon-special_purpose-s.svg similarity index 100% rename from data/styles/default/dark/symbols/beacon-special_purpose-s.svg rename to data/styles/walking/dark/symbols/beacon-special_purpose-s.svg diff --git a/data/styles/default/dark/symbols/beauty-m.svg b/data/styles/walking/dark/symbols/beauty-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beauty-m.svg rename to data/styles/walking/dark/symbols/beauty-m.svg diff --git a/data/styles/default/dark/symbols/beekeeper-m.svg b/data/styles/walking/dark/symbols/beekeeper-m.svg similarity index 100% rename from data/styles/default/dark/symbols/beekeeper-m.svg rename to data/styles/walking/dark/symbols/beekeeper-m.svg diff --git a/data/styles/default/dark/symbols/bench.svg b/data/styles/walking/dark/symbols/bench.svg similarity index 100% rename from data/styles/default/dark/symbols/bench.svg rename to data/styles/walking/dark/symbols/bench.svg diff --git a/data/styles/default/dark/symbols/bench_backless.svg b/data/styles/walking/dark/symbols/bench_backless.svg similarity index 100% rename from data/styles/default/dark/symbols/bench_backless.svg rename to data/styles/walking/dark/symbols/bench_backless.svg diff --git a/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg b/data/styles/walking/dark/symbols/bicycle-parking-covered-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bicycle-parking-covered-m.svg rename to data/styles/walking/dark/symbols/bicycle-parking-covered-m.svg diff --git a/data/styles/default/dark/symbols/bicycle-parking-m.svg b/data/styles/walking/dark/symbols/bicycle-parking-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bicycle-parking-m.svg rename to data/styles/walking/dark/symbols/bicycle-parking-m.svg diff --git a/data/styles/default/dark/symbols/bicycle-rental-xm.svg b/data/styles/walking/dark/symbols/bicycle-rental-xm.svg similarity index 100% rename from data/styles/default/dark/symbols/bicycle-rental-xm.svg rename to data/styles/walking/dark/symbols/bicycle-rental-xm.svg diff --git a/data/styles/default/dark/symbols/bicycle-repair-station.svg b/data/styles/walking/dark/symbols/bicycle-repair-station.svg similarity index 100% rename from data/styles/default/dark/symbols/bicycle-repair-station.svg rename to data/styles/walking/dark/symbols/bicycle-repair-station.svg diff --git a/data/styles/default/dark/symbols/blacksmith-m.svg b/data/styles/walking/dark/symbols/blacksmith-m.svg similarity index 100% rename from data/styles/default/dark/symbols/blacksmith-m.svg rename to data/styles/walking/dark/symbols/blacksmith-m.svg diff --git a/data/styles/default/dark/symbols/blood_donation-m.svg b/data/styles/walking/dark/symbols/blood_donation-m.svg similarity index 100% rename from data/styles/default/dark/symbols/blood_donation-m.svg rename to data/styles/walking/dark/symbols/blood_donation-m.svg diff --git a/data/styles/default/dark/symbols/board.svg b/data/styles/walking/dark/symbols/board.svg similarity index 100% rename from data/styles/default/dark/symbols/board.svg rename to data/styles/walking/dark/symbols/board.svg diff --git a/data/styles/default/dark/symbols/boat_rental-m.svg b/data/styles/walking/dark/symbols/boat_rental-m.svg similarity index 100% rename from data/styles/default/dark/symbols/boat_rental-m.svg rename to data/styles/walking/dark/symbols/boat_rental-m.svg diff --git a/data/styles/default/dark/symbols/boating_school-m.svg b/data/styles/walking/dark/symbols/boating_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/boating_school-m.svg rename to data/styles/walking/dark/symbols/boating_school-m.svg diff --git a/data/styles/default/dark/symbols/book-shop-m.svg b/data/styles/walking/dark/symbols/book-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/book-shop-m.svg rename to data/styles/walking/dark/symbols/book-shop-m.svg diff --git a/data/styles/default/dark/symbols/bookcase-m.svg b/data/styles/walking/dark/symbols/bookcase-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookcase-m.svg rename to data/styles/walking/dark/symbols/bookcase-m.svg diff --git a/data/styles/default/dark/symbols/bookmaker-m.svg b/data/styles/walking/dark/symbols/bookmaker-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmaker-m.svg rename to data/styles/walking/dark/symbols/bookmaker-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-animals-m.svg b/data/styles/walking/dark/symbols/bookmark-animals-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-animals-m.svg rename to data/styles/walking/dark/symbols/bookmark-animals-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-art-m.svg b/data/styles/walking/dark/symbols/bookmark-art-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-art-m.svg rename to data/styles/walking/dark/symbols/bookmark-art-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bank-m.svg b/data/styles/walking/dark/symbols/bookmark-bank-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bank-m.svg rename to data/styles/walking/dark/symbols/bookmark-bank-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bar-m.svg b/data/styles/walking/dark/symbols/bookmark-bar-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bar-m.svg rename to data/styles/walking/dark/symbols/bookmark-bar-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bg-m.svg b/data/styles/walking/dark/symbols/bookmark-bg-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bg-m.svg rename to data/styles/walking/dark/symbols/bookmark-bg-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bg-s.svg b/data/styles/walking/dark/symbols/bookmark-bg-s.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bg-s.svg rename to data/styles/walking/dark/symbols/bookmark-bg-s.svg diff --git a/data/styles/default/dark/symbols/bookmark-bg-xs.svg b/data/styles/walking/dark/symbols/bookmark-bg-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bg-xs.svg rename to data/styles/walking/dark/symbols/bookmark-bg-xs.svg diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg b/data/styles/walking/dark/symbols/bookmark-bicycle_parking-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg rename to data/styles/walking/dark/symbols/bookmark-bicycle_parking-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg b/data/styles/walking/dark/symbols/bookmark-bicycle_parking_covered-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg rename to data/styles/walking/dark/symbols/bookmark-bicycle_parking_covered-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg b/data/styles/walking/dark/symbols/bookmark-bicycle_rental-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg rename to data/styles/walking/dark/symbols/bookmark-bicycle_rental-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-buddhism-m.svg b/data/styles/walking/dark/symbols/bookmark-buddhism-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-buddhism-m.svg rename to data/styles/walking/dark/symbols/bookmark-buddhism-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-building-m.svg b/data/styles/walking/dark/symbols/bookmark-building-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-building-m.svg rename to data/styles/walking/dark/symbols/bookmark-building-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-cafe-m.svg b/data/styles/walking/dark/symbols/bookmark-cafe-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-cafe-m.svg rename to data/styles/walking/dark/symbols/bookmark-cafe-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-charging_station-m.svg b/data/styles/walking/dark/symbols/bookmark-charging_station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-charging_station-m.svg rename to data/styles/walking/dark/symbols/bookmark-charging_station-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-christianity-m.svg b/data/styles/walking/dark/symbols/bookmark-christianity-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-christianity-m.svg rename to data/styles/walking/dark/symbols/bookmark-christianity-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-default-m.svg b/data/styles/walking/dark/symbols/bookmark-default-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-default-m.svg rename to data/styles/walking/dark/symbols/bookmark-default-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-default-s.svg b/data/styles/walking/dark/symbols/bookmark-default-s.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-default-s.svg rename to data/styles/walking/dark/symbols/bookmark-default-s.svg diff --git a/data/styles/default/dark/symbols/bookmark-default-xs.svg b/data/styles/walking/dark/symbols/bookmark-default-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-default-xs.svg rename to data/styles/walking/dark/symbols/bookmark-default-xs.svg diff --git a/data/styles/default/dark/symbols/bookmark-entertainment-m.svg b/data/styles/walking/dark/symbols/bookmark-entertainment-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-entertainment-m.svg rename to data/styles/walking/dark/symbols/bookmark-entertainment-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-exchange-m.svg b/data/styles/walking/dark/symbols/bookmark-exchange-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-exchange-m.svg rename to data/styles/walking/dark/symbols/bookmark-exchange-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-fast_food-m.svg b/data/styles/walking/dark/symbols/bookmark-fast_food-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-fast_food-m.svg rename to data/styles/walking/dark/symbols/bookmark-fast_food-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-gas-m.svg b/data/styles/walking/dark/symbols/bookmark-gas-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-gas-m.svg rename to data/styles/walking/dark/symbols/bookmark-gas-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-hotel-m.svg b/data/styles/walking/dark/symbols/bookmark-hotel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-hotel-m.svg rename to data/styles/walking/dark/symbols/bookmark-hotel-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-information-m.svg b/data/styles/walking/dark/symbols/bookmark-information-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-information-m.svg rename to data/styles/walking/dark/symbols/bookmark-information-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-islam-m.svg b/data/styles/walking/dark/symbols/bookmark-islam-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-islam-m.svg rename to data/styles/walking/dark/symbols/bookmark-islam-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-judaism-m.svg b/data/styles/walking/dark/symbols/bookmark-judaism-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-judaism-m.svg rename to data/styles/walking/dark/symbols/bookmark-judaism-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-medicine-m.svg b/data/styles/walking/dark/symbols/bookmark-medicine-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-medicine-m.svg rename to data/styles/walking/dark/symbols/bookmark-medicine-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-mountain-m.svg b/data/styles/walking/dark/symbols/bookmark-mountain-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-mountain-m.svg rename to data/styles/walking/dark/symbols/bookmark-mountain-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-museum-m.svg b/data/styles/walking/dark/symbols/bookmark-museum-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-museum-m.svg rename to data/styles/walking/dark/symbols/bookmark-museum-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-park-m.svg b/data/styles/walking/dark/symbols/bookmark-park-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-park-m.svg rename to data/styles/walking/dark/symbols/bookmark-park-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-parking-m.svg b/data/styles/walking/dark/symbols/bookmark-parking-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-parking-m.svg rename to data/styles/walking/dark/symbols/bookmark-parking-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-pharmacy-m.svg b/data/styles/walking/dark/symbols/bookmark-pharmacy-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-pharmacy-m.svg rename to data/styles/walking/dark/symbols/bookmark-pharmacy-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-pub-m.svg b/data/styles/walking/dark/symbols/bookmark-pub-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-pub-m.svg rename to data/styles/walking/dark/symbols/bookmark-pub-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-restaurant-m.svg b/data/styles/walking/dark/symbols/bookmark-restaurant-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-restaurant-m.svg rename to data/styles/walking/dark/symbols/bookmark-restaurant-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-shop-m.svg b/data/styles/walking/dark/symbols/bookmark-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-shop-m.svg rename to data/styles/walking/dark/symbols/bookmark-shop-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-sights-m.svg b/data/styles/walking/dark/symbols/bookmark-sights-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-sights-m.svg rename to data/styles/walking/dark/symbols/bookmark-sights-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-sport-m.svg b/data/styles/walking/dark/symbols/bookmark-sport-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-sport-m.svg rename to data/styles/walking/dark/symbols/bookmark-sport-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-stadium-m.svg b/data/styles/walking/dark/symbols/bookmark-stadium-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-stadium-m.svg rename to data/styles/walking/dark/symbols/bookmark-stadium-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-swim-m.svg b/data/styles/walking/dark/symbols/bookmark-swim-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-swim-m.svg rename to data/styles/walking/dark/symbols/bookmark-swim-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-theatre-m.svg b/data/styles/walking/dark/symbols/bookmark-theatre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-theatre-m.svg rename to data/styles/walking/dark/symbols/bookmark-theatre-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-transport-m.svg b/data/styles/walking/dark/symbols/bookmark-transport-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-transport-m.svg rename to data/styles/walking/dark/symbols/bookmark-transport-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-viewpoint-m.svg b/data/styles/walking/dark/symbols/bookmark-viewpoint-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-viewpoint-m.svg rename to data/styles/walking/dark/symbols/bookmark-viewpoint-m.svg diff --git a/data/styles/default/dark/symbols/bookmark-water-m.svg b/data/styles/walking/dark/symbols/bookmark-water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bookmark-water-m.svg rename to data/styles/walking/dark/symbols/bookmark-water-m.svg diff --git a/data/styles/default/dark/symbols/boules-centre-m.svg b/data/styles/walking/dark/symbols/boules-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/boules-centre-m.svg rename to data/styles/walking/dark/symbols/boules-centre-m.svg diff --git a/data/styles/default/dark/symbols/boules-m.svg b/data/styles/walking/dark/symbols/boules-m.svg similarity index 100% rename from data/styles/default/dark/symbols/boules-m.svg rename to data/styles/walking/dark/symbols/boules-m.svg diff --git a/data/styles/default/dark/symbols/bowling-m.svg b/data/styles/walking/dark/symbols/bowling-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bowling-m.svg rename to data/styles/walking/dark/symbols/bowling-m.svg diff --git a/data/styles/default/dark/symbols/bowling_alley-m.svg b/data/styles/walking/dark/symbols/bowling_alley-m.svg similarity index 100% rename from data/styles/default/dark/symbols/bowling_alley-m.svg rename to data/styles/walking/dark/symbols/bowling_alley-m.svg diff --git a/data/styles/default/dark/symbols/brewery-m.svg b/data/styles/walking/dark/symbols/brewery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/brewery-m.svg rename to data/styles/walking/dark/symbols/brewery-m.svg diff --git a/data/styles/default/dark/symbols/buddhist-m.svg b/data/styles/walking/dark/symbols/buddhist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buddhist-m.svg rename to data/styles/walking/dark/symbols/buddhist-m.svg diff --git a/data/styles/default/dark/symbols/buddhist-s.svg b/data/styles/walking/dark/symbols/buddhist-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buddhist-s.svg rename to data/styles/walking/dark/symbols/buddhist-s.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-east-m.svg b/data/styles/walking/dark/symbols/buoy-cardinal-east-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-east-m.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-east-m.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-east-s.svg b/data/styles/walking/dark/symbols/buoy-cardinal-east-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-east-s.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-east-s.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-north-m.svg b/data/styles/walking/dark/symbols/buoy-cardinal-north-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-north-m.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-north-m.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-north-s.svg b/data/styles/walking/dark/symbols/buoy-cardinal-north-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-north-s.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-north-s.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-south-m.svg b/data/styles/walking/dark/symbols/buoy-cardinal-south-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-south-m.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-south-m.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-south-s.svg b/data/styles/walking/dark/symbols/buoy-cardinal-south-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-south-s.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-south-s.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-west-m.svg b/data/styles/walking/dark/symbols/buoy-cardinal-west-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-west-m.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-west-m.svg diff --git a/data/styles/default/dark/symbols/buoy-cardinal-west-s.svg b/data/styles/walking/dark/symbols/buoy-cardinal-west-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-cardinal-west-s.svg rename to data/styles/walking/dark/symbols/buoy-cardinal-west-s.svg diff --git a/data/styles/default/dark/symbols/buoy-isolated_danger-m.svg b/data/styles/walking/dark/symbols/buoy-isolated_danger-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-isolated_danger-m.svg rename to data/styles/walking/dark/symbols/buoy-isolated_danger-m.svg diff --git a/data/styles/default/dark/symbols/buoy-isolated_danger-s.svg b/data/styles/walking/dark/symbols/buoy-isolated_danger-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-isolated_danger-s.svg rename to data/styles/walking/dark/symbols/buoy-isolated_danger-s.svg diff --git a/data/styles/default/dark/symbols/buoy-lateral-port-m.svg b/data/styles/walking/dark/symbols/buoy-lateral-port-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-lateral-port-m.svg rename to data/styles/walking/dark/symbols/buoy-lateral-port-m.svg diff --git a/data/styles/default/dark/symbols/buoy-lateral-port-s.svg b/data/styles/walking/dark/symbols/buoy-lateral-port-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-lateral-port-s.svg rename to data/styles/walking/dark/symbols/buoy-lateral-port-s.svg diff --git a/data/styles/default/dark/symbols/buoy-lateral-starboard-m.svg b/data/styles/walking/dark/symbols/buoy-lateral-starboard-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-lateral-starboard-m.svg rename to data/styles/walking/dark/symbols/buoy-lateral-starboard-m.svg diff --git a/data/styles/default/dark/symbols/buoy-lateral-starboard-s.svg b/data/styles/walking/dark/symbols/buoy-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-lateral-starboard-s.svg rename to data/styles/walking/dark/symbols/buoy-lateral-starboard-s.svg diff --git a/data/styles/default/dark/symbols/buoy-safe_water-m.svg b/data/styles/walking/dark/symbols/buoy-safe_water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-safe_water-m.svg rename to data/styles/walking/dark/symbols/buoy-safe_water-m.svg diff --git a/data/styles/default/dark/symbols/buoy-safe_water-s.svg b/data/styles/walking/dark/symbols/buoy-safe_water-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-safe_water-s.svg rename to data/styles/walking/dark/symbols/buoy-safe_water-s.svg diff --git a/data/styles/default/dark/symbols/buoy-special_purpose-m.svg b/data/styles/walking/dark/symbols/buoy-special_purpose-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-special_purpose-m.svg rename to data/styles/walking/dark/symbols/buoy-special_purpose-m.svg diff --git a/data/styles/default/dark/symbols/buoy-special_purpose-s.svg b/data/styles/walking/dark/symbols/buoy-special_purpose-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-special_purpose-s.svg rename to data/styles/walking/dark/symbols/buoy-special_purpose-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-east-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-east-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-east-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-east-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-east-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-east-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-east-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-north-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-north-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-north-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-north-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-north-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-north-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-north-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-south-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-south-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-south-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-south-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-south-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-south-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-south-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-west-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-west-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-west-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-cardinal-west-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-cardinal-west-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-cardinal-west-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-cardinal-west-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-isolated_danger-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-isolated_danger-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-isolated_danger-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-isolated_danger-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-isolated_danger-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-isolated_danger-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-isolated_danger-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-port-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-lateral-port-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-lateral-port-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-lateral-port-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-port-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-lateral-port-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-lateral-port-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-lateral-port-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-lateral-starboard-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-lateral-starboard-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-lateral-starboard-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-lateral-starboard-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-safe_water-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-safe_water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-safe_water-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-safe_water-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-safe_water-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-safe_water-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-safe_water-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-safe_water-s.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-special_purpose-m.svg b/data/styles/walking/dark/symbols/buoy-spherical-special_purpose-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-special_purpose-m.svg rename to data/styles/walking/dark/symbols/buoy-spherical-special_purpose-m.svg diff --git a/data/styles/default/dark/symbols/buoy-spherical-special_purpose-s.svg b/data/styles/walking/dark/symbols/buoy-spherical-special_purpose-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buoy-spherical-special_purpose-s.svg rename to data/styles/walking/dark/symbols/buoy-spherical-special_purpose-s.svg diff --git a/data/styles/default/dark/symbols/bus-xm.svg b/data/styles/walking/dark/symbols/bus-xm.svg similarity index 100% rename from data/styles/default/dark/symbols/bus-xm.svg rename to data/styles/walking/dark/symbols/bus-xm.svg diff --git a/data/styles/default/dark/symbols/bus-xs.svg b/data/styles/walking/dark/symbols/bus-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/bus-xs.svg rename to data/styles/walking/dark/symbols/bus-xs.svg diff --git a/data/styles/default/dark/symbols/bus-xvs.svg b/data/styles/walking/dark/symbols/bus-xvs.svg similarity index 100% rename from data/styles/default/dark/symbols/bus-xvs.svg rename to data/styles/walking/dark/symbols/bus-xvs.svg diff --git a/data/styles/default/dark/symbols/buses-m.svg b/data/styles/walking/dark/symbols/buses-m.svg similarity index 100% rename from data/styles/default/dark/symbols/buses-m.svg rename to data/styles/walking/dark/symbols/buses-m.svg diff --git a/data/styles/default/dark/symbols/buses-s.svg b/data/styles/walking/dark/symbols/buses-s.svg similarity index 100% rename from data/styles/default/dark/symbols/buses-s.svg rename to data/styles/walking/dark/symbols/buses-s.svg diff --git a/data/styles/default/dark/symbols/butcher-m.svg b/data/styles/walking/dark/symbols/butcher-m.svg similarity index 100% rename from data/styles/default/dark/symbols/butcher-m.svg rename to data/styles/walking/dark/symbols/butcher-m.svg diff --git a/data/styles/default/dark/symbols/cable-car-m.svg b/data/styles/walking/dark/symbols/cable-car-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cable-car-m.svg rename to data/styles/walking/dark/symbols/cable-car-m.svg diff --git a/data/styles/default/dark/symbols/cable-car-s.svg b/data/styles/walking/dark/symbols/cable-car-s.svg similarity index 100% rename from data/styles/default/dark/symbols/cable-car-s.svg rename to data/styles/walking/dark/symbols/cable-car-s.svg diff --git a/data/styles/default/dark/symbols/cafe-m.svg b/data/styles/walking/dark/symbols/cafe-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cafe-m.svg rename to data/styles/walking/dark/symbols/cafe-m.svg diff --git a/data/styles/default/dark/symbols/cairn-m.svg b/data/styles/walking/dark/symbols/cairn-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cairn-m.svg rename to data/styles/walking/dark/symbols/cairn-m.svg diff --git a/data/styles/default/dark/symbols/campsite-m.svg b/data/styles/walking/dark/symbols/campsite-m.svg similarity index 100% rename from data/styles/default/dark/symbols/campsite-m.svg rename to data/styles/walking/dark/symbols/campsite-m.svg diff --git a/data/styles/default/dark/symbols/campsite-s.svg b/data/styles/walking/dark/symbols/campsite-s.svg similarity index 100% rename from data/styles/default/dark/symbols/campsite-s.svg rename to data/styles/walking/dark/symbols/campsite-s.svg diff --git a/data/styles/default/dark/symbols/cannon-m.svg b/data/styles/walking/dark/symbols/cannon-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cannon-m.svg rename to data/styles/walking/dark/symbols/cannon-m.svg diff --git a/data/styles/default/dark/symbols/car-part-m.svg b/data/styles/walking/dark/symbols/car-part-m.svg similarity index 100% rename from data/styles/default/dark/symbols/car-part-m.svg rename to data/styles/walking/dark/symbols/car-part-m.svg diff --git a/data/styles/default/dark/symbols/car-repair-m.svg b/data/styles/walking/dark/symbols/car-repair-m.svg similarity index 100% rename from data/styles/default/dark/symbols/car-repair-m.svg rename to data/styles/walking/dark/symbols/car-repair-m.svg diff --git a/data/styles/default/dark/symbols/car-repair-s.svg b/data/styles/walking/dark/symbols/car-repair-s.svg similarity index 100% rename from data/styles/default/dark/symbols/car-repair-s.svg rename to data/styles/walking/dark/symbols/car-repair-s.svg diff --git a/data/styles/default/dark/symbols/car-wash-m.svg b/data/styles/walking/dark/symbols/car-wash-m.svg similarity index 100% rename from data/styles/default/dark/symbols/car-wash-m.svg rename to data/styles/walking/dark/symbols/car-wash-m.svg diff --git a/data/styles/default/dark/symbols/car_sharing-m.svg b/data/styles/walking/dark/symbols/car_sharing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/car_sharing-m.svg rename to data/styles/walking/dark/symbols/car_sharing-m.svg diff --git a/data/styles/default/dark/symbols/car_shop-m.svg b/data/styles/walking/dark/symbols/car_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/car_shop-m.svg rename to data/styles/walking/dark/symbols/car_shop-m.svg diff --git a/data/styles/default/dark/symbols/caravan-shop-m.svg b/data/styles/walking/dark/symbols/caravan-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/caravan-shop-m.svg rename to data/styles/walking/dark/symbols/caravan-shop-m.svg diff --git a/data/styles/default/dark/symbols/caravan_site-m.svg b/data/styles/walking/dark/symbols/caravan_site-m.svg similarity index 100% rename from data/styles/default/dark/symbols/caravan_site-m.svg rename to data/styles/walking/dark/symbols/caravan_site-m.svg diff --git a/data/styles/default/dark/symbols/caravan_site-s.svg b/data/styles/walking/dark/symbols/caravan_site-s.svg similarity index 100% rename from data/styles/default/dark/symbols/caravan_site-s.svg rename to data/styles/walking/dark/symbols/caravan_site-s.svg diff --git a/data/styles/default/dark/symbols/carpenter-m.svg b/data/styles/walking/dark/symbols/carpenter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/carpenter-m.svg rename to data/styles/walking/dark/symbols/carpenter-m.svg diff --git a/data/styles/default/dark/symbols/casino-m.svg b/data/styles/walking/dark/symbols/casino-m.svg similarity index 100% rename from data/styles/default/dark/symbols/casino-m.svg rename to data/styles/walking/dark/symbols/casino-m.svg diff --git a/data/styles/default/dark/symbols/castle-m.svg b/data/styles/walking/dark/symbols/castle-m.svg similarity index 100% rename from data/styles/default/dark/symbols/castle-m.svg rename to data/styles/walking/dark/symbols/castle-m.svg diff --git a/data/styles/default/dark/symbols/castle-s.svg b/data/styles/walking/dark/symbols/castle-s.svg similarity index 100% rename from data/styles/default/dark/symbols/castle-s.svg rename to data/styles/walking/dark/symbols/castle-s.svg diff --git a/data/styles/default/dark/symbols/caterer-m.svg b/data/styles/walking/dark/symbols/caterer-m.svg similarity index 100% rename from data/styles/default/dark/symbols/caterer-m.svg rename to data/styles/walking/dark/symbols/caterer-m.svg diff --git a/data/styles/default/dark/symbols/cave-m.svg b/data/styles/walking/dark/symbols/cave-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cave-m.svg rename to data/styles/walking/dark/symbols/cave-m.svg diff --git a/data/styles/default/dark/symbols/cave-s.svg b/data/styles/walking/dark/symbols/cave-s.svg similarity index 100% rename from data/styles/default/dark/symbols/cave-s.svg rename to data/styles/walking/dark/symbols/cave-s.svg diff --git a/data/styles/default/dark/symbols/cemetery-m.svg b/data/styles/walking/dark/symbols/cemetery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cemetery-m.svg rename to data/styles/walking/dark/symbols/cemetery-m.svg diff --git a/data/styles/default/dark/symbols/cemetery-s.svg b/data/styles/walking/dark/symbols/cemetery-s.svg similarity index 100% rename from data/styles/default/dark/symbols/cemetery-s.svg rename to data/styles/walking/dark/symbols/cemetery-s.svg diff --git a/data/styles/default/dark/symbols/charging_station-m.svg b/data/styles/walking/dark/symbols/charging_station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/charging_station-m.svg rename to data/styles/walking/dark/symbols/charging_station-m.svg diff --git a/data/styles/default/dark/symbols/charging_station-s.svg b/data/styles/walking/dark/symbols/charging_station-s.svg similarity index 100% rename from data/styles/default/dark/symbols/charging_station-s.svg rename to data/styles/walking/dark/symbols/charging_station-s.svg diff --git a/data/styles/default/dark/symbols/charging_station-small-m.svg b/data/styles/walking/dark/symbols/charging_station-small-m.svg similarity index 100% rename from data/styles/default/dark/symbols/charging_station-small-m.svg rename to data/styles/walking/dark/symbols/charging_station-small-m.svg diff --git a/data/styles/default/dark/symbols/charging_station-small-s.svg b/data/styles/walking/dark/symbols/charging_station-small-s.svg similarity index 100% rename from data/styles/default/dark/symbols/charging_station-small-s.svg rename to data/styles/walking/dark/symbols/charging_station-small-s.svg diff --git a/data/styles/default/dark/symbols/charity_shop-m.svg b/data/styles/walking/dark/symbols/charity_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/charity_shop-m.svg rename to data/styles/walking/dark/symbols/charity_shop-m.svg diff --git a/data/styles/default/dark/symbols/cheese-m.svg b/data/styles/walking/dark/symbols/cheese-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cheese-m.svg rename to data/styles/walking/dark/symbols/cheese-m.svg diff --git a/data/styles/default/dark/symbols/chemist-m.svg b/data/styles/walking/dark/symbols/chemist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/chemist-m.svg rename to data/styles/walking/dark/symbols/chemist-m.svg diff --git a/data/styles/default/dark/symbols/chess-m.svg b/data/styles/walking/dark/symbols/chess-m.svg similarity index 100% rename from data/styles/default/dark/symbols/chess-m.svg rename to data/styles/walking/dark/symbols/chess-m.svg diff --git a/data/styles/default/dark/symbols/chimney-m.svg b/data/styles/walking/dark/symbols/chimney-m.svg similarity index 100% rename from data/styles/default/dark/symbols/chimney-m.svg rename to data/styles/walking/dark/symbols/chimney-m.svg diff --git a/data/styles/default/dark/symbols/christian-m.svg b/data/styles/walking/dark/symbols/christian-m.svg similarity index 100% rename from data/styles/default/dark/symbols/christian-m.svg rename to data/styles/walking/dark/symbols/christian-m.svg diff --git a/data/styles/default/dark/symbols/christian-s.svg b/data/styles/walking/dark/symbols/christian-s.svg similarity index 100% rename from data/styles/default/dark/symbols/christian-s.svg rename to data/styles/walking/dark/symbols/christian-s.svg diff --git a/data/styles/default/dark/symbols/christmas-tree-m.svg b/data/styles/walking/dark/symbols/christmas-tree-m.svg similarity index 100% rename from data/styles/default/dark/symbols/christmas-tree-m.svg rename to data/styles/walking/dark/symbols/christmas-tree-m.svg diff --git a/data/styles/default/dark/symbols/cinema-m.svg b/data/styles/walking/dark/symbols/cinema-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cinema-m.svg rename to data/styles/walking/dark/symbols/cinema-m.svg diff --git a/data/styles/default/dark/symbols/climbing-centre-m.svg b/data/styles/walking/dark/symbols/climbing-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/climbing-centre-m.svg rename to data/styles/walking/dark/symbols/climbing-centre-m.svg diff --git a/data/styles/default/dark/symbols/climbing-m.svg b/data/styles/walking/dark/symbols/climbing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/climbing-m.svg rename to data/styles/walking/dark/symbols/climbing-m.svg diff --git a/data/styles/default/dark/symbols/clinic-m.svg b/data/styles/walking/dark/symbols/clinic-m.svg similarity index 100% rename from data/styles/default/dark/symbols/clinic-m.svg rename to data/styles/walking/dark/symbols/clinic-m.svg diff --git a/data/styles/default/dark/symbols/clothes-m.svg b/data/styles/walking/dark/symbols/clothes-m.svg similarity index 100% rename from data/styles/default/dark/symbols/clothes-m.svg rename to data/styles/walking/dark/symbols/clothes-m.svg diff --git a/data/styles/default/dark/symbols/college-m.svg b/data/styles/walking/dark/symbols/college-m.svg similarity index 100% rename from data/styles/default/dark/symbols/college-m.svg rename to data/styles/walking/dark/symbols/college-m.svg diff --git a/data/styles/default/dark/symbols/college-s.svg b/data/styles/walking/dark/symbols/college-s.svg similarity index 100% rename from data/styles/default/dark/symbols/college-s.svg rename to data/styles/walking/dark/symbols/college-s.svg diff --git a/data/styles/default/dark/symbols/coloredmark-bg-l.svg b/data/styles/walking/dark/symbols/coloredmark-bg-l.svg similarity index 100% rename from data/styles/default/dark/symbols/coloredmark-bg-l.svg rename to data/styles/walking/dark/symbols/coloredmark-bg-l.svg diff --git a/data/styles/default/dark/symbols/coloredmark-bg-s.svg b/data/styles/walking/dark/symbols/coloredmark-bg-s.svg similarity index 100% rename from data/styles/default/dark/symbols/coloredmark-bg-s.svg rename to data/styles/walking/dark/symbols/coloredmark-bg-s.svg diff --git a/data/styles/default/dark/symbols/coloredmark-default-l.svg b/data/styles/walking/dark/symbols/coloredmark-default-l.svg similarity index 100% rename from data/styles/default/dark/symbols/coloredmark-default-l.svg rename to data/styles/walking/dark/symbols/coloredmark-default-l.svg diff --git a/data/styles/default/dark/symbols/coloredmark-default-s.svg b/data/styles/walking/dark/symbols/coloredmark-default-s.svg similarity index 100% rename from data/styles/default/dark/symbols/coloredmark-default-s.svg rename to data/styles/walking/dark/symbols/coloredmark-default-s.svg diff --git a/data/styles/default/dark/symbols/communications_mast-m.svg b/data/styles/walking/dark/symbols/communications_mast-m.svg similarity index 100% rename from data/styles/default/dark/symbols/communications_mast-m.svg rename to data/styles/walking/dark/symbols/communications_mast-m.svg diff --git a/data/styles/default/dark/symbols/communications_tower_major-m.svg b/data/styles/walking/dark/symbols/communications_tower_major-m.svg similarity index 100% rename from data/styles/default/dark/symbols/communications_tower_major-m.svg rename to data/styles/walking/dark/symbols/communications_tower_major-m.svg diff --git a/data/styles/default/dark/symbols/communications_tower_major-s.svg b/data/styles/walking/dark/symbols/communications_tower_major-s.svg similarity index 100% rename from data/styles/default/dark/symbols/communications_tower_major-s.svg rename to data/styles/walking/dark/symbols/communications_tower_major-s.svg diff --git a/data/styles/default/dark/symbols/communications_tower_minor-m.svg b/data/styles/walking/dark/symbols/communications_tower_minor-m.svg similarity index 100% rename from data/styles/default/dark/symbols/communications_tower_minor-m.svg rename to data/styles/walking/dark/symbols/communications_tower_minor-m.svg diff --git a/data/styles/default/dark/symbols/community-m.svg b/data/styles/walking/dark/symbols/community-m.svg similarity index 100% rename from data/styles/default/dark/symbols/community-m.svg rename to data/styles/walking/dark/symbols/community-m.svg diff --git a/data/styles/walking/dark/symbols/compass.svg b/data/styles/walking/dark/symbols/compass.svg new file mode 100644 index 000000000..732446d5a --- /dev/null +++ b/data/styles/walking/dark/symbols/compass.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/compressed_air-m.svg b/data/styles/walking/dark/symbols/compressed_air-m.svg similarity index 100% rename from data/styles/default/dark/symbols/compressed_air-m.svg rename to data/styles/walking/dark/symbols/compressed_air-m.svg diff --git a/data/styles/default/dark/symbols/computer-m.svg b/data/styles/walking/dark/symbols/computer-m.svg similarity index 100% rename from data/styles/default/dark/symbols/computer-m.svg rename to data/styles/walking/dark/symbols/computer-m.svg diff --git a/data/styles/default/dark/symbols/confectionery-m.svg b/data/styles/walking/dark/symbols/confectionery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/confectionery-m.svg rename to data/styles/walking/dark/symbols/confectionery-m.svg diff --git a/data/styles/default/dark/symbols/convenience-m.svg b/data/styles/walking/dark/symbols/convenience-m.svg similarity index 100% rename from data/styles/default/dark/symbols/convenience-m.svg rename to data/styles/walking/dark/symbols/convenience-m.svg diff --git a/data/styles/default/dark/symbols/copyshop-m.svg b/data/styles/walking/dark/symbols/copyshop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/copyshop-m.svg rename to data/styles/walking/dark/symbols/copyshop-m.svg diff --git a/data/styles/default/dark/symbols/craft-m.svg b/data/styles/walking/dark/symbols/craft-m.svg similarity index 100% rename from data/styles/default/dark/symbols/craft-m.svg rename to data/styles/walking/dark/symbols/craft-m.svg diff --git a/data/styles/default/dark/symbols/crane-m.svg b/data/styles/walking/dark/symbols/crane-m.svg similarity index 100% rename from data/styles/default/dark/symbols/crane-m.svg rename to data/styles/walking/dark/symbols/crane-m.svg diff --git a/data/styles/default/dark/symbols/cricket-centre-m.svg b/data/styles/walking/dark/symbols/cricket-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cricket-centre-m.svg rename to data/styles/walking/dark/symbols/cricket-centre-m.svg diff --git a/data/styles/default/dark/symbols/cricket-m.svg b/data/styles/walking/dark/symbols/cricket-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cricket-m.svg rename to data/styles/walking/dark/symbols/cricket-m.svg diff --git a/data/styles/default/dark/symbols/cross-m.svg b/data/styles/walking/dark/symbols/cross-m.svg similarity index 100% rename from data/styles/default/dark/symbols/cross-m.svg rename to data/styles/walking/dark/symbols/cross-m.svg diff --git a/data/styles/default/dark/symbols/cross_geoposition.svg b/data/styles/walking/dark/symbols/cross_geoposition.svg similarity index 100% rename from data/styles/default/dark/symbols/cross_geoposition.svg rename to data/styles/walking/dark/symbols/cross_geoposition.svg diff --git a/data/styles/default/dark/symbols/curling-centre-m.svg b/data/styles/walking/dark/symbols/curling-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/curling-centre-m.svg rename to data/styles/walking/dark/symbols/curling-centre-m.svg diff --git a/data/styles/default/dark/symbols/curling-m.svg b/data/styles/walking/dark/symbols/curling-m.svg similarity index 100% rename from data/styles/default/dark/symbols/curling-m.svg rename to data/styles/walking/dark/symbols/curling-m.svg diff --git a/data/styles/default/dark/symbols/current-position.svg b/data/styles/walking/dark/symbols/current-position.svg similarity index 100% rename from data/styles/default/dark/symbols/current-position.svg rename to data/styles/walking/dark/symbols/current-position.svg diff --git a/data/styles/default/dark/symbols/cycle_barrier-s.svg b/data/styles/walking/dark/symbols/cycle_barrier-s.svg similarity index 100% rename from data/styles/default/dark/symbols/cycle_barrier-s.svg rename to data/styles/walking/dark/symbols/cycle_barrier-s.svg diff --git a/data/styles/default/dark/symbols/dance-m.svg b/data/styles/walking/dark/symbols/dance-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dance-m.svg rename to data/styles/walking/dark/symbols/dance-m.svg diff --git a/data/styles/default/dark/symbols/day-spa-m.svg b/data/styles/walking/dark/symbols/day-spa-m.svg similarity index 100% rename from data/styles/default/dark/symbols/day-spa-m.svg rename to data/styles/walking/dark/symbols/day-spa-m.svg diff --git a/data/styles/default/dark/symbols/defibrillator-m.svg b/data/styles/walking/dark/symbols/defibrillator-m.svg similarity index 100% rename from data/styles/default/dark/symbols/defibrillator-m.svg rename to data/styles/walking/dark/symbols/defibrillator-m.svg diff --git a/data/styles/default/dark/symbols/dentist-m.svg b/data/styles/walking/dark/symbols/dentist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dentist-m.svg rename to data/styles/walking/dark/symbols/dentist-m.svg diff --git a/data/styles/default/dark/symbols/department_store-m.svg b/data/styles/walking/dark/symbols/department_store-m.svg similarity index 100% rename from data/styles/default/dark/symbols/department_store-m.svg rename to data/styles/walking/dark/symbols/department_store-m.svg diff --git a/data/styles/default/dark/symbols/disaster_help_point-m.svg b/data/styles/walking/dark/symbols/disaster_help_point-m.svg similarity index 100% rename from data/styles/default/dark/symbols/disaster_help_point-m.svg rename to data/styles/walking/dark/symbols/disaster_help_point-m.svg diff --git a/data/styles/default/dark/symbols/disusedbusiness-m.svg b/data/styles/walking/dark/symbols/disusedbusiness-m.svg similarity index 100% rename from data/styles/default/dark/symbols/disusedbusiness-m.svg rename to data/styles/walking/dark/symbols/disusedbusiness-m.svg diff --git a/data/styles/default/dark/symbols/diving-centre-m.svg b/data/styles/walking/dark/symbols/diving-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/diving-centre-m.svg rename to data/styles/walking/dark/symbols/diving-centre-m.svg diff --git a/data/styles/default/dark/symbols/diving-m.svg b/data/styles/walking/dark/symbols/diving-m.svg similarity index 100% rename from data/styles/default/dark/symbols/diving-m.svg rename to data/styles/walking/dark/symbols/diving-m.svg diff --git a/data/styles/default/dark/symbols/dog_park-m.svg b/data/styles/walking/dark/symbols/dog_park-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dog_park-m.svg rename to data/styles/walking/dark/symbols/dog_park-m.svg diff --git a/data/styles/default/dark/symbols/doityourself-m.svg b/data/styles/walking/dark/symbols/doityourself-m.svg similarity index 100% rename from data/styles/default/dark/symbols/doityourself-m.svg rename to data/styles/walking/dark/symbols/doityourself-m.svg diff --git a/data/styles/default/dark/symbols/dot-m.svg b/data/styles/walking/dark/symbols/dot-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dot-m.svg rename to data/styles/walking/dark/symbols/dot-m.svg diff --git a/data/styles/default/dark/symbols/drinking-water-m.svg b/data/styles/walking/dark/symbols/drinking-water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/drinking-water-m.svg rename to data/styles/walking/dark/symbols/drinking-water-m.svg diff --git a/data/styles/default/dark/symbols/drinking-water-no-m.svg b/data/styles/walking/dark/symbols/drinking-water-no-m.svg similarity index 100% rename from data/styles/default/dark/symbols/drinking-water-no-m.svg rename to data/styles/walking/dark/symbols/drinking-water-no-m.svg diff --git a/data/styles/default/dark/symbols/drinking-water-no-s.svg b/data/styles/walking/dark/symbols/drinking-water-no-s.svg similarity index 100% rename from data/styles/default/dark/symbols/drinking-water-no-s.svg rename to data/styles/walking/dark/symbols/drinking-water-no-s.svg diff --git a/data/styles/default/dark/symbols/drinking-water-s.svg b/data/styles/walking/dark/symbols/drinking-water-s.svg similarity index 100% rename from data/styles/default/dark/symbols/drinking-water-s.svg rename to data/styles/walking/dark/symbols/drinking-water-s.svg diff --git a/data/styles/default/dark/symbols/driving_school-m.svg b/data/styles/walking/dark/symbols/driving_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/driving_school-m.svg rename to data/styles/walking/dark/symbols/driving_school-m.svg diff --git a/data/styles/default/dark/symbols/dry_cleaning-m.svg b/data/styles/walking/dark/symbols/dry_cleaning-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dry_cleaning-m.svg rename to data/styles/walking/dark/symbols/dry_cleaning-m.svg diff --git a/data/styles/default/dark/symbols/dump-station-m.svg b/data/styles/walking/dark/symbols/dump-station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/dump-station-m.svg rename to data/styles/walking/dark/symbols/dump-station-m.svg diff --git a/data/styles/default/dark/symbols/electrician-m.svg b/data/styles/walking/dark/symbols/electrician-m.svg similarity index 100% rename from data/styles/default/dark/symbols/electrician-m.svg rename to data/styles/walking/dark/symbols/electrician-m.svg diff --git a/data/styles/default/dark/symbols/electronics-m.svg b/data/styles/walking/dark/symbols/electronics-m.svg similarity index 100% rename from data/styles/default/dark/symbols/electronics-m.svg rename to data/styles/walking/dark/symbols/electronics-m.svg diff --git a/data/styles/default/dark/symbols/elevator-s.svg b/data/styles/walking/dark/symbols/elevator-s.svg similarity index 100% rename from data/styles/default/dark/symbols/elevator-s.svg rename to data/styles/walking/dark/symbols/elevator-s.svg diff --git a/data/styles/default/dark/symbols/embassy-m.svg b/data/styles/walking/dark/symbols/embassy-m.svg similarity index 100% rename from data/styles/default/dark/symbols/embassy-m.svg rename to data/styles/walking/dark/symbols/embassy-m.svg diff --git a/data/styles/default/dark/symbols/emergency-exit-m.svg b/data/styles/walking/dark/symbols/emergency-exit-m.svg similarity index 100% rename from data/styles/default/dark/symbols/emergency-exit-m.svg rename to data/styles/walking/dark/symbols/emergency-exit-m.svg diff --git a/data/styles/default/dark/symbols/emergency-phone-m.svg b/data/styles/walking/dark/symbols/emergency-phone-m.svg similarity index 100% rename from data/styles/default/dark/symbols/emergency-phone-m.svg rename to data/styles/walking/dark/symbols/emergency-phone-m.svg diff --git a/data/styles/default/dark/symbols/entrance-barrier-m.svg b/data/styles/walking/dark/symbols/entrance-barrier-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-barrier-m.svg rename to data/styles/walking/dark/symbols/entrance-barrier-m.svg diff --git a/data/styles/default/dark/symbols/entrance-barrier-xs.svg b/data/styles/walking/dark/symbols/entrance-barrier-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-barrier-xs.svg rename to data/styles/walking/dark/symbols/entrance-barrier-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-emergency-m.svg b/data/styles/walking/dark/symbols/entrance-emergency-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-emergency-m.svg rename to data/styles/walking/dark/symbols/entrance-emergency-m.svg diff --git a/data/styles/default/dark/symbols/entrance-emergency-xs.svg b/data/styles/walking/dark/symbols/entrance-emergency-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-emergency-xs.svg rename to data/styles/walking/dark/symbols/entrance-emergency-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-entry-m.svg b/data/styles/walking/dark/symbols/entrance-entry-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-entry-m.svg rename to data/styles/walking/dark/symbols/entrance-entry-m.svg diff --git a/data/styles/default/dark/symbols/entrance-entry-xs.svg b/data/styles/walking/dark/symbols/entrance-entry-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-entry-xs.svg rename to data/styles/walking/dark/symbols/entrance-entry-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-exit-m.svg b/data/styles/walking/dark/symbols/entrance-exit-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-exit-m.svg rename to data/styles/walking/dark/symbols/entrance-exit-m.svg diff --git a/data/styles/default/dark/symbols/entrance-exit-xs.svg b/data/styles/walking/dark/symbols/entrance-exit-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-exit-xs.svg rename to data/styles/walking/dark/symbols/entrance-exit-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-m.svg b/data/styles/walking/dark/symbols/entrance-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-m.svg rename to data/styles/walking/dark/symbols/entrance-m.svg diff --git a/data/styles/default/dark/symbols/entrance-main-m.svg b/data/styles/walking/dark/symbols/entrance-main-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-main-m.svg rename to data/styles/walking/dark/symbols/entrance-main-m.svg diff --git a/data/styles/default/dark/symbols/entrance-main-xs.svg b/data/styles/walking/dark/symbols/entrance-main-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-main-xs.svg rename to data/styles/walking/dark/symbols/entrance-main-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-service-m.svg b/data/styles/walking/dark/symbols/entrance-service-m.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-service-m.svg rename to data/styles/walking/dark/symbols/entrance-service-m.svg diff --git a/data/styles/default/dark/symbols/entrance-service-xs.svg b/data/styles/walking/dark/symbols/entrance-service-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-service-xs.svg rename to data/styles/walking/dark/symbols/entrance-service-xs.svg diff --git a/data/styles/default/dark/symbols/entrance-xs.svg b/data/styles/walking/dark/symbols/entrance-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/entrance-xs.svg rename to data/styles/walking/dark/symbols/entrance-xs.svg diff --git a/data/styles/default/dark/symbols/equestrian-centre-m.svg b/data/styles/walking/dark/symbols/equestrian-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/equestrian-centre-m.svg rename to data/styles/walking/dark/symbols/equestrian-centre-m.svg diff --git a/data/styles/default/dark/symbols/equestrian-m.svg b/data/styles/walking/dark/symbols/equestrian-m.svg similarity index 100% rename from data/styles/default/dark/symbols/equestrian-m.svg rename to data/styles/walking/dark/symbols/equestrian-m.svg diff --git a/data/styles/default/dark/symbols/erotic-m.svg b/data/styles/walking/dark/symbols/erotic-m.svg similarity index 100% rename from data/styles/default/dark/symbols/erotic-m.svg rename to data/styles/walking/dark/symbols/erotic-m.svg diff --git a/data/styles/default/dark/symbols/escape_game.svg b/data/styles/walking/dark/symbols/escape_game.svg similarity index 100% rename from data/styles/default/dark/symbols/escape_game.svg rename to data/styles/walking/dark/symbols/escape_game.svg diff --git a/data/styles/default/dark/symbols/events_venue-m.svg b/data/styles/walking/dark/symbols/events_venue-m.svg similarity index 100% rename from data/styles/default/dark/symbols/events_venue-m.svg rename to data/styles/walking/dark/symbols/events_venue-m.svg diff --git a/data/styles/default/dark/symbols/excrement_bags-m.svg b/data/styles/walking/dark/symbols/excrement_bags-m.svg similarity index 100% rename from data/styles/default/dark/symbols/excrement_bags-m.svg rename to data/styles/walking/dark/symbols/excrement_bags-m.svg diff --git a/data/styles/default/dark/symbols/factory-m.svg b/data/styles/walking/dark/symbols/factory-m.svg similarity index 100% rename from data/styles/default/dark/symbols/factory-m.svg rename to data/styles/walking/dark/symbols/factory-m.svg diff --git a/data/styles/default/dark/symbols/fastfood-m.svg b/data/styles/walking/dark/symbols/fastfood-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fastfood-m.svg rename to data/styles/walking/dark/symbols/fastfood-m.svg diff --git a/data/styles/default/dark/symbols/fire_station-m.svg b/data/styles/walking/dark/symbols/fire_station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fire_station-m.svg rename to data/styles/walking/dark/symbols/fire_station-m.svg diff --git a/data/styles/default/dark/symbols/firehydrant-m.svg b/data/styles/walking/dark/symbols/firehydrant-m.svg similarity index 100% rename from data/styles/default/dark/symbols/firehydrant-m.svg rename to data/styles/walking/dark/symbols/firehydrant-m.svg diff --git a/data/styles/default/dark/symbols/firepit-m.svg b/data/styles/walking/dark/symbols/firepit-m.svg similarity index 100% rename from data/styles/default/dark/symbols/firepit-m.svg rename to data/styles/walking/dark/symbols/firepit-m.svg diff --git a/data/styles/default/dark/symbols/fitness-m.svg b/data/styles/walking/dark/symbols/fitness-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fitness-m.svg rename to data/styles/walking/dark/symbols/fitness-m.svg diff --git a/data/styles/default/dark/symbols/fitness_centre-m.svg b/data/styles/walking/dark/symbols/fitness_centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fitness_centre-m.svg rename to data/styles/walking/dark/symbols/fitness_centre-m.svg diff --git a/data/styles/default/dark/symbols/fitness_station-m.svg b/data/styles/walking/dark/symbols/fitness_station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fitness_station-m.svg rename to data/styles/walking/dark/symbols/fitness_station-m.svg diff --git a/data/styles/default/dark/symbols/flagpole-m.svg b/data/styles/walking/dark/symbols/flagpole-m.svg similarity index 100% rename from data/styles/default/dark/symbols/flagpole-m.svg rename to data/styles/walking/dark/symbols/flagpole-m.svg diff --git a/data/styles/default/dark/symbols/florist-m.svg b/data/styles/walking/dark/symbols/florist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/florist-m.svg rename to data/styles/walking/dark/symbols/florist-m.svg diff --git a/data/styles/default/dark/symbols/flying_school-m.svg b/data/styles/walking/dark/symbols/flying_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/flying_school-m.svg rename to data/styles/walking/dark/symbols/flying_school-m.svg diff --git a/data/styles/default/dark/symbols/food_bank-m.svg b/data/styles/walking/dark/symbols/food_bank-m.svg similarity index 100% rename from data/styles/default/dark/symbols/food_bank-m.svg rename to data/styles/walking/dark/symbols/food_bank-m.svg diff --git a/data/styles/default/dark/symbols/food_sharing-m.svg b/data/styles/walking/dark/symbols/food_sharing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/food_sharing-m.svg rename to data/styles/walking/dark/symbols/food_sharing-m.svg diff --git a/data/styles/default/dark/symbols/ford-m.svg b/data/styles/walking/dark/symbols/ford-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ford-m.svg rename to data/styles/walking/dark/symbols/ford-m.svg diff --git a/data/styles/default/dark/symbols/fountain-m.svg b/data/styles/walking/dark/symbols/fountain-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fountain-m.svg rename to data/styles/walking/dark/symbols/fountain-m.svg diff --git a/data/styles/default/dark/symbols/fountain-s.svg b/data/styles/walking/dark/symbols/fountain-s.svg similarity index 100% rename from data/styles/default/dark/symbols/fountain-s.svg rename to data/styles/walking/dark/symbols/fountain-s.svg diff --git a/data/styles/default/dark/symbols/four_square-centre-m-1.svg b/data/styles/walking/dark/symbols/four_square-centre-m-1.svg similarity index 100% rename from data/styles/default/dark/symbols/four_square-centre-m-1.svg rename to data/styles/walking/dark/symbols/four_square-centre-m-1.svg diff --git a/data/styles/default/dark/symbols/four_square-m.svg b/data/styles/walking/dark/symbols/four_square-m.svg similarity index 100% rename from data/styles/default/dark/symbols/four_square-m.svg rename to data/styles/walking/dark/symbols/four_square-m.svg diff --git a/data/styles/default/dark/symbols/fuel-dispenser-m.svg b/data/styles/walking/dark/symbols/fuel-dispenser-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fuel-dispenser-m.svg rename to data/styles/walking/dark/symbols/fuel-dispenser-m.svg diff --git a/data/styles/default/dark/symbols/fuel-m.svg b/data/styles/walking/dark/symbols/fuel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/fuel-m.svg rename to data/styles/walking/dark/symbols/fuel-m.svg diff --git a/data/styles/default/dark/symbols/fuel-s.svg b/data/styles/walking/dark/symbols/fuel-s.svg similarity index 100% rename from data/styles/default/dark/symbols/fuel-s.svg rename to data/styles/walking/dark/symbols/fuel-s.svg diff --git a/data/styles/default/dark/symbols/funeral_directors-m.svg b/data/styles/walking/dark/symbols/funeral_directors-m.svg similarity index 100% rename from data/styles/default/dark/symbols/funeral_directors-m.svg rename to data/styles/walking/dark/symbols/funeral_directors-m.svg diff --git a/data/styles/default/dark/symbols/funicular-m.svg b/data/styles/walking/dark/symbols/funicular-m.svg similarity index 100% rename from data/styles/default/dark/symbols/funicular-m.svg rename to data/styles/walking/dark/symbols/funicular-m.svg diff --git a/data/styles/default/dark/symbols/funicular-s.svg b/data/styles/walking/dark/symbols/funicular-s.svg similarity index 100% rename from data/styles/default/dark/symbols/funicular-s.svg rename to data/styles/walking/dark/symbols/funicular-s.svg diff --git a/data/styles/default/dark/symbols/furniture-m.svg b/data/styles/walking/dark/symbols/furniture-m.svg similarity index 100% rename from data/styles/default/dark/symbols/furniture-m.svg rename to data/styles/walking/dark/symbols/furniture-m.svg diff --git a/data/styles/default/dark/symbols/gallery-m.svg b/data/styles/walking/dark/symbols/gallery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/gallery-m.svg rename to data/styles/walking/dark/symbols/gallery-m.svg diff --git a/data/styles/default/dark/symbols/gambling-m.svg b/data/styles/walking/dark/symbols/gambling-m.svg similarity index 100% rename from data/styles/default/dark/symbols/gambling-m.svg rename to data/styles/walking/dark/symbols/gambling-m.svg diff --git a/data/styles/default/dark/symbols/garden-m.svg b/data/styles/walking/dark/symbols/garden-m.svg similarity index 100% rename from data/styles/default/dark/symbols/garden-m.svg rename to data/styles/walking/dark/symbols/garden-m.svg diff --git a/data/styles/default/dark/symbols/garden-outline-m.svg b/data/styles/walking/dark/symbols/garden-outline-m.svg similarity index 100% rename from data/styles/default/dark/symbols/garden-outline-m.svg rename to data/styles/walking/dark/symbols/garden-outline-m.svg diff --git a/data/styles/default/dark/symbols/garden_center-m.svg b/data/styles/walking/dark/symbols/garden_center-m.svg similarity index 100% rename from data/styles/default/dark/symbols/garden_center-m.svg rename to data/styles/walking/dark/symbols/garden_center-m.svg diff --git a/data/styles/default/dark/symbols/gate-s.svg b/data/styles/walking/dark/symbols/gate-s.svg similarity index 100% rename from data/styles/default/dark/symbols/gate-s.svg rename to data/styles/walking/dark/symbols/gate-s.svg diff --git a/data/styles/default/dark/symbols/geyser-m.svg b/data/styles/walking/dark/symbols/geyser-m.svg similarity index 100% rename from data/styles/default/dark/symbols/geyser-m.svg rename to data/styles/walking/dark/symbols/geyser-m.svg diff --git a/data/styles/default/dark/symbols/geyser-s.svg b/data/styles/walking/dark/symbols/geyser-s.svg similarity index 100% rename from data/styles/default/dark/symbols/geyser-s.svg rename to data/styles/walking/dark/symbols/geyser-s.svg diff --git a/data/styles/default/dark/symbols/gift-m.svg b/data/styles/walking/dark/symbols/gift-m.svg similarity index 100% rename from data/styles/default/dark/symbols/gift-m.svg rename to data/styles/walking/dark/symbols/gift-m.svg diff --git a/data/styles/default/dark/symbols/give_box-m.svg b/data/styles/walking/dark/symbols/give_box-m.svg similarity index 100% rename from data/styles/default/dark/symbols/give_box-m.svg rename to data/styles/walking/dark/symbols/give_box-m.svg diff --git a/data/styles/default/dark/symbols/golf-centre-m.svg b/data/styles/walking/dark/symbols/golf-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/golf-centre-m.svg rename to data/styles/walking/dark/symbols/golf-centre-m.svg diff --git a/data/styles/default/dark/symbols/golf-m.svg b/data/styles/walking/dark/symbols/golf-m.svg similarity index 100% rename from data/styles/default/dark/symbols/golf-m.svg rename to data/styles/walking/dark/symbols/golf-m.svg diff --git a/data/styles/default/dark/symbols/greengrocer-m.svg b/data/styles/walking/dark/symbols/greengrocer-m.svg similarity index 100% rename from data/styles/default/dark/symbols/greengrocer-m.svg rename to data/styles/walking/dark/symbols/greengrocer-m.svg diff --git a/data/styles/default/dark/symbols/grinding_mill-m.svg b/data/styles/walking/dark/symbols/grinding_mill-m.svg similarity index 100% rename from data/styles/default/dark/symbols/grinding_mill-m.svg rename to data/styles/walking/dark/symbols/grinding_mill-m.svg diff --git a/data/styles/default/dark/symbols/guest_house-m.svg b/data/styles/walking/dark/symbols/guest_house-m.svg similarity index 100% rename from data/styles/default/dark/symbols/guest_house-m.svg rename to data/styles/walking/dark/symbols/guest_house-m.svg diff --git a/data/styles/default/dark/symbols/guidepost.svg b/data/styles/walking/dark/symbols/guidepost.svg similarity index 100% rename from data/styles/default/dark/symbols/guidepost.svg rename to data/styles/walking/dark/symbols/guidepost.svg diff --git a/data/styles/default/dark/symbols/hackerspace-m.svg b/data/styles/walking/dark/symbols/hackerspace-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hackerspace-m.svg rename to data/styles/walking/dark/symbols/hackerspace-m.svg diff --git a/data/styles/default/dark/symbols/hairdresser-m.svg b/data/styles/walking/dark/symbols/hairdresser-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hairdresser-m.svg rename to data/styles/walking/dark/symbols/hairdresser-m.svg diff --git a/data/styles/default/dark/symbols/handball-centre-m.svg b/data/styles/walking/dark/symbols/handball-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/handball-centre-m.svg rename to data/styles/walking/dark/symbols/handball-centre-m.svg diff --git a/data/styles/default/dark/symbols/handball-m.svg b/data/styles/walking/dark/symbols/handball-m.svg similarity index 100% rename from data/styles/default/dark/symbols/handball-m.svg rename to data/styles/walking/dark/symbols/handball-m.svg diff --git a/data/styles/default/dark/symbols/handicraft-m.svg b/data/styles/walking/dark/symbols/handicraft-m.svg similarity index 100% rename from data/styles/default/dark/symbols/handicraft-m.svg rename to data/styles/walking/dark/symbols/handicraft-m.svg diff --git a/data/styles/default/dark/symbols/hearing_aids-m.svg b/data/styles/walking/dark/symbols/hearing_aids-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hearing_aids-m.svg rename to data/styles/walking/dark/symbols/hearing_aids-m.svg diff --git a/data/styles/default/dark/symbols/helipad-m.svg b/data/styles/walking/dark/symbols/helipad-m.svg similarity index 100% rename from data/styles/default/dark/symbols/helipad-m.svg rename to data/styles/walking/dark/symbols/helipad-m.svg diff --git a/data/styles/default/dark/symbols/hindu-m.svg b/data/styles/walking/dark/symbols/hindu-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hindu-m.svg rename to data/styles/walking/dark/symbols/hindu-m.svg diff --git a/data/styles/default/dark/symbols/hindu-s.svg b/data/styles/walking/dark/symbols/hindu-s.svg similarity index 100% rename from data/styles/default/dark/symbols/hindu-s.svg rename to data/styles/walking/dark/symbols/hindu-s.svg diff --git a/data/styles/default/dark/symbols/historic-ship-m.svg b/data/styles/walking/dark/symbols/historic-ship-m.svg similarity index 100% rename from data/styles/default/dark/symbols/historic-ship-m.svg rename to data/styles/walking/dark/symbols/historic-ship-m.svg diff --git a/data/styles/default/dark/symbols/historic_attraction-m.svg b/data/styles/walking/dark/symbols/historic_attraction-m.svg similarity index 100% rename from data/styles/default/dark/symbols/historic_attraction-m.svg rename to data/styles/walking/dark/symbols/historic_attraction-m.svg diff --git a/data/styles/default/dark/symbols/hockey-centre-m.svg b/data/styles/walking/dark/symbols/hockey-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hockey-centre-m.svg rename to data/styles/walking/dark/symbols/hockey-centre-m.svg diff --git a/data/styles/default/dark/symbols/hockey-m.svg b/data/styles/walking/dark/symbols/hockey-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hockey-m.svg rename to data/styles/walking/dark/symbols/hockey-m.svg diff --git a/data/styles/default/dark/symbols/home-m.svg b/data/styles/walking/dark/symbols/home-m.svg similarity index 100% rename from data/styles/default/dark/symbols/home-m.svg rename to data/styles/walking/dark/symbols/home-m.svg diff --git a/data/styles/default/dark/symbols/hospital-m.svg b/data/styles/walking/dark/symbols/hospital-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hospital-m.svg rename to data/styles/walking/dark/symbols/hospital-m.svg diff --git a/data/styles/default/dark/symbols/hospital-s.svg b/data/styles/walking/dark/symbols/hospital-s.svg similarity index 100% rename from data/styles/default/dark/symbols/hospital-s.svg rename to data/styles/walking/dark/symbols/hospital-s.svg diff --git a/data/styles/default/dark/symbols/hostel-m.svg b/data/styles/walking/dark/symbols/hostel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hostel-m.svg rename to data/styles/walking/dark/symbols/hostel-m.svg diff --git a/data/styles/default/dark/symbols/hotel-m.svg b/data/styles/walking/dark/symbols/hotel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hotel-m.svg rename to data/styles/walking/dark/symbols/hotel-m.svg diff --git a/data/styles/default/dark/symbols/hotel-s.svg b/data/styles/walking/dark/symbols/hotel-s.svg similarity index 100% rename from data/styles/default/dark/symbols/hotel-s.svg rename to data/styles/walking/dark/symbols/hotel-s.svg diff --git a/data/styles/default/dark/symbols/hunting-tower-m.svg b/data/styles/walking/dark/symbols/hunting-tower-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hunting-tower-m.svg rename to data/styles/walking/dark/symbols/hunting-tower-m.svg diff --git a/data/styles/default/dark/symbols/hydrant-m.svg b/data/styles/walking/dark/symbols/hydrant-m.svg similarity index 100% rename from data/styles/default/dark/symbols/hydrant-m.svg rename to data/styles/walking/dark/symbols/hydrant-m.svg diff --git a/data/styles/default/dark/symbols/ice_cream-m.svg b/data/styles/walking/dark/symbols/ice_cream-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ice_cream-m.svg rename to data/styles/walking/dark/symbols/ice_cream-m.svg diff --git a/data/styles/default/dark/symbols/indoor_play-m.svg b/data/styles/walking/dark/symbols/indoor_play-m.svg similarity index 100% rename from data/styles/default/dark/symbols/indoor_play-m.svg rename to data/styles/walking/dark/symbols/indoor_play-m.svg diff --git a/data/styles/default/dark/symbols/information-m.svg b/data/styles/walking/dark/symbols/information-m.svg similarity index 100% rename from data/styles/default/dark/symbols/information-m.svg rename to data/styles/walking/dark/symbols/information-m.svg diff --git a/data/styles/default/dark/symbols/information-office-m.svg b/data/styles/walking/dark/symbols/information-office-m.svg similarity index 100% rename from data/styles/default/dark/symbols/information-office-m.svg rename to data/styles/walking/dark/symbols/information-office-m.svg diff --git a/data/styles/default/dark/symbols/infosign.svg b/data/styles/walking/dark/symbols/infosign.svg similarity index 100% rename from data/styles/default/dark/symbols/infosign.svg rename to data/styles/walking/dark/symbols/infosign.svg diff --git a/data/styles/default/dark/symbols/interior_decoration-m.svg b/data/styles/walking/dark/symbols/interior_decoration-m.svg similarity index 100% rename from data/styles/default/dark/symbols/interior_decoration-m.svg rename to data/styles/walking/dark/symbols/interior_decoration-m.svg diff --git a/data/styles/default/dark/symbols/internet_cafe-m.svg b/data/styles/walking/dark/symbols/internet_cafe-m.svg similarity index 100% rename from data/styles/default/dark/symbols/internet_cafe-m.svg rename to data/styles/walking/dark/symbols/internet_cafe-m.svg diff --git a/data/styles/default/dark/symbols/jewelry-m.svg b/data/styles/walking/dark/symbols/jewelry-m.svg similarity index 100% rename from data/styles/default/dark/symbols/jewelry-m.svg rename to data/styles/walking/dark/symbols/jewelry-m.svg diff --git a/data/styles/default/dark/symbols/jewish-m.svg b/data/styles/walking/dark/symbols/jewish-m.svg similarity index 100% rename from data/styles/default/dark/symbols/jewish-m.svg rename to data/styles/walking/dark/symbols/jewish-m.svg diff --git a/data/styles/default/dark/symbols/jewish-s.svg b/data/styles/walking/dark/symbols/jewish-s.svg similarity index 100% rename from data/styles/default/dark/symbols/jewish-s.svg rename to data/styles/walking/dark/symbols/jewish-s.svg diff --git a/data/styles/default/dark/symbols/key_cutter-m.svg b/data/styles/walking/dark/symbols/key_cutter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/key_cutter-m.svg rename to data/styles/walking/dark/symbols/key_cutter-m.svg diff --git a/data/styles/default/dark/symbols/kindergarten-m.svg b/data/styles/walking/dark/symbols/kindergarten-m.svg similarity index 100% rename from data/styles/default/dark/symbols/kindergarten-m.svg rename to data/styles/walking/dark/symbols/kindergarten-m.svg diff --git a/data/styles/default/dark/symbols/kiosk-m.svg b/data/styles/walking/dark/symbols/kiosk-m.svg similarity index 100% rename from data/styles/default/dark/symbols/kiosk-m.svg rename to data/styles/walking/dark/symbols/kiosk-m.svg diff --git a/data/styles/default/dark/symbols/ladder-m.svg b/data/styles/walking/dark/symbols/ladder-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ladder-m.svg rename to data/styles/walking/dark/symbols/ladder-m.svg diff --git a/data/styles/default/dark/symbols/language_school-m.svg b/data/styles/walking/dark/symbols/language_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/language_school-m.svg rename to data/styles/walking/dark/symbols/language_school-m.svg diff --git a/data/styles/default/dark/symbols/laundry-m.svg b/data/styles/walking/dark/symbols/laundry-m.svg similarity index 100% rename from data/styles/default/dark/symbols/laundry-m.svg rename to data/styles/walking/dark/symbols/laundry-m.svg diff --git a/data/styles/default/dark/symbols/lawyer-m.svg b/data/styles/walking/dark/symbols/lawyer-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lawyer-m.svg rename to data/styles/walking/dark/symbols/lawyer-m.svg diff --git a/data/styles/default/dark/symbols/library-m.svg b/data/styles/walking/dark/symbols/library-m.svg similarity index 100% rename from data/styles/default/dark/symbols/library-m.svg rename to data/styles/walking/dark/symbols/library-m.svg diff --git a/data/styles/default/dark/symbols/lifebuoy-m.svg b/data/styles/walking/dark/symbols/lifebuoy-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lifebuoy-m.svg rename to data/styles/walking/dark/symbols/lifebuoy-m.svg diff --git a/data/styles/default/dark/symbols/lifeguard-m.svg b/data/styles/walking/dark/symbols/lifeguard-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lifeguard-m.svg rename to data/styles/walking/dark/symbols/lifeguard-m.svg diff --git a/data/styles/default/dark/symbols/lift_gate-m.svg b/data/styles/walking/dark/symbols/lift_gate-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lift_gate-m.svg rename to data/styles/walking/dark/symbols/lift_gate-m.svg diff --git a/data/styles/default/dark/symbols/light_rail-dlr-london-m.svg b/data/styles/walking/dark/symbols/light_rail-dlr-london-m.svg similarity index 100% rename from data/styles/default/dark/symbols/light_rail-dlr-london-m.svg rename to data/styles/walking/dark/symbols/light_rail-dlr-london-m.svg diff --git a/data/styles/default/dark/symbols/light_rail-dlr-london-s.svg b/data/styles/walking/dark/symbols/light_rail-dlr-london-s.svg similarity index 100% rename from data/styles/default/dark/symbols/light_rail-dlr-london-s.svg rename to data/styles/walking/dark/symbols/light_rail-dlr-london-s.svg diff --git a/data/styles/default/dark/symbols/light_rail-porto-m.svg b/data/styles/walking/dark/symbols/light_rail-porto-m.svg similarity index 100% rename from data/styles/default/dark/symbols/light_rail-porto-m.svg rename to data/styles/walking/dark/symbols/light_rail-porto-m.svg diff --git a/data/styles/default/dark/symbols/light_rail-porto-s.svg b/data/styles/walking/dark/symbols/light_rail-porto-s.svg similarity index 100% rename from data/styles/default/dark/symbols/light_rail-porto-s.svg rename to data/styles/walking/dark/symbols/light_rail-porto-s.svg diff --git a/data/styles/default/dark/symbols/lighthouse-m.svg b/data/styles/walking/dark/symbols/lighthouse-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lighthouse-m.svg rename to data/styles/walking/dark/symbols/lighthouse-m.svg diff --git a/data/styles/default/dark/symbols/lighthouse-s.svg b/data/styles/walking/dark/symbols/lighthouse-s.svg similarity index 100% rename from data/styles/default/dark/symbols/lighthouse-s.svg rename to data/styles/walking/dark/symbols/lighthouse-s.svg diff --git a/data/styles/default/dark/symbols/lightrail-berlin-m.svg b/data/styles/walking/dark/symbols/lightrail-berlin-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lightrail-berlin-m.svg rename to data/styles/walking/dark/symbols/lightrail-berlin-m.svg diff --git a/data/styles/default/dark/symbols/lightrail-berlin-s.svg b/data/styles/walking/dark/symbols/lightrail-berlin-s.svg similarity index 100% rename from data/styles/default/dark/symbols/lightrail-berlin-s.svg rename to data/styles/walking/dark/symbols/lightrail-berlin-s.svg diff --git a/data/styles/default/dark/symbols/locomotive-m.svg b/data/styles/walking/dark/symbols/locomotive-m.svg similarity index 100% rename from data/styles/default/dark/symbols/locomotive-m.svg rename to data/styles/walking/dark/symbols/locomotive-m.svg diff --git a/data/styles/default/dark/symbols/lottery-m.svg b/data/styles/walking/dark/symbols/lottery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lottery-m.svg rename to data/styles/walking/dark/symbols/lottery-m.svg diff --git a/data/styles/default/dark/symbols/lounger-m.svg b/data/styles/walking/dark/symbols/lounger-m.svg similarity index 100% rename from data/styles/default/dark/symbols/lounger-m.svg rename to data/styles/walking/dark/symbols/lounger-m.svg diff --git a/data/styles/default/dark/symbols/luggage_locker-m.svg b/data/styles/walking/dark/symbols/luggage_locker-m.svg similarity index 100% rename from data/styles/default/dark/symbols/luggage_locker-m.svg rename to data/styles/walking/dark/symbols/luggage_locker-m.svg diff --git a/data/styles/default/dark/symbols/mail-m.svg b/data/styles/walking/dark/symbols/mail-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mail-m.svg rename to data/styles/walking/dark/symbols/mail-m.svg diff --git a/data/styles/default/dark/symbols/map.svg b/data/styles/walking/dark/symbols/map.svg similarity index 100% rename from data/styles/default/dark/symbols/map.svg rename to data/styles/walking/dark/symbols/map.svg diff --git a/data/styles/default/dark/symbols/marina-m.svg b/data/styles/walking/dark/symbols/marina-m.svg similarity index 100% rename from data/styles/default/dark/symbols/marina-m.svg rename to data/styles/walking/dark/symbols/marina-m.svg diff --git a/data/styles/default/dark/symbols/marina_fuel_station-m.svg b/data/styles/walking/dark/symbols/marina_fuel_station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/marina_fuel_station-m.svg rename to data/styles/walking/dark/symbols/marina_fuel_station-m.svg diff --git a/data/styles/default/dark/symbols/marketplace-m.svg b/data/styles/walking/dark/symbols/marketplace-m.svg similarity index 100% rename from data/styles/default/dark/symbols/marketplace-m.svg rename to data/styles/walking/dark/symbols/marketplace-m.svg diff --git a/data/styles/default/dark/symbols/martial-arts-centre-m.svg b/data/styles/walking/dark/symbols/martial-arts-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/martial-arts-centre-m.svg rename to data/styles/walking/dark/symbols/martial-arts-centre-m.svg diff --git a/data/styles/default/dark/symbols/martial-arts-m.svg b/data/styles/walking/dark/symbols/martial-arts-m.svg similarity index 100% rename from data/styles/default/dark/symbols/martial-arts-m.svg rename to data/styles/walking/dark/symbols/martial-arts-m.svg diff --git a/data/styles/default/dark/symbols/massage_salon-m.svg b/data/styles/walking/dark/symbols/massage_salon-m.svg similarity index 100% rename from data/styles/default/dark/symbols/massage_salon-m.svg rename to data/styles/walking/dark/symbols/massage_salon-m.svg diff --git a/data/styles/default/dark/symbols/mast-m.svg b/data/styles/walking/dark/symbols/mast-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mast-m.svg rename to data/styles/walking/dark/symbols/mast-m.svg diff --git a/data/styles/default/dark/symbols/media-m.svg b/data/styles/walking/dark/symbols/media-m.svg similarity index 100% rename from data/styles/default/dark/symbols/media-m.svg rename to data/styles/walking/dark/symbols/media-m.svg diff --git a/data/styles/default/dark/symbols/metal_construction-m.svg b/data/styles/walking/dark/symbols/metal_construction-m.svg similarity index 100% rename from data/styles/default/dark/symbols/metal_construction-m.svg rename to data/styles/walking/dark/symbols/metal_construction-m.svg diff --git a/data/styles/default/dark/symbols/military-m.svg b/data/styles/walking/dark/symbols/military-m.svg similarity index 100% rename from data/styles/default/dark/symbols/military-m.svg rename to data/styles/walking/dark/symbols/military-m.svg diff --git a/data/styles/default/dark/symbols/mine-m.svg b/data/styles/walking/dark/symbols/mine-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mine-m.svg rename to data/styles/walking/dark/symbols/mine-m.svg diff --git a/data/styles/default/dark/symbols/mobile_phone-m.svg b/data/styles/walking/dark/symbols/mobile_phone-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mobile_phone-m.svg rename to data/styles/walking/dark/symbols/mobile_phone-m.svg diff --git a/data/styles/default/dark/symbols/monorail-m.svg b/data/styles/walking/dark/symbols/monorail-m.svg similarity index 100% rename from data/styles/default/dark/symbols/monorail-m.svg rename to data/styles/walking/dark/symbols/monorail-m.svg diff --git a/data/styles/default/dark/symbols/monorail-s.svg b/data/styles/walking/dark/symbols/monorail-s.svg similarity index 100% rename from data/styles/default/dark/symbols/monorail-s.svg rename to data/styles/walking/dark/symbols/monorail-s.svg diff --git a/data/styles/default/dark/symbols/monument-m.svg b/data/styles/walking/dark/symbols/monument-m.svg similarity index 100% rename from data/styles/default/dark/symbols/monument-m.svg rename to data/styles/walking/dark/symbols/monument-m.svg diff --git a/data/styles/default/dark/symbols/monument-s.svg b/data/styles/walking/dark/symbols/monument-s.svg similarity index 100% rename from data/styles/default/dark/symbols/monument-s.svg rename to data/styles/walking/dark/symbols/monument-s.svg diff --git a/data/styles/default/dark/symbols/mormon-m.svg b/data/styles/walking/dark/symbols/mormon-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mormon-m.svg rename to data/styles/walking/dark/symbols/mormon-m.svg diff --git a/data/styles/default/dark/symbols/mormon-s.svg b/data/styles/walking/dark/symbols/mormon-s.svg similarity index 100% rename from data/styles/default/dark/symbols/mormon-s.svg rename to data/styles/walking/dark/symbols/mormon-s.svg diff --git a/data/styles/default/dark/symbols/motorcycle-parking-m.svg b/data/styles/walking/dark/symbols/motorcycle-parking-m.svg similarity index 100% rename from data/styles/default/dark/symbols/motorcycle-parking-m.svg rename to data/styles/walking/dark/symbols/motorcycle-parking-m.svg diff --git a/data/styles/default/dark/symbols/motorcycle_rental-m.svg b/data/styles/walking/dark/symbols/motorcycle_rental-m.svg similarity index 100% rename from data/styles/default/dark/symbols/motorcycle_rental-m.svg rename to data/styles/walking/dark/symbols/motorcycle_rental-m.svg diff --git a/data/styles/default/dark/symbols/motorcycle_repair-m.svg b/data/styles/walking/dark/symbols/motorcycle_repair-m.svg similarity index 100% rename from data/styles/default/dark/symbols/motorcycle_repair-m.svg rename to data/styles/walking/dark/symbols/motorcycle_repair-m.svg diff --git a/data/styles/default/dark/symbols/motorcycle_shop-m.svg b/data/styles/walking/dark/symbols/motorcycle_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/motorcycle_shop-m.svg rename to data/styles/walking/dark/symbols/motorcycle_shop-m.svg diff --git a/data/styles/default/dark/symbols/mountain-pass-m.svg b/data/styles/walking/dark/symbols/mountain-pass-m.svg similarity index 100% rename from data/styles/default/dark/symbols/mountain-pass-m.svg rename to data/styles/walking/dark/symbols/mountain-pass-m.svg diff --git a/data/styles/default/dark/symbols/mountain-pass-s.svg b/data/styles/walking/dark/symbols/mountain-pass-s.svg similarity index 100% rename from data/styles/default/dark/symbols/mountain-pass-s.svg rename to data/styles/walking/dark/symbols/mountain-pass-s.svg diff --git a/data/styles/default/dark/symbols/museum-m.svg b/data/styles/walking/dark/symbols/museum-m.svg similarity index 100% rename from data/styles/default/dark/symbols/museum-m.svg rename to data/styles/walking/dark/symbols/museum-m.svg diff --git a/data/styles/default/dark/symbols/museum-s.svg b/data/styles/walking/dark/symbols/museum-s.svg similarity index 100% rename from data/styles/default/dark/symbols/museum-s.svg rename to data/styles/walking/dark/symbols/museum-s.svg diff --git a/data/styles/default/dark/symbols/music-m.svg b/data/styles/walking/dark/symbols/music-m.svg similarity index 100% rename from data/styles/default/dark/symbols/music-m.svg rename to data/styles/walking/dark/symbols/music-m.svg diff --git a/data/styles/default/dark/symbols/music_school-m.svg b/data/styles/walking/dark/symbols/music_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/music_school-m.svg rename to data/styles/walking/dark/symbols/music_school-m.svg diff --git a/data/styles/default/dark/symbols/musical-instrument-m.svg b/data/styles/walking/dark/symbols/musical-instrument-m.svg similarity index 100% rename from data/styles/default/dark/symbols/musical-instrument-m.svg rename to data/styles/walking/dark/symbols/musical-instrument-m.svg diff --git a/data/styles/default/dark/symbols/muslim-m.svg b/data/styles/walking/dark/symbols/muslim-m.svg similarity index 100% rename from data/styles/default/dark/symbols/muslim-m.svg rename to data/styles/walking/dark/symbols/muslim-m.svg diff --git a/data/styles/default/dark/symbols/muslim-s.svg b/data/styles/walking/dark/symbols/muslim-s.svg similarity index 100% rename from data/styles/default/dark/symbols/muslim-s.svg rename to data/styles/walking/dark/symbols/muslim-s.svg diff --git a/data/styles/default/dark/symbols/nails-m.svg b/data/styles/walking/dark/symbols/nails-m.svg similarity index 100% rename from data/styles/default/dark/symbols/nails-m.svg rename to data/styles/walking/dark/symbols/nails-m.svg diff --git a/data/styles/default/dark/symbols/needle_and_thread-m.svg b/data/styles/walking/dark/symbols/needle_and_thread-m.svg similarity index 100% rename from data/styles/default/dark/symbols/needle_and_thread-m.svg rename to data/styles/walking/dark/symbols/needle_and_thread-m.svg diff --git a/data/styles/default/dark/symbols/newsagent_shop-m.svg b/data/styles/walking/dark/symbols/newsagent_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/newsagent_shop-m.svg rename to data/styles/walking/dark/symbols/newsagent_shop-m.svg diff --git a/data/styles/default/dark/symbols/nightclub-m.svg b/data/styles/walking/dark/symbols/nightclub-m.svg similarity index 100% rename from data/styles/default/dark/symbols/nightclub-m.svg rename to data/styles/walking/dark/symbols/nightclub-m.svg diff --git a/data/styles/default/dark/symbols/npark-m.svg b/data/styles/walking/dark/symbols/npark-m.svg similarity index 100% rename from data/styles/default/dark/symbols/npark-m.svg rename to data/styles/walking/dark/symbols/npark-m.svg diff --git a/data/styles/default/dark/symbols/nparkf-m.svg b/data/styles/walking/dark/symbols/nparkf-m.svg similarity index 100% rename from data/styles/default/dark/symbols/nparkf-m.svg rename to data/styles/walking/dark/symbols/nparkf-m.svg diff --git a/data/styles/default/dark/symbols/nparkf-outline-m.svg b/data/styles/walking/dark/symbols/nparkf-outline-m.svg similarity index 100% rename from data/styles/default/dark/symbols/nparkf-outline-m.svg rename to data/styles/walking/dark/symbols/nparkf-outline-m.svg diff --git a/data/styles/default/dark/symbols/nparkf-outline-s.svg b/data/styles/walking/dark/symbols/nparkf-outline-s.svg similarity index 100% rename from data/styles/default/dark/symbols/nparkf-outline-s.svg rename to data/styles/walking/dark/symbols/nparkf-outline-s.svg diff --git a/data/styles/default/dark/symbols/nparkf-s.svg b/data/styles/walking/dark/symbols/nparkf-s.svg similarity index 100% rename from data/styles/default/dark/symbols/nparkf-s.svg rename to data/styles/walking/dark/symbols/nparkf-s.svg diff --git a/data/styles/default/dark/symbols/observatory-m.svg b/data/styles/walking/dark/symbols/observatory-m.svg similarity index 100% rename from data/styles/default/dark/symbols/observatory-m.svg rename to data/styles/walking/dark/symbols/observatory-m.svg diff --git a/data/styles/default/dark/symbols/office-m.svg b/data/styles/walking/dark/symbols/office-m.svg similarity index 100% rename from data/styles/default/dark/symbols/office-m.svg rename to data/styles/walking/dark/symbols/office-m.svg diff --git a/data/styles/default/dark/symbols/optician-m.svg b/data/styles/walking/dark/symbols/optician-m.svg similarity index 100% rename from data/styles/default/dark/symbols/optician-m.svg rename to data/styles/walking/dark/symbols/optician-m.svg diff --git a/data/styles/default/dark/symbols/optometrist-m.svg b/data/styles/walking/dark/symbols/optometrist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/optometrist-m.svg rename to data/styles/walking/dark/symbols/optometrist-m.svg diff --git a/data/styles/default/dark/symbols/outdoor-shop-m.svg b/data/styles/walking/dark/symbols/outdoor-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/outdoor-shop-m.svg rename to data/styles/walking/dark/symbols/outdoor-shop-m.svg diff --git a/data/styles/default/dark/symbols/outdoor_seating-m.svg b/data/styles/walking/dark/symbols/outdoor_seating-m.svg similarity index 100% rename from data/styles/default/dark/symbols/outdoor_seating-m.svg rename to data/styles/walking/dark/symbols/outdoor_seating-m.svg diff --git a/data/styles/default/dark/symbols/padel-centre-m.svg b/data/styles/walking/dark/symbols/padel-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/padel-centre-m.svg rename to data/styles/walking/dark/symbols/padel-centre-m.svg diff --git a/data/styles/default/dark/symbols/padel-m.svg b/data/styles/walking/dark/symbols/padel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/padel-m.svg rename to data/styles/walking/dark/symbols/padel-m.svg diff --git a/data/styles/default/dark/symbols/painter-m.svg b/data/styles/walking/dark/symbols/painter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/painter-m.svg rename to data/styles/walking/dark/symbols/painter-m.svg diff --git a/data/styles/default/dark/symbols/parcel_locker-m.svg b/data/styles/walking/dark/symbols/parcel_locker-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parcel_locker-m.svg rename to data/styles/walking/dark/symbols/parcel_locker-m.svg diff --git a/data/styles/default/dark/symbols/park-m.svg b/data/styles/walking/dark/symbols/park-m.svg similarity index 100% rename from data/styles/default/dark/symbols/park-m.svg rename to data/styles/walking/dark/symbols/park-m.svg diff --git a/data/styles/default/dark/symbols/park-outline-m.svg b/data/styles/walking/dark/symbols/park-outline-m.svg similarity index 100% rename from data/styles/default/dark/symbols/park-outline-m.svg rename to data/styles/walking/dark/symbols/park-outline-m.svg diff --git a/data/styles/default/dark/symbols/park-outline-s.svg b/data/styles/walking/dark/symbols/park-outline-s.svg similarity index 100% rename from data/styles/default/dark/symbols/park-outline-s.svg rename to data/styles/walking/dark/symbols/park-outline-s.svg diff --git a/data/styles/default/dark/symbols/park-s.svg b/data/styles/walking/dark/symbols/park-s.svg similarity index 100% rename from data/styles/default/dark/symbols/park-s.svg rename to data/styles/walking/dark/symbols/park-s.svg diff --git a/data/styles/default/dark/symbols/parking-disabled-m.svg b/data/styles/walking/dark/symbols/parking-disabled-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking-disabled-m.svg rename to data/styles/walking/dark/symbols/parking-disabled-m.svg diff --git a/data/styles/default/dark/symbols/parking-m.svg b/data/styles/walking/dark/symbols/parking-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking-m.svg rename to data/styles/walking/dark/symbols/parking-m.svg diff --git a/data/styles/default/dark/symbols/parking-meter-m.svg b/data/styles/walking/dark/symbols/parking-meter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking-meter-m.svg rename to data/styles/walking/dark/symbols/parking-meter-m.svg diff --git a/data/styles/default/dark/symbols/parking-s.svg b/data/styles/walking/dark/symbols/parking-s.svg similarity index 100% rename from data/styles/default/dark/symbols/parking-s.svg rename to data/styles/walking/dark/symbols/parking-s.svg diff --git a/data/styles/default/dark/symbols/parking_entrance-m.svg b/data/styles/walking/dark/symbols/parking_entrance-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_entrance-m.svg rename to data/styles/walking/dark/symbols/parking_entrance-m.svg diff --git a/data/styles/default/dark/symbols/parking_entrance_private-m.svg b/data/styles/walking/dark/symbols/parking_entrance_private-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_entrance_private-m.svg rename to data/styles/walking/dark/symbols/parking_entrance_private-m.svg diff --git a/data/styles/default/dark/symbols/parking_pay-m.svg b/data/styles/walking/dark/symbols/parking_pay-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_pay-m.svg rename to data/styles/walking/dark/symbols/parking_pay-m.svg diff --git a/data/styles/default/dark/symbols/parking_pay-s.svg b/data/styles/walking/dark/symbols/parking_pay-s.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_pay-s.svg rename to data/styles/walking/dark/symbols/parking_pay-s.svg diff --git a/data/styles/default/dark/symbols/parking_pooling-m.svg b/data/styles/walking/dark/symbols/parking_pooling-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_pooling-m.svg rename to data/styles/walking/dark/symbols/parking_pooling-m.svg diff --git a/data/styles/default/dark/symbols/parking_pooling-s.svg b/data/styles/walking/dark/symbols/parking_pooling-s.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_pooling-s.svg rename to data/styles/walking/dark/symbols/parking_pooling-s.svg diff --git a/data/styles/default/dark/symbols/parking_private-m.svg b/data/styles/walking/dark/symbols/parking_private-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_private-m.svg rename to data/styles/walking/dark/symbols/parking_private-m.svg diff --git a/data/styles/default/dark/symbols/parking_private-s.svg b/data/styles/walking/dark/symbols/parking_private-s.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_private-s.svg rename to data/styles/walking/dark/symbols/parking_private-s.svg diff --git a/data/styles/default/dark/symbols/parking_underground-m.svg b/data/styles/walking/dark/symbols/parking_underground-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_underground-m.svg rename to data/styles/walking/dark/symbols/parking_underground-m.svg diff --git a/data/styles/default/dark/symbols/parking_underground_pay-m.svg b/data/styles/walking/dark/symbols/parking_underground_pay-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_underground_pay-m.svg rename to data/styles/walking/dark/symbols/parking_underground_pay-m.svg diff --git a/data/styles/default/dark/symbols/parking_underground_private-m.svg b/data/styles/walking/dark/symbols/parking_underground_private-m.svg similarity index 100% rename from data/styles/default/dark/symbols/parking_underground_private-m.svg rename to data/styles/walking/dark/symbols/parking_underground_private-m.svg diff --git a/data/styles/default/dark/symbols/peakt-m.svg b/data/styles/walking/dark/symbols/peakt-m.svg similarity index 100% rename from data/styles/default/dark/symbols/peakt-m.svg rename to data/styles/walking/dark/symbols/peakt-m.svg diff --git a/data/styles/default/dark/symbols/peakt-s.svg b/data/styles/walking/dark/symbols/peakt-s.svg similarity index 100% rename from data/styles/default/dark/symbols/peakt-s.svg rename to data/styles/walking/dark/symbols/peakt-s.svg diff --git a/data/styles/default/dark/symbols/pelota-centre-m.svg b/data/styles/walking/dark/symbols/pelota-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pelota-centre-m.svg rename to data/styles/walking/dark/symbols/pelota-centre-m.svg diff --git a/data/styles/default/dark/symbols/pelota-m.svg b/data/styles/walking/dark/symbols/pelota-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pelota-m.svg rename to data/styles/walking/dark/symbols/pelota-m.svg diff --git a/data/styles/default/dark/symbols/petshop-m.svg b/data/styles/walking/dark/symbols/petshop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/petshop-m.svg rename to data/styles/walking/dark/symbols/petshop-m.svg diff --git a/data/styles/default/dark/symbols/petting_zoo-m.svg b/data/styles/walking/dark/symbols/petting_zoo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/petting_zoo-m.svg rename to data/styles/walking/dark/symbols/petting_zoo-m.svg diff --git a/data/styles/default/dark/symbols/pharmacy-m.svg b/data/styles/walking/dark/symbols/pharmacy-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pharmacy-m.svg rename to data/styles/walking/dark/symbols/pharmacy-m.svg diff --git a/data/styles/default/dark/symbols/phone-m.svg b/data/styles/walking/dark/symbols/phone-m.svg similarity index 100% rename from data/styles/default/dark/symbols/phone-m.svg rename to data/styles/walking/dark/symbols/phone-m.svg diff --git a/data/styles/default/dark/symbols/photo-shop-m.svg b/data/styles/walking/dark/symbols/photo-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/photo-shop-m.svg rename to data/styles/walking/dark/symbols/photo-shop-m.svg diff --git a/data/styles/default/dark/symbols/physiotherapist-m.svg b/data/styles/walking/dark/symbols/physiotherapist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/physiotherapist-m.svg rename to data/styles/walking/dark/symbols/physiotherapist-m.svg diff --git a/data/styles/default/dark/symbols/pickleball-centre-m.svg b/data/styles/walking/dark/symbols/pickleball-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pickleball-centre-m.svg rename to data/styles/walking/dark/symbols/pickleball-centre-m.svg diff --git a/data/styles/default/dark/symbols/pickleball-m.svg b/data/styles/walking/dark/symbols/pickleball-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pickleball-m.svg rename to data/styles/walking/dark/symbols/pickleball-m.svg diff --git a/data/styles/default/dark/symbols/picnic-m.svg b/data/styles/walking/dark/symbols/picnic-m.svg similarity index 100% rename from data/styles/default/dark/symbols/picnic-m.svg rename to data/styles/walking/dark/symbols/picnic-m.svg diff --git a/data/styles/default/dark/symbols/picnic-s.svg b/data/styles/walking/dark/symbols/picnic-s.svg similarity index 100% rename from data/styles/default/dark/symbols/picnic-s.svg rename to data/styles/walking/dark/symbols/picnic-s.svg diff --git a/data/styles/default/dark/symbols/picnic_table-m.svg b/data/styles/walking/dark/symbols/picnic_table-m.svg similarity index 100% rename from data/styles/default/dark/symbols/picnic_table-m.svg rename to data/styles/walking/dark/symbols/picnic_table-m.svg diff --git a/data/styles/default/dark/symbols/pitch-m.svg b/data/styles/walking/dark/symbols/pitch-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pitch-m.svg rename to data/styles/walking/dark/symbols/pitch-m.svg diff --git a/data/styles/default/dark/symbols/place-of-worship-m.svg b/data/styles/walking/dark/symbols/place-of-worship-m.svg similarity index 100% rename from data/styles/default/dark/symbols/place-of-worship-m.svg rename to data/styles/walking/dark/symbols/place-of-worship-m.svg diff --git a/data/styles/default/dark/symbols/place-of-worship-s.svg b/data/styles/walking/dark/symbols/place-of-worship-s.svg similarity index 100% rename from data/styles/default/dark/symbols/place-of-worship-s.svg rename to data/styles/walking/dark/symbols/place-of-worship-s.svg diff --git a/data/styles/default/dark/symbols/plant_nursery-m.svg b/data/styles/walking/dark/symbols/plant_nursery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/plant_nursery-m.svg rename to data/styles/walking/dark/symbols/plant_nursery-m.svg diff --git a/data/styles/default/dark/symbols/plaque.svg b/data/styles/walking/dark/symbols/plaque.svg similarity index 100% rename from data/styles/default/dark/symbols/plaque.svg rename to data/styles/walking/dark/symbols/plaque.svg diff --git a/data/styles/default/dark/symbols/playground-m.svg b/data/styles/walking/dark/symbols/playground-m.svg similarity index 100% rename from data/styles/default/dark/symbols/playground-m.svg rename to data/styles/walking/dark/symbols/playground-m.svg diff --git a/data/styles/default/dark/symbols/plumber-m.svg b/data/styles/walking/dark/symbols/plumber-m.svg similarity index 100% rename from data/styles/default/dark/symbols/plumber-m.svg rename to data/styles/walking/dark/symbols/plumber-m.svg diff --git a/data/styles/default/dark/symbols/podiatrist-m.svg b/data/styles/walking/dark/symbols/podiatrist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/podiatrist-m.svg rename to data/styles/walking/dark/symbols/podiatrist-m.svg diff --git a/data/styles/default/dark/symbols/pole-m.svg b/data/styles/walking/dark/symbols/pole-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pole-m.svg rename to data/styles/walking/dark/symbols/pole-m.svg diff --git a/data/styles/default/dark/symbols/police-m.svg b/data/styles/walking/dark/symbols/police-m.svg similarity index 100% rename from data/styles/default/dark/symbols/police-m.svg rename to data/styles/walking/dark/symbols/police-m.svg diff --git a/data/styles/default/dark/symbols/postbox-m.svg b/data/styles/walking/dark/symbols/postbox-m.svg similarity index 100% rename from data/styles/default/dark/symbols/postbox-m.svg rename to data/styles/walking/dark/symbols/postbox-m.svg diff --git a/data/styles/default/dark/symbols/power-m.svg b/data/styles/walking/dark/symbols/power-m.svg similarity index 100% rename from data/styles/default/dark/symbols/power-m.svg rename to data/styles/walking/dark/symbols/power-m.svg diff --git a/data/styles/default/dark/symbols/power-tower-m.svg b/data/styles/walking/dark/symbols/power-tower-m.svg similarity index 100% rename from data/styles/default/dark/symbols/power-tower-m.svg rename to data/styles/walking/dark/symbols/power-tower-m.svg diff --git a/data/styles/default/dark/symbols/power_plant_wind-m.svg b/data/styles/walking/dark/symbols/power_plant_wind-m.svg similarity index 100% rename from data/styles/default/dark/symbols/power_plant_wind-m.svg rename to data/styles/walking/dark/symbols/power_plant_wind-m.svg diff --git a/data/styles/default/dark/symbols/prep_school-m.svg b/data/styles/walking/dark/symbols/prep_school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/prep_school-m.svg rename to data/styles/walking/dark/symbols/prep_school-m.svg diff --git a/data/styles/default/dark/symbols/prison-m.svg b/data/styles/walking/dark/symbols/prison-m.svg similarity index 100% rename from data/styles/default/dark/symbols/prison-m.svg rename to data/styles/walking/dark/symbols/prison-m.svg diff --git a/data/styles/default/dark/symbols/psychotherapist-m.svg b/data/styles/walking/dark/symbols/psychotherapist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/psychotherapist-m.svg rename to data/styles/walking/dark/symbols/psychotherapist-m.svg diff --git a/data/styles/default/dark/symbols/pub-m.svg b/data/styles/walking/dark/symbols/pub-m.svg similarity index 100% rename from data/styles/default/dark/symbols/pub-m.svg rename to data/styles/walking/dark/symbols/pub-m.svg diff --git a/data/styles/default/dark/symbols/public-building-m.svg b/data/styles/walking/dark/symbols/public-building-m.svg similarity index 100% rename from data/styles/default/dark/symbols/public-building-m.svg rename to data/styles/walking/dark/symbols/public-building-m.svg diff --git a/data/styles/default/dark/symbols/public_bath-m.svg b/data/styles/walking/dark/symbols/public_bath-m.svg similarity index 100% rename from data/styles/default/dark/symbols/public_bath-m.svg rename to data/styles/walking/dark/symbols/public_bath-m.svg diff --git a/data/styles/default/dark/symbols/railway-crossing-l.svg b/data/styles/walking/dark/symbols/railway-crossing-l.svg similarity index 100% rename from data/styles/default/dark/symbols/railway-crossing-l.svg rename to data/styles/walking/dark/symbols/railway-crossing-l.svg diff --git a/data/styles/default/dark/symbols/railway-crossing-m.svg b/data/styles/walking/dark/symbols/railway-crossing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/railway-crossing-m.svg rename to data/styles/walking/dark/symbols/railway-crossing-m.svg diff --git a/data/styles/default/dark/symbols/ranger-station-m.svg b/data/styles/walking/dark/symbols/ranger-station-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ranger-station-m.svg rename to data/styles/walking/dark/symbols/ranger-station-m.svg diff --git a/data/styles/default/dark/symbols/recycling-centre-m.svg b/data/styles/walking/dark/symbols/recycling-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/recycling-centre-m.svg rename to data/styles/walking/dark/symbols/recycling-centre-m.svg diff --git a/data/styles/default/dark/symbols/recycling-m.svg b/data/styles/walking/dark/symbols/recycling-m.svg similarity index 100% rename from data/styles/default/dark/symbols/recycling-m.svg rename to data/styles/walking/dark/symbols/recycling-m.svg diff --git a/data/styles/default/dark/symbols/remains-m.svg b/data/styles/walking/dark/symbols/remains-m.svg similarity index 100% rename from data/styles/default/dark/symbols/remains-m.svg rename to data/styles/walking/dark/symbols/remains-m.svg diff --git a/data/styles/default/dark/symbols/remains-s.svg b/data/styles/walking/dark/symbols/remains-s.svg similarity index 100% rename from data/styles/default/dark/symbols/remains-s.svg rename to data/styles/walking/dark/symbols/remains-s.svg diff --git a/data/styles/default/dark/symbols/rental-m.svg b/data/styles/walking/dark/symbols/rental-m.svg similarity index 100% rename from data/styles/default/dark/symbols/rental-m.svg rename to data/styles/walking/dark/symbols/rental-m.svg diff --git a/data/styles/default/dark/symbols/restaurant-m.svg b/data/styles/walking/dark/symbols/restaurant-m.svg similarity index 100% rename from data/styles/default/dark/symbols/restaurant-m.svg rename to data/styles/walking/dark/symbols/restaurant-m.svg diff --git a/data/styles/default/dark/symbols/route-arrow.svg b/data/styles/walking/dark/symbols/route-arrow.svg similarity index 100% rename from data/styles/default/dark/symbols/route-arrow.svg rename to data/styles/walking/dark/symbols/route-arrow.svg diff --git a/data/styles/default/dark/symbols/route-point-1.svg b/data/styles/walking/dark/symbols/route-point-1.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-1.svg rename to data/styles/walking/dark/symbols/route-point-1.svg diff --git a/data/styles/default/dark/symbols/route-point-10.svg b/data/styles/walking/dark/symbols/route-point-10.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-10.svg rename to data/styles/walking/dark/symbols/route-point-10.svg diff --git a/data/styles/default/dark/symbols/route-point-11.svg b/data/styles/walking/dark/symbols/route-point-11.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-11.svg rename to data/styles/walking/dark/symbols/route-point-11.svg diff --git a/data/styles/default/dark/symbols/route-point-12.svg b/data/styles/walking/dark/symbols/route-point-12.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-12.svg rename to data/styles/walking/dark/symbols/route-point-12.svg diff --git a/data/styles/default/dark/symbols/route-point-13.svg b/data/styles/walking/dark/symbols/route-point-13.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-13.svg rename to data/styles/walking/dark/symbols/route-point-13.svg diff --git a/data/styles/default/dark/symbols/route-point-14.svg b/data/styles/walking/dark/symbols/route-point-14.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-14.svg rename to data/styles/walking/dark/symbols/route-point-14.svg diff --git a/data/styles/default/dark/symbols/route-point-15.svg b/data/styles/walking/dark/symbols/route-point-15.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-15.svg rename to data/styles/walking/dark/symbols/route-point-15.svg diff --git a/data/styles/default/dark/symbols/route-point-16.svg b/data/styles/walking/dark/symbols/route-point-16.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-16.svg rename to data/styles/walking/dark/symbols/route-point-16.svg diff --git a/data/styles/default/dark/symbols/route-point-17.svg b/data/styles/walking/dark/symbols/route-point-17.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-17.svg rename to data/styles/walking/dark/symbols/route-point-17.svg diff --git a/data/styles/default/dark/symbols/route-point-18.svg b/data/styles/walking/dark/symbols/route-point-18.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-18.svg rename to data/styles/walking/dark/symbols/route-point-18.svg diff --git a/data/styles/default/dark/symbols/route-point-19.svg b/data/styles/walking/dark/symbols/route-point-19.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-19.svg rename to data/styles/walking/dark/symbols/route-point-19.svg diff --git a/data/styles/default/dark/symbols/route-point-2.svg b/data/styles/walking/dark/symbols/route-point-2.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-2.svg rename to data/styles/walking/dark/symbols/route-point-2.svg diff --git a/data/styles/default/dark/symbols/route-point-20.svg b/data/styles/walking/dark/symbols/route-point-20.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-20.svg rename to data/styles/walking/dark/symbols/route-point-20.svg diff --git a/data/styles/default/dark/symbols/route-point-3.svg b/data/styles/walking/dark/symbols/route-point-3.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-3.svg rename to data/styles/walking/dark/symbols/route-point-3.svg diff --git a/data/styles/default/dark/symbols/route-point-4.svg b/data/styles/walking/dark/symbols/route-point-4.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-4.svg rename to data/styles/walking/dark/symbols/route-point-4.svg diff --git a/data/styles/default/dark/symbols/route-point-5.svg b/data/styles/walking/dark/symbols/route-point-5.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-5.svg rename to data/styles/walking/dark/symbols/route-point-5.svg diff --git a/data/styles/default/dark/symbols/route-point-6.svg b/data/styles/walking/dark/symbols/route-point-6.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-6.svg rename to data/styles/walking/dark/symbols/route-point-6.svg diff --git a/data/styles/default/dark/symbols/route-point-7.svg b/data/styles/walking/dark/symbols/route-point-7.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-7.svg rename to data/styles/walking/dark/symbols/route-point-7.svg diff --git a/data/styles/default/dark/symbols/route-point-8.svg b/data/styles/walking/dark/symbols/route-point-8.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-8.svg rename to data/styles/walking/dark/symbols/route-point-8.svg diff --git a/data/styles/default/dark/symbols/route-point-9.svg b/data/styles/walking/dark/symbols/route-point-9.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-9.svg rename to data/styles/walking/dark/symbols/route-point-9.svg diff --git a/data/styles/default/dark/symbols/route-point-finish.svg b/data/styles/walking/dark/symbols/route-point-finish.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-finish.svg rename to data/styles/walking/dark/symbols/route-point-finish.svg diff --git a/data/styles/default/dark/symbols/route-point-start.svg b/data/styles/walking/dark/symbols/route-point-start.svg similarity index 100% rename from data/styles/default/dark/symbols/route-point-start.svg rename to data/styles/walking/dark/symbols/route-point-start.svg diff --git a/data/styles/default/dark/symbols/sample_collection-m.svg b/data/styles/walking/dark/symbols/sample_collection-m.svg similarity index 100% rename from data/styles/default/dark/symbols/sample_collection-m.svg rename to data/styles/walking/dark/symbols/sample_collection-m.svg diff --git a/data/styles/default/dark/symbols/sauna-m.svg b/data/styles/walking/dark/symbols/sauna-m.svg similarity index 100% rename from data/styles/default/dark/symbols/sauna-m.svg rename to data/styles/walking/dark/symbols/sauna-m.svg diff --git a/data/styles/default/dark/symbols/sawmill-m.svg b/data/styles/walking/dark/symbols/sawmill-m.svg similarity index 100% rename from data/styles/default/dark/symbols/sawmill-m.svg rename to data/styles/walking/dark/symbols/sawmill-m.svg diff --git a/data/styles/default/dark/symbols/school-m.svg b/data/styles/walking/dark/symbols/school-m.svg similarity index 100% rename from data/styles/default/dark/symbols/school-m.svg rename to data/styles/walking/dark/symbols/school-m.svg diff --git a/data/styles/default/dark/symbols/seafood-shop-m.svg b/data/styles/walking/dark/symbols/seafood-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/seafood-shop-m.svg rename to data/styles/walking/dark/symbols/seafood-shop-m.svg diff --git a/data/styles/default/dark/symbols/search-result-apartment.svg b/data/styles/walking/dark/symbols/search-result-apartment.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-apartment.svg rename to data/styles/walking/dark/symbols/search-result-apartment.svg diff --git a/data/styles/default/dark/symbols/search-result-archaeological-site.svg b/data/styles/walking/dark/symbols/search-result-archaeological-site.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-archaeological-site.svg rename to data/styles/walking/dark/symbols/search-result-archaeological-site.svg diff --git a/data/styles/default/dark/symbols/search-result-art.svg b/data/styles/walking/dark/symbols/search-result-art.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-art.svg rename to data/styles/walking/dark/symbols/search-result-art.svg diff --git a/data/styles/default/dark/symbols/search-result-attraction.svg b/data/styles/walking/dark/symbols/search-result-attraction.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-attraction.svg rename to data/styles/walking/dark/symbols/search-result-attraction.svg diff --git a/data/styles/default/dark/symbols/search-result-bakery.svg b/data/styles/walking/dark/symbols/search-result-bakery.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bakery.svg rename to data/styles/walking/dark/symbols/search-result-bakery.svg diff --git a/data/styles/default/dark/symbols/search-result-bank.svg b/data/styles/walking/dark/symbols/search-result-bank.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bank.svg rename to data/styles/walking/dark/symbols/search-result-bank.svg diff --git a/data/styles/default/dark/symbols/search-result-bar.svg b/data/styles/walking/dark/symbols/search-result-bar.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bar.svg rename to data/styles/walking/dark/symbols/search-result-bar.svg diff --git a/data/styles/default/dark/symbols/search-result-bicycle_parking-covered.svg b/data/styles/walking/dark/symbols/search-result-bicycle_parking-covered.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bicycle_parking-covered.svg rename to data/styles/walking/dark/symbols/search-result-bicycle_parking-covered.svg diff --git a/data/styles/default/dark/symbols/search-result-bicycle_parking.svg b/data/styles/walking/dark/symbols/search-result-bicycle_parking.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bicycle_parking.svg rename to data/styles/walking/dark/symbols/search-result-bicycle_parking.svg diff --git a/data/styles/default/dark/symbols/search-result-bicycle_rental.svg b/data/styles/walking/dark/symbols/search-result-bicycle_rental.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-bicycle_rental.svg rename to data/styles/walking/dark/symbols/search-result-bicycle_rental.svg diff --git a/data/styles/default/dark/symbols/search-result-cafe.svg b/data/styles/walking/dark/symbols/search-result-cafe.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-cafe.svg rename to data/styles/walking/dark/symbols/search-result-cafe.svg diff --git a/data/styles/default/dark/symbols/search-result-campsite.svg b/data/styles/walking/dark/symbols/search-result-campsite.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-campsite.svg rename to data/styles/walking/dark/symbols/search-result-campsite.svg diff --git a/data/styles/default/dark/symbols/search-result-caravan-site.svg b/data/styles/walking/dark/symbols/search-result-caravan-site.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-caravan-site.svg rename to data/styles/walking/dark/symbols/search-result-caravan-site.svg diff --git a/data/styles/default/dark/symbols/search-result-casino.svg b/data/styles/walking/dark/symbols/search-result-casino.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-casino.svg rename to data/styles/walking/dark/symbols/search-result-casino.svg diff --git a/data/styles/default/dark/symbols/search-result-chalet.svg b/data/styles/walking/dark/symbols/search-result-chalet.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-chalet.svg rename to data/styles/walking/dark/symbols/search-result-chalet.svg diff --git a/data/styles/default/dark/symbols/search-result-charging_station.svg b/data/styles/walking/dark/symbols/search-result-charging_station.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-charging_station.svg rename to data/styles/walking/dark/symbols/search-result-charging_station.svg diff --git a/data/styles/default/dark/symbols/search-result-cinema.svg b/data/styles/walking/dark/symbols/search-result-cinema.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-cinema.svg rename to data/styles/walking/dark/symbols/search-result-cinema.svg diff --git a/data/styles/default/dark/symbols/search-result-clinic.svg b/data/styles/walking/dark/symbols/search-result-clinic.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-clinic.svg rename to data/styles/walking/dark/symbols/search-result-clinic.svg diff --git a/data/styles/default/dark/symbols/search-result-drinking-water-no.svg b/data/styles/walking/dark/symbols/search-result-drinking-water-no.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-drinking-water-no.svg rename to data/styles/walking/dark/symbols/search-result-drinking-water-no.svg diff --git a/data/styles/default/dark/symbols/search-result-drinking-water.svg b/data/styles/walking/dark/symbols/search-result-drinking-water.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-drinking-water.svg rename to data/styles/walking/dark/symbols/search-result-drinking-water.svg diff --git a/data/styles/default/dark/symbols/search-result-fastfood.svg b/data/styles/walking/dark/symbols/search-result-fastfood.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-fastfood.svg rename to data/styles/walking/dark/symbols/search-result-fastfood.svg diff --git a/data/styles/default/dark/symbols/search-result-fuel.svg b/data/styles/walking/dark/symbols/search-result-fuel.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-fuel.svg rename to data/styles/walking/dark/symbols/search-result-fuel.svg diff --git a/data/styles/default/dark/symbols/search-result-hospital.svg b/data/styles/walking/dark/symbols/search-result-hospital.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-hospital.svg rename to data/styles/walking/dark/symbols/search-result-hospital.svg diff --git a/data/styles/default/dark/symbols/search-result-hostel.svg b/data/styles/walking/dark/symbols/search-result-hostel.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-hostel.svg rename to data/styles/walking/dark/symbols/search-result-hostel.svg diff --git a/data/styles/default/dark/symbols/search-result-hotel.svg b/data/styles/walking/dark/symbols/search-result-hotel.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-hotel.svg rename to data/styles/walking/dark/symbols/search-result-hotel.svg diff --git a/data/styles/default/dark/symbols/search-result-information.svg b/data/styles/walking/dark/symbols/search-result-information.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-information.svg rename to data/styles/walking/dark/symbols/search-result-information.svg diff --git a/data/styles/default/dark/symbols/search-result-lottery.svg b/data/styles/walking/dark/symbols/search-result-lottery.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-lottery.svg rename to data/styles/walking/dark/symbols/search-result-lottery.svg diff --git a/data/styles/default/dark/symbols/search-result-marketplace.svg b/data/styles/walking/dark/symbols/search-result-marketplace.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-marketplace.svg rename to data/styles/walking/dark/symbols/search-result-marketplace.svg diff --git a/data/styles/default/dark/symbols/search-result-museum.svg b/data/styles/walking/dark/symbols/search-result-museum.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-museum.svg rename to data/styles/walking/dark/symbols/search-result-museum.svg diff --git a/data/styles/default/dark/symbols/search-result-nightclub.svg b/data/styles/walking/dark/symbols/search-result-nightclub.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-nightclub.svg rename to data/styles/walking/dark/symbols/search-result-nightclub.svg diff --git a/data/styles/default/dark/symbols/search-result-non-found.svg b/data/styles/walking/dark/symbols/search-result-non-found.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-non-found.svg rename to data/styles/walking/dark/symbols/search-result-non-found.svg diff --git a/data/styles/default/dark/symbols/search-result-pharmacy.svg b/data/styles/walking/dark/symbols/search-result-pharmacy.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-pharmacy.svg rename to data/styles/walking/dark/symbols/search-result-pharmacy.svg diff --git a/data/styles/default/dark/symbols/search-result-pitch.svg b/data/styles/walking/dark/symbols/search-result-pitch.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-pitch.svg rename to data/styles/walking/dark/symbols/search-result-pitch.svg diff --git a/data/styles/default/dark/symbols/search-result-playground.svg b/data/styles/walking/dark/symbols/search-result-playground.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-playground.svg rename to data/styles/walking/dark/symbols/search-result-playground.svg diff --git a/data/styles/default/dark/symbols/search-result-pub.svg b/data/styles/walking/dark/symbols/search-result-pub.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-pub.svg rename to data/styles/walking/dark/symbols/search-result-pub.svg diff --git a/data/styles/default/dark/symbols/search-result-remains.svg b/data/styles/walking/dark/symbols/search-result-remains.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-remains.svg rename to data/styles/walking/dark/symbols/search-result-remains.svg diff --git a/data/styles/default/dark/symbols/search-result-restaurant.svg b/data/styles/walking/dark/symbols/search-result-restaurant.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-restaurant.svg rename to data/styles/walking/dark/symbols/search-result-restaurant.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-alcohol.svg b/data/styles/walking/dark/symbols/search-result-shop-alcohol.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-alcohol.svg rename to data/styles/walking/dark/symbols/search-result-shop-alcohol.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-beauty.svg b/data/styles/walking/dark/symbols/search-result-shop-beauty.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-beauty.svg rename to data/styles/walking/dark/symbols/search-result-shop-beauty.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-butcher.svg b/data/styles/walking/dark/symbols/search-result-shop-butcher.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-butcher.svg rename to data/styles/walking/dark/symbols/search-result-shop-butcher.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-clothes.svg b/data/styles/walking/dark/symbols/search-result-shop-clothes.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-clothes.svg rename to data/styles/walking/dark/symbols/search-result-shop-clothes.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-confectionery.svg b/data/styles/walking/dark/symbols/search-result-shop-confectionery.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-confectionery.svg rename to data/styles/walking/dark/symbols/search-result-shop-confectionery.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-convenience.svg b/data/styles/walking/dark/symbols/search-result-shop-convenience.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-convenience.svg rename to data/styles/walking/dark/symbols/search-result-shop-convenience.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-department_store.svg b/data/styles/walking/dark/symbols/search-result-shop-department_store.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-department_store.svg rename to data/styles/walking/dark/symbols/search-result-shop-department_store.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-gift.svg b/data/styles/walking/dark/symbols/search-result-shop-gift.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-gift.svg rename to data/styles/walking/dark/symbols/search-result-shop-gift.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-greengrocer.svg b/data/styles/walking/dark/symbols/search-result-shop-greengrocer.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-greengrocer.svg rename to data/styles/walking/dark/symbols/search-result-shop-greengrocer.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-jewelry.svg b/data/styles/walking/dark/symbols/search-result-shop-jewelry.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-jewelry.svg rename to data/styles/walking/dark/symbols/search-result-shop-jewelry.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-seafood.svg b/data/styles/walking/dark/symbols/search-result-shop-seafood.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-seafood.svg rename to data/styles/walking/dark/symbols/search-result-shop-seafood.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-shoes.svg b/data/styles/walking/dark/symbols/search-result-shop-shoes.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-shoes.svg rename to data/styles/walking/dark/symbols/search-result-shop-shoes.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-sports.svg b/data/styles/walking/dark/symbols/search-result-shop-sports.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-sports.svg rename to data/styles/walking/dark/symbols/search-result-shop-sports.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-supermarket.svg b/data/styles/walking/dark/symbols/search-result-shop-supermarket.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-supermarket.svg rename to data/styles/walking/dark/symbols/search-result-shop-supermarket.svg diff --git a/data/styles/default/dark/symbols/search-result-shop-toys.svg b/data/styles/walking/dark/symbols/search-result-shop-toys.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-shop-toys.svg rename to data/styles/walking/dark/symbols/search-result-shop-toys.svg diff --git a/data/styles/default/dark/symbols/search-result-stadium.svg b/data/styles/walking/dark/symbols/search-result-stadium.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-stadium.svg rename to data/styles/walking/dark/symbols/search-result-stadium.svg diff --git a/data/styles/default/dark/symbols/search-result-swimming.svg b/data/styles/walking/dark/symbols/search-result-swimming.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-swimming.svg rename to data/styles/walking/dark/symbols/search-result-swimming.svg diff --git a/data/styles/default/dark/symbols/search-result-theatre.svg b/data/styles/walking/dark/symbols/search-result-theatre.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-theatre.svg rename to data/styles/walking/dark/symbols/search-result-theatre.svg diff --git a/data/styles/default/dark/symbols/search-result-theme-park.svg b/data/styles/walking/dark/symbols/search-result-theme-park.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-theme-park.svg rename to data/styles/walking/dark/symbols/search-result-theme-park.svg diff --git a/data/styles/default/dark/symbols/search-result-viewpoint.svg b/data/styles/walking/dark/symbols/search-result-viewpoint.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-viewpoint.svg rename to data/styles/walking/dark/symbols/search-result-viewpoint.svg diff --git a/data/styles/default/dark/symbols/search-result-zoo.svg b/data/styles/walking/dark/symbols/search-result-zoo.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result-zoo.svg rename to data/styles/walking/dark/symbols/search-result-zoo.svg diff --git a/data/styles/default/dark/symbols/search-result.svg b/data/styles/walking/dark/symbols/search-result.svg similarity index 100% rename from data/styles/default/dark/symbols/search-result.svg rename to data/styles/walking/dark/symbols/search-result.svg diff --git a/data/styles/default/dark/symbols/second_hand_shop-m.svg b/data/styles/walking/dark/symbols/second_hand_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/second_hand_shop-m.svg rename to data/styles/walking/dark/symbols/second_hand_shop-m.svg diff --git a/data/styles/default/dark/symbols/security-m.svg b/data/styles/walking/dark/symbols/security-m.svg similarity index 100% rename from data/styles/default/dark/symbols/security-m.svg rename to data/styles/walking/dark/symbols/security-m.svg diff --git a/data/styles/default/dark/symbols/shelter-m.svg b/data/styles/walking/dark/symbols/shelter-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shelter-m.svg rename to data/styles/walking/dark/symbols/shelter-m.svg diff --git a/data/styles/default/dark/symbols/shelter-public_transport-m.svg b/data/styles/walking/dark/symbols/shelter-public_transport-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shelter-public_transport-m.svg rename to data/styles/walking/dark/symbols/shelter-public_transport-m.svg diff --git a/data/styles/default/dark/symbols/shelter-s.svg b/data/styles/walking/dark/symbols/shelter-s.svg similarity index 100% rename from data/styles/default/dark/symbols/shelter-s.svg rename to data/styles/walking/dark/symbols/shelter-s.svg diff --git a/data/styles/default/dark/symbols/shield-argentina-rn-scaled.svg b/data/styles/walking/dark/symbols/shield-argentina-rn-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-argentina-rn-scaled.svg rename to data/styles/walking/dark/symbols/shield-argentina-rn-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-argentina-rn-wide-scaled.svg b/data/styles/walking/dark/symbols/shield-argentina-rn-wide-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-argentina-rn-wide-scaled.svg rename to data/styles/walking/dark/symbols/shield-argentina-rn-wide-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-argentina-rn-wide.svg b/data/styles/walking/dark/symbols/shield-argentina-rn-wide.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-argentina-rn-wide.svg rename to data/styles/walking/dark/symbols/shield-argentina-rn-wide.svg diff --git a/data/styles/default/dark/symbols/shield-argentina-rn.svg b/data/styles/walking/dark/symbols/shield-argentina-rn.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-argentina-rn.svg rename to data/styles/walking/dark/symbols/shield-argentina-rn.svg diff --git a/data/styles/default/dark/symbols/shield-bolivia-fundamental-scaled.svg b/data/styles/walking/dark/symbols/shield-bolivia-fundamental-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-bolivia-fundamental-scaled.svg rename to data/styles/walking/dark/symbols/shield-bolivia-fundamental-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-bolivia-fundamental.svg b/data/styles/walking/dark/symbols/shield-bolivia-fundamental.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-bolivia-fundamental.svg rename to data/styles/walking/dark/symbols/shield-bolivia-fundamental.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_blue-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_blue-scaled.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_blue-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_blue.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_blue.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_blue.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_green-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_green-scaled.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_green-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_green.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_green.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_green.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_green.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_red-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_red-scaled.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_red-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_red.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_red.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_red.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_red.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_turkey-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_turkey-scaled.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_turkey-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg b/data/styles/walking/dark/symbols/shield-highway_hexagon_turkey.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-highway_hexagon_turkey.svg rename to data/styles/walking/dark/symbols/shield-highway_hexagon_turkey.svg diff --git a/data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg b/data/styles/walking/dark/symbols/shield-hungary-blue-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-hungary-blue-scaled.svg rename to data/styles/walking/dark/symbols/shield-hungary-blue-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-hungary-blue.svg b/data/styles/walking/dark/symbols/shield-hungary-blue.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-hungary-blue.svg rename to data/styles/walking/dark/symbols/shield-hungary-blue.svg diff --git a/data/styles/default/dark/symbols/shield-hungary-green-scaled.svg b/data/styles/walking/dark/symbols/shield-hungary-green-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-hungary-green-scaled.svg rename to data/styles/walking/dark/symbols/shield-hungary-green-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-hungary-green.svg b/data/styles/walking/dark/symbols/shield-hungary-green.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-hungary-green.svg rename to data/styles/walking/dark/symbols/shield-hungary-green.svg diff --git a/data/styles/default/dark/symbols/shield-it-a-scaled.svg b/data/styles/walking/dark/symbols/shield-it-a-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-it-a-scaled.svg rename to data/styles/walking/dark/symbols/shield-it-a-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-it-a.svg b/data/styles/walking/dark/symbols/shield-it-a.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-it-a.svg rename to data/styles/walking/dark/symbols/shield-it-a.svg diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg b/data/styles/walking/dark/symbols/shield-us-hw-thin-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg rename to data/styles/walking/dark/symbols/shield-us-hw-thin-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin.svg b/data/styles/walking/dark/symbols/shield-us-hw-thin.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-hw-thin.svg rename to data/styles/walking/dark/symbols/shield-us-hw-thin.svg diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg b/data/styles/walking/dark/symbols/shield-us-hw-wide-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg rename to data/styles/walking/dark/symbols/shield-us-hw-wide-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide.svg b/data/styles/walking/dark/symbols/shield-us-hw-wide.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-hw-wide.svg rename to data/styles/walking/dark/symbols/shield-us-hw-wide.svg diff --git a/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg b/data/styles/walking/dark/symbols/shield-us-i-thin-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg rename to data/styles/walking/dark/symbols/shield-us-i-thin-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-us-i-thin.svg b/data/styles/walking/dark/symbols/shield-us-i-thin.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-i-thin.svg rename to data/styles/walking/dark/symbols/shield-us-i-thin.svg diff --git a/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg b/data/styles/walking/dark/symbols/shield-us-i-wide-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg rename to data/styles/walking/dark/symbols/shield-us-i-wide-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-us-i-wide.svg b/data/styles/walking/dark/symbols/shield-us-i-wide.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-us-i-wide.svg rename to data/styles/walking/dark/symbols/shield-us-i-wide.svg diff --git a/data/styles/default/dark/symbols/shield-uy-scaled.svg b/data/styles/walking/dark/symbols/shield-uy-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-uy-scaled.svg rename to data/styles/walking/dark/symbols/shield-uy-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-uy-wide-scaled.svg b/data/styles/walking/dark/symbols/shield-uy-wide-scaled.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-uy-wide-scaled.svg rename to data/styles/walking/dark/symbols/shield-uy-wide-scaled.svg diff --git a/data/styles/default/dark/symbols/shield-uy-wide.svg b/data/styles/walking/dark/symbols/shield-uy-wide.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-uy-wide.svg rename to data/styles/walking/dark/symbols/shield-uy-wide.svg diff --git a/data/styles/default/dark/symbols/shield-uy.svg b/data/styles/walking/dark/symbols/shield-uy.svg similarity index 100% rename from data/styles/default/dark/symbols/shield-uy.svg rename to data/styles/walking/dark/symbols/shield-uy.svg diff --git a/data/styles/default/dark/symbols/shinto-m.svg b/data/styles/walking/dark/symbols/shinto-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shinto-m.svg rename to data/styles/walking/dark/symbols/shinto-m.svg diff --git a/data/styles/default/dark/symbols/shinto-s.svg b/data/styles/walking/dark/symbols/shinto-s.svg similarity index 100% rename from data/styles/default/dark/symbols/shinto-s.svg rename to data/styles/walking/dark/symbols/shinto-s.svg diff --git a/data/styles/default/dark/symbols/ship-m.svg b/data/styles/walking/dark/symbols/ship-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ship-m.svg rename to data/styles/walking/dark/symbols/ship-m.svg diff --git a/data/styles/default/dark/symbols/ship-s.svg b/data/styles/walking/dark/symbols/ship-s.svg similarity index 100% rename from data/styles/default/dark/symbols/ship-s.svg rename to data/styles/walking/dark/symbols/ship-s.svg diff --git a/data/styles/default/dark/symbols/shoes-m.svg b/data/styles/walking/dark/symbols/shoes-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shoes-m.svg rename to data/styles/walking/dark/symbols/shoes-m.svg diff --git a/data/styles/default/dark/symbols/shop-bicycle-m.svg b/data/styles/walking/dark/symbols/shop-bicycle-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-bicycle-m.svg rename to data/styles/walking/dark/symbols/shop-bicycle-m.svg diff --git a/data/styles/default/dark/symbols/shop-industry-m.svg b/data/styles/walking/dark/symbols/shop-industry-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-industry-m.svg rename to data/styles/walking/dark/symbols/shop-industry-m.svg diff --git a/data/styles/default/dark/symbols/shop-m.svg b/data/styles/walking/dark/symbols/shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-m.svg rename to data/styles/walking/dark/symbols/shop-m.svg diff --git a/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg b/data/styles/walking/dark/symbols/shop-rental-bicycle-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-rental-bicycle-m.svg rename to data/styles/walking/dark/symbols/shop-rental-bicycle-m.svg diff --git a/data/styles/default/dark/symbols/shop-s.svg b/data/styles/walking/dark/symbols/shop-s.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-s.svg rename to data/styles/walking/dark/symbols/shop-s.svg diff --git a/data/styles/default/dark/symbols/shop-water-m.svg b/data/styles/walking/dark/symbols/shop-water-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shop-water-m.svg rename to data/styles/walking/dark/symbols/shop-water-m.svg diff --git a/data/styles/default/dark/symbols/shower-m.svg b/data/styles/walking/dark/symbols/shower-m.svg similarity index 100% rename from data/styles/default/dark/symbols/shower-m.svg rename to data/styles/walking/dark/symbols/shower-m.svg diff --git a/data/styles/default/dark/symbols/skateboard-centre-m.svg b/data/styles/walking/dark/symbols/skateboard-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/skateboard-centre-m.svg rename to data/styles/walking/dark/symbols/skateboard-centre-m.svg diff --git a/data/styles/default/dark/symbols/skateboard-m.svg b/data/styles/walking/dark/symbols/skateboard-m.svg similarity index 100% rename from data/styles/default/dark/symbols/skateboard-m.svg rename to data/styles/walking/dark/symbols/skateboard-m.svg diff --git a/data/styles/default/dark/symbols/skiing-centre-m.svg b/data/styles/walking/dark/symbols/skiing-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/skiing-centre-m.svg rename to data/styles/walking/dark/symbols/skiing-centre-m.svg diff --git a/data/styles/default/dark/symbols/skiing-m.svg b/data/styles/walking/dark/symbols/skiing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/skiing-m.svg rename to data/styles/walking/dark/symbols/skiing-m.svg diff --git a/data/styles/default/dark/symbols/slipway-m.svg b/data/styles/walking/dark/symbols/slipway-m.svg similarity index 100% rename from data/styles/default/dark/symbols/slipway-m.svg rename to data/styles/walking/dark/symbols/slipway-m.svg diff --git a/data/styles/default/dark/symbols/slots-m.svg b/data/styles/walking/dark/symbols/slots-m.svg similarity index 100% rename from data/styles/default/dark/symbols/slots-m.svg rename to data/styles/walking/dark/symbols/slots-m.svg diff --git a/data/styles/default/dark/symbols/soccer-centre-m.svg b/data/styles/walking/dark/symbols/soccer-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/soccer-centre-m.svg rename to data/styles/walking/dark/symbols/soccer-centre-m.svg diff --git a/data/styles/default/dark/symbols/soccer-m.svg b/data/styles/walking/dark/symbols/soccer-m.svg similarity index 100% rename from data/styles/default/dark/symbols/soccer-m.svg rename to data/styles/walking/dark/symbols/soccer-m.svg diff --git a/data/styles/default/dark/symbols/social_facility-m.svg b/data/styles/walking/dark/symbols/social_facility-m.svg similarity index 100% rename from data/styles/default/dark/symbols/social_facility-m.svg rename to data/styles/walking/dark/symbols/social_facility-m.svg diff --git a/data/styles/default/dark/symbols/soup_kitchen-m.svg b/data/styles/walking/dark/symbols/soup_kitchen-m.svg similarity index 100% rename from data/styles/default/dark/symbols/soup_kitchen-m.svg rename to data/styles/walking/dark/symbols/soup_kitchen-m.svg diff --git a/data/styles/default/dark/symbols/speech_therapist-m.svg b/data/styles/walking/dark/symbols/speech_therapist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/speech_therapist-m.svg rename to data/styles/walking/dark/symbols/speech_therapist-m.svg diff --git a/data/styles/default/dark/symbols/speedcam-alert-l.svg b/data/styles/walking/dark/symbols/speedcam-alert-l.svg similarity index 100% rename from data/styles/default/dark/symbols/speedcam-alert-l.svg rename to data/styles/walking/dark/symbols/speedcam-alert-l.svg diff --git a/data/styles/default/dark/symbols/speedcam-m.svg b/data/styles/walking/dark/symbols/speedcam-m.svg similarity index 100% rename from data/styles/default/dark/symbols/speedcam-m.svg rename to data/styles/walking/dark/symbols/speedcam-m.svg diff --git a/data/styles/default/dark/symbols/speedcam-s.svg b/data/styles/walking/dark/symbols/speedcam-s.svg similarity index 100% rename from data/styles/default/dark/symbols/speedcam-s.svg rename to data/styles/walking/dark/symbols/speedcam-s.svg diff --git a/data/styles/default/dark/symbols/sports-m.svg b/data/styles/walking/dark/symbols/sports-m.svg similarity index 100% rename from data/styles/default/dark/symbols/sports-m.svg rename to data/styles/walking/dark/symbols/sports-m.svg diff --git a/data/styles/default/dark/symbols/sports_centre-m.svg b/data/styles/walking/dark/symbols/sports_centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/sports_centre-m.svg rename to data/styles/walking/dark/symbols/sports_centre-m.svg diff --git a/data/styles/default/dark/symbols/stadium-m.svg b/data/styles/walking/dark/symbols/stadium-m.svg similarity index 100% rename from data/styles/default/dark/symbols/stadium-m.svg rename to data/styles/walking/dark/symbols/stadium-m.svg diff --git a/data/styles/default/dark/symbols/stadium-s.svg b/data/styles/walking/dark/symbols/stadium-s.svg similarity index 100% rename from data/styles/default/dark/symbols/stadium-s.svg rename to data/styles/walking/dark/symbols/stadium-s.svg diff --git a/data/styles/default/dark/symbols/star-l.svg b/data/styles/walking/dark/symbols/star-l.svg similarity index 100% rename from data/styles/default/dark/symbols/star-l.svg rename to data/styles/walking/dark/symbols/star-l.svg diff --git a/data/styles/default/dark/symbols/star-m.svg b/data/styles/walking/dark/symbols/star-m.svg similarity index 100% rename from data/styles/default/dark/symbols/star-m.svg rename to data/styles/walking/dark/symbols/star-m.svg diff --git a/data/styles/default/dark/symbols/star-s.svg b/data/styles/walking/dark/symbols/star-s.svg similarity index 100% rename from data/styles/default/dark/symbols/star-s.svg rename to data/styles/walking/dark/symbols/star-s.svg diff --git a/data/styles/default/dark/symbols/stationery_shop-m.svg b/data/styles/walking/dark/symbols/stationery_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/stationery_shop-m.svg rename to data/styles/walking/dark/symbols/stationery_shop-m.svg diff --git a/data/styles/default/dark/symbols/statue-m.svg b/data/styles/walking/dark/symbols/statue-m.svg similarity index 100% rename from data/styles/default/dark/symbols/statue-m.svg rename to data/styles/walking/dark/symbols/statue-m.svg diff --git a/data/styles/default/dark/symbols/stone-m.svg b/data/styles/walking/dark/symbols/stone-m.svg similarity index 100% rename from data/styles/default/dark/symbols/stone-m.svg rename to data/styles/walking/dark/symbols/stone-m.svg diff --git a/data/styles/default/dark/symbols/storage-tank.svg b/data/styles/walking/dark/symbols/storage-tank.svg similarity index 100% rename from data/styles/default/dark/symbols/storage-tank.svg rename to data/styles/walking/dark/symbols/storage-tank.svg diff --git a/data/styles/default/dark/symbols/stripclub-m.svg b/data/styles/walking/dark/symbols/stripclub-m.svg similarity index 100% rename from data/styles/default/dark/symbols/stripclub-m.svg rename to data/styles/walking/dark/symbols/stripclub-m.svg diff --git a/data/styles/default/dark/symbols/studio-m.svg b/data/styles/walking/dark/symbols/studio-m.svg similarity index 100% rename from data/styles/default/dark/symbols/studio-m.svg rename to data/styles/walking/dark/symbols/studio-m.svg diff --git a/data/styles/default/dark/symbols/subway-adana-m.svg b/data/styles/walking/dark/symbols/subway-adana-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-adana-m.svg rename to data/styles/walking/dark/symbols/subway-adana-m.svg diff --git a/data/styles/default/dark/symbols/subway-adana-s.svg b/data/styles/walking/dark/symbols/subway-adana-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-adana-s.svg rename to data/styles/walking/dark/symbols/subway-adana-s.svg diff --git a/data/styles/default/dark/symbols/subway-algeria-m.svg b/data/styles/walking/dark/symbols/subway-algeria-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-algeria-m.svg rename to data/styles/walking/dark/symbols/subway-algeria-m.svg diff --git a/data/styles/default/dark/symbols/subway-algeria-s.svg b/data/styles/walking/dark/symbols/subway-algeria-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-algeria-s.svg rename to data/styles/walking/dark/symbols/subway-algeria-s.svg diff --git a/data/styles/default/dark/symbols/subway-alicante-m.svg b/data/styles/walking/dark/symbols/subway-alicante-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-alicante-m.svg rename to data/styles/walking/dark/symbols/subway-alicante-m.svg diff --git a/data/styles/default/dark/symbols/subway-alicante-s.svg b/data/styles/walking/dark/symbols/subway-alicante-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-alicante-s.svg rename to data/styles/walking/dark/symbols/subway-alicante-s.svg diff --git a/data/styles/default/dark/symbols/subway-almaty-m.svg b/data/styles/walking/dark/symbols/subway-almaty-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-almaty-m.svg rename to data/styles/walking/dark/symbols/subway-almaty-m.svg diff --git a/data/styles/default/dark/symbols/subway-almaty-s.svg b/data/styles/walking/dark/symbols/subway-almaty-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-almaty-s.svg rename to data/styles/walking/dark/symbols/subway-almaty-s.svg diff --git a/data/styles/default/dark/symbols/subway-amsterdam-m.svg b/data/styles/walking/dark/symbols/subway-amsterdam-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-amsterdam-m.svg rename to data/styles/walking/dark/symbols/subway-amsterdam-m.svg diff --git a/data/styles/default/dark/symbols/subway-amsterdam-s.svg b/data/styles/walking/dark/symbols/subway-amsterdam-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-amsterdam-s.svg rename to data/styles/walking/dark/symbols/subway-amsterdam-s.svg diff --git a/data/styles/default/dark/symbols/subway-ankara-m.svg b/data/styles/walking/dark/symbols/subway-ankara-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ankara-m.svg rename to data/styles/walking/dark/symbols/subway-ankara-m.svg diff --git a/data/styles/default/dark/symbols/subway-ankara-s.svg b/data/styles/walking/dark/symbols/subway-ankara-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ankara-s.svg rename to data/styles/walking/dark/symbols/subway-ankara-s.svg diff --git a/data/styles/default/dark/symbols/subway-athens-m.svg b/data/styles/walking/dark/symbols/subway-athens-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-athens-m.svg rename to data/styles/walking/dark/symbols/subway-athens-m.svg diff --git a/data/styles/default/dark/symbols/subway-athens-s.svg b/data/styles/walking/dark/symbols/subway-athens-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-athens-s.svg rename to data/styles/walking/dark/symbols/subway-athens-s.svg diff --git a/data/styles/default/dark/symbols/subway-baku-m.svg b/data/styles/walking/dark/symbols/subway-baku-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-baku-m.svg rename to data/styles/walking/dark/symbols/subway-baku-m.svg diff --git a/data/styles/default/dark/symbols/subway-baku-s.svg b/data/styles/walking/dark/symbols/subway-baku-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-baku-s.svg rename to data/styles/walking/dark/symbols/subway-baku-s.svg diff --git a/data/styles/default/dark/symbols/subway-bangkok-m.svg b/data/styles/walking/dark/symbols/subway-bangkok-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bangkok-m.svg rename to data/styles/walking/dark/symbols/subway-bangkok-m.svg diff --git a/data/styles/default/dark/symbols/subway-bangkok-s.svg b/data/styles/walking/dark/symbols/subway-bangkok-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bangkok-s.svg rename to data/styles/walking/dark/symbols/subway-bangkok-s.svg diff --git a/data/styles/default/dark/symbols/subway-barcelona-m.svg b/data/styles/walking/dark/symbols/subway-barcelona-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-barcelona-m.svg rename to data/styles/walking/dark/symbols/subway-barcelona-m.svg diff --git a/data/styles/default/dark/symbols/subway-barcelona-s.svg b/data/styles/walking/dark/symbols/subway-barcelona-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-barcelona-s.svg rename to data/styles/walking/dark/symbols/subway-barcelona-s.svg diff --git a/data/styles/default/dark/symbols/subway-beijing-m.svg b/data/styles/walking/dark/symbols/subway-beijing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-beijing-m.svg rename to data/styles/walking/dark/symbols/subway-beijing-m.svg diff --git a/data/styles/default/dark/symbols/subway-beijing-s.svg b/data/styles/walking/dark/symbols/subway-beijing-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-beijing-s.svg rename to data/styles/walking/dark/symbols/subway-beijing-s.svg diff --git a/data/styles/default/dark/symbols/subway-bengaluru-m.svg b/data/styles/walking/dark/symbols/subway-bengaluru-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bengaluru-m.svg rename to data/styles/walking/dark/symbols/subway-bengaluru-m.svg diff --git a/data/styles/default/dark/symbols/subway-bengaluru-s.svg b/data/styles/walking/dark/symbols/subway-bengaluru-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bengaluru-s.svg rename to data/styles/walking/dark/symbols/subway-bengaluru-s.svg diff --git a/data/styles/default/dark/symbols/subway-bilbao-m.svg b/data/styles/walking/dark/symbols/subway-bilbao-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bilbao-m.svg rename to data/styles/walking/dark/symbols/subway-bilbao-m.svg diff --git a/data/styles/default/dark/symbols/subway-bilbao-s.svg b/data/styles/walking/dark/symbols/subway-bilbao-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bilbao-s.svg rename to data/styles/walking/dark/symbols/subway-bilbao-s.svg diff --git a/data/styles/default/dark/symbols/subway-brasilia-m.svg b/data/styles/walking/dark/symbols/subway-brasilia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brasilia-m.svg rename to data/styles/walking/dark/symbols/subway-brasilia-m.svg diff --git a/data/styles/default/dark/symbols/subway-brasilia-s.svg b/data/styles/walking/dark/symbols/subway-brasilia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brasilia-s.svg rename to data/styles/walking/dark/symbols/subway-brasilia-s.svg diff --git a/data/styles/default/dark/symbols/subway-brescia-m.svg b/data/styles/walking/dark/symbols/subway-brescia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brescia-m.svg rename to data/styles/walking/dark/symbols/subway-brescia-m.svg diff --git a/data/styles/default/dark/symbols/subway-brescia-s.svg b/data/styles/walking/dark/symbols/subway-brescia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brescia-s.svg rename to data/styles/walking/dark/symbols/subway-brescia-s.svg diff --git a/data/styles/default/dark/symbols/subway-brussel-m.svg b/data/styles/walking/dark/symbols/subway-brussel-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brussel-m.svg rename to data/styles/walking/dark/symbols/subway-brussel-m.svg diff --git a/data/styles/default/dark/symbols/subway-brussel-s.svg b/data/styles/walking/dark/symbols/subway-brussel-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-brussel-s.svg rename to data/styles/walking/dark/symbols/subway-brussel-s.svg diff --git a/data/styles/default/dark/symbols/subway-bucharest-m.svg b/data/styles/walking/dark/symbols/subway-bucharest-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bucharest-m.svg rename to data/styles/walking/dark/symbols/subway-bucharest-m.svg diff --git a/data/styles/default/dark/symbols/subway-bucharest-s.svg b/data/styles/walking/dark/symbols/subway-bucharest-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bucharest-s.svg rename to data/styles/walking/dark/symbols/subway-bucharest-s.svg diff --git a/data/styles/default/dark/symbols/subway-budapest-m.svg b/data/styles/walking/dark/symbols/subway-budapest-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-budapest-m.svg rename to data/styles/walking/dark/symbols/subway-budapest-m.svg diff --git a/data/styles/default/dark/symbols/subway-budapest-s.svg b/data/styles/walking/dark/symbols/subway-budapest-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-budapest-s.svg rename to data/styles/walking/dark/symbols/subway-budapest-s.svg diff --git a/data/styles/default/dark/symbols/subway-buenosaires-m.svg b/data/styles/walking/dark/symbols/subway-buenosaires-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-buenosaires-m.svg rename to data/styles/walking/dark/symbols/subway-buenosaires-m.svg diff --git a/data/styles/default/dark/symbols/subway-buenosaires-s.svg b/data/styles/walking/dark/symbols/subway-buenosaires-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-buenosaires-s.svg rename to data/styles/walking/dark/symbols/subway-buenosaires-s.svg diff --git a/data/styles/default/dark/symbols/subway-bursaray-m.svg b/data/styles/walking/dark/symbols/subway-bursaray-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bursaray-m.svg rename to data/styles/walking/dark/symbols/subway-bursaray-m.svg diff --git a/data/styles/default/dark/symbols/subway-bursaray-s.svg b/data/styles/walking/dark/symbols/subway-bursaray-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-bursaray-s.svg rename to data/styles/walking/dark/symbols/subway-bursaray-s.svg diff --git a/data/styles/default/dark/symbols/subway-cairo-m.svg b/data/styles/walking/dark/symbols/subway-cairo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-cairo-m.svg rename to data/styles/walking/dark/symbols/subway-cairo-m.svg diff --git a/data/styles/default/dark/symbols/subway-cairo-s.svg b/data/styles/walking/dark/symbols/subway-cairo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-cairo-s.svg rename to data/styles/walking/dark/symbols/subway-cairo-s.svg diff --git a/data/styles/default/dark/symbols/subway-caracas-m.svg b/data/styles/walking/dark/symbols/subway-caracas-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-caracas-m.svg rename to data/styles/walking/dark/symbols/subway-caracas-m.svg diff --git a/data/styles/default/dark/symbols/subway-caracas-s.svg b/data/styles/walking/dark/symbols/subway-caracas-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-caracas-s.svg rename to data/styles/walking/dark/symbols/subway-caracas-s.svg diff --git a/data/styles/default/dark/symbols/subway-catania-m.svg b/data/styles/walking/dark/symbols/subway-catania-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-catania-m.svg rename to data/styles/walking/dark/symbols/subway-catania-m.svg diff --git a/data/styles/default/dark/symbols/subway-catania-s.svg b/data/styles/walking/dark/symbols/subway-catania-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-catania-s.svg rename to data/styles/walking/dark/symbols/subway-catania-s.svg diff --git a/data/styles/default/dark/symbols/subway-changchun-m.svg b/data/styles/walking/dark/symbols/subway-changchun-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-changchun-m.svg rename to data/styles/walking/dark/symbols/subway-changchun-m.svg diff --git a/data/styles/default/dark/symbols/subway-changchun-s.svg b/data/styles/walking/dark/symbols/subway-changchun-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-changchun-s.svg rename to data/styles/walking/dark/symbols/subway-changchun-s.svg diff --git a/data/styles/default/dark/symbols/subway-chengdu-m.svg b/data/styles/walking/dark/symbols/subway-chengdu-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chengdu-m.svg rename to data/styles/walking/dark/symbols/subway-chengdu-m.svg diff --git a/data/styles/default/dark/symbols/subway-chengdu-s.svg b/data/styles/walking/dark/symbols/subway-chengdu-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chengdu-s.svg rename to data/styles/walking/dark/symbols/subway-chengdu-s.svg diff --git a/data/styles/default/dark/symbols/subway-chicago-m.svg b/data/styles/walking/dark/symbols/subway-chicago-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chicago-m.svg rename to data/styles/walking/dark/symbols/subway-chicago-m.svg diff --git a/data/styles/default/dark/symbols/subway-chicago-s.svg b/data/styles/walking/dark/symbols/subway-chicago-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chicago-s.svg rename to data/styles/walking/dark/symbols/subway-chicago-s.svg diff --git a/data/styles/default/dark/symbols/subway-chongqing-m.svg b/data/styles/walking/dark/symbols/subway-chongqing-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chongqing-m.svg rename to data/styles/walking/dark/symbols/subway-chongqing-m.svg diff --git a/data/styles/default/dark/symbols/subway-chongqing-s.svg b/data/styles/walking/dark/symbols/subway-chongqing-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-chongqing-s.svg rename to data/styles/walking/dark/symbols/subway-chongqing-s.svg diff --git a/data/styles/default/dark/symbols/subway-dalian-m.svg b/data/styles/walking/dark/symbols/subway-dalian-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dalian-m.svg rename to data/styles/walking/dark/symbols/subway-dalian-m.svg diff --git a/data/styles/default/dark/symbols/subway-dalian-s.svg b/data/styles/walking/dark/symbols/subway-dalian-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dalian-s.svg rename to data/styles/walking/dark/symbols/subway-dalian-s.svg diff --git a/data/styles/default/dark/symbols/subway-delhi-m.svg b/data/styles/walking/dark/symbols/subway-delhi-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-delhi-m.svg rename to data/styles/walking/dark/symbols/subway-delhi-m.svg diff --git a/data/styles/default/dark/symbols/subway-delhi-s.svg b/data/styles/walking/dark/symbols/subway-delhi-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-delhi-s.svg rename to data/styles/walking/dark/symbols/subway-delhi-s.svg diff --git a/data/styles/default/dark/symbols/subway-dnepro-m.svg b/data/styles/walking/dark/symbols/subway-dnepro-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dnepro-m.svg rename to data/styles/walking/dark/symbols/subway-dnepro-m.svg diff --git a/data/styles/default/dark/symbols/subway-dnepro-s.svg b/data/styles/walking/dark/symbols/subway-dnepro-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dnepro-s.svg rename to data/styles/walking/dark/symbols/subway-dnepro-s.svg diff --git a/data/styles/default/dark/symbols/subway-dubai-m.svg b/data/styles/walking/dark/symbols/subway-dubai-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dubai-m.svg rename to data/styles/walking/dark/symbols/subway-dubai-m.svg diff --git a/data/styles/default/dark/symbols/subway-dubai-s.svg b/data/styles/walking/dark/symbols/subway-dubai-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-dubai-s.svg rename to data/styles/walking/dark/symbols/subway-dubai-s.svg diff --git a/data/styles/default/dark/symbols/subway-edmonton-m.svg b/data/styles/walking/dark/symbols/subway-edmonton-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-edmonton-m.svg rename to data/styles/walking/dark/symbols/subway-edmonton-m.svg diff --git a/data/styles/default/dark/symbols/subway-edmonton-s.svg b/data/styles/walking/dark/symbols/subway-edmonton-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-edmonton-s.svg rename to data/styles/walking/dark/symbols/subway-edmonton-s.svg diff --git a/data/styles/default/dark/symbols/subway-ekb-m.svg b/data/styles/walking/dark/symbols/subway-ekb-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ekb-m.svg rename to data/styles/walking/dark/symbols/subway-ekb-m.svg diff --git a/data/styles/default/dark/symbols/subway-ekb-s.svg b/data/styles/walking/dark/symbols/subway-ekb-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ekb-s.svg rename to data/styles/walking/dark/symbols/subway-ekb-s.svg diff --git a/data/styles/default/dark/symbols/subway-entrance-m.svg b/data/styles/walking/dark/symbols/subway-entrance-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-entrance-m.svg rename to data/styles/walking/dark/symbols/subway-entrance-m.svg diff --git a/data/styles/default/dark/symbols/subway-entrance-s.svg b/data/styles/walking/dark/symbols/subway-entrance-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-entrance-s.svg rename to data/styles/walking/dark/symbols/subway-entrance-s.svg diff --git a/data/styles/default/dark/symbols/subway-foshan-m.svg b/data/styles/walking/dark/symbols/subway-foshan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-foshan-m.svg rename to data/styles/walking/dark/symbols/subway-foshan-m.svg diff --git a/data/styles/default/dark/symbols/subway-foshan-s.svg b/data/styles/walking/dark/symbols/subway-foshan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-foshan-s.svg rename to data/styles/walking/dark/symbols/subway-foshan-s.svg diff --git a/data/styles/default/dark/symbols/subway-fukuoka-m.svg b/data/styles/walking/dark/symbols/subway-fukuoka-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-fukuoka-m.svg rename to data/styles/walking/dark/symbols/subway-fukuoka-m.svg diff --git a/data/styles/default/dark/symbols/subway-fukuoka-s.svg b/data/styles/walking/dark/symbols/subway-fukuoka-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-fukuoka-s.svg rename to data/styles/walking/dark/symbols/subway-fukuoka-s.svg diff --git a/data/styles/default/dark/symbols/subway-glasgow-m.svg b/data/styles/walking/dark/symbols/subway-glasgow-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-glasgow-m.svg rename to data/styles/walking/dark/symbols/subway-glasgow-m.svg diff --git a/data/styles/default/dark/symbols/subway-glasgow-s.svg b/data/styles/walking/dark/symbols/subway-glasgow-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-glasgow-s.svg rename to data/styles/walking/dark/symbols/subway-glasgow-s.svg diff --git a/data/styles/default/dark/symbols/subway-guadalajara-m.svg b/data/styles/walking/dark/symbols/subway-guadalajara-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-guadalajara-m.svg rename to data/styles/walking/dark/symbols/subway-guadalajara-m.svg diff --git a/data/styles/default/dark/symbols/subway-guadalajara-s.svg b/data/styles/walking/dark/symbols/subway-guadalajara-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-guadalajara-s.svg rename to data/styles/walking/dark/symbols/subway-guadalajara-s.svg diff --git a/data/styles/default/dark/symbols/subway-guangzhou-m.svg b/data/styles/walking/dark/symbols/subway-guangzhou-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-guangzhou-m.svg rename to data/styles/walking/dark/symbols/subway-guangzhou-m.svg diff --git a/data/styles/default/dark/symbols/subway-guangzhou-s.svg b/data/styles/walking/dark/symbols/subway-guangzhou-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-guangzhou-s.svg rename to data/styles/walking/dark/symbols/subway-guangzhou-s.svg diff --git a/data/styles/default/dark/symbols/subway-haagse-m.svg b/data/styles/walking/dark/symbols/subway-haagse-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-haagse-m.svg rename to data/styles/walking/dark/symbols/subway-haagse-m.svg diff --git a/data/styles/default/dark/symbols/subway-haagse-s.svg b/data/styles/walking/dark/symbols/subway-haagse-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-haagse-s.svg rename to data/styles/walking/dark/symbols/subway-haagse-s.svg diff --git a/data/styles/default/dark/symbols/subway-helsinki-m.svg b/data/styles/walking/dark/symbols/subway-helsinki-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-helsinki-m.svg rename to data/styles/walking/dark/symbols/subway-helsinki-m.svg diff --git a/data/styles/default/dark/symbols/subway-helsinki-s.svg b/data/styles/walking/dark/symbols/subway-helsinki-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-helsinki-s.svg rename to data/styles/walking/dark/symbols/subway-helsinki-s.svg diff --git a/data/styles/default/dark/symbols/subway-hirosima-m.svg b/data/styles/walking/dark/symbols/subway-hirosima-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-hirosima-m.svg rename to data/styles/walking/dark/symbols/subway-hirosima-m.svg diff --git a/data/styles/default/dark/symbols/subway-hirosima-s.svg b/data/styles/walking/dark/symbols/subway-hirosima-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-hirosima-s.svg rename to data/styles/walking/dark/symbols/subway-hirosima-s.svg diff --git a/data/styles/default/dark/symbols/subway-hongkong-m.svg b/data/styles/walking/dark/symbols/subway-hongkong-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-hongkong-m.svg rename to data/styles/walking/dark/symbols/subway-hongkong-m.svg diff --git a/data/styles/default/dark/symbols/subway-hongkong-s.svg b/data/styles/walking/dark/symbols/subway-hongkong-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-hongkong-s.svg rename to data/styles/walking/dark/symbols/subway-hongkong-s.svg diff --git a/data/styles/default/dark/symbols/subway-isfahan-m.svg b/data/styles/walking/dark/symbols/subway-isfahan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-isfahan-m.svg rename to data/styles/walking/dark/symbols/subway-isfahan-m.svg diff --git a/data/styles/default/dark/symbols/subway-isfahan-s.svg b/data/styles/walking/dark/symbols/subway-isfahan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-isfahan-s.svg rename to data/styles/walking/dark/symbols/subway-isfahan-s.svg diff --git a/data/styles/default/dark/symbols/subway-istanbul-m.svg b/data/styles/walking/dark/symbols/subway-istanbul-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-istanbul-m.svg rename to data/styles/walking/dark/symbols/subway-istanbul-m.svg diff --git a/data/styles/default/dark/symbols/subway-istanbul-s.svg b/data/styles/walking/dark/symbols/subway-istanbul-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-istanbul-s.svg rename to data/styles/walking/dark/symbols/subway-istanbul-s.svg diff --git a/data/styles/default/dark/symbols/subway-izmir-m.svg b/data/styles/walking/dark/symbols/subway-izmir-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-izmir-m.svg rename to data/styles/walking/dark/symbols/subway-izmir-m.svg diff --git a/data/styles/default/dark/symbols/subway-izmir-s.svg b/data/styles/walking/dark/symbols/subway-izmir-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-izmir-s.svg rename to data/styles/walking/dark/symbols/subway-izmir-s.svg diff --git a/data/styles/default/dark/symbols/subway-kazan-m.svg b/data/styles/walking/dark/symbols/subway-kazan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kazan-m.svg rename to data/styles/walking/dark/symbols/subway-kazan-m.svg diff --git a/data/styles/default/dark/symbols/subway-kazan-s.svg b/data/styles/walking/dark/symbols/subway-kazan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kazan-s.svg rename to data/styles/walking/dark/symbols/subway-kazan-s.svg diff --git a/data/styles/default/dark/symbols/subway-kharkiv-m.svg b/data/styles/walking/dark/symbols/subway-kharkiv-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kharkiv-m.svg rename to data/styles/walking/dark/symbols/subway-kharkiv-m.svg diff --git a/data/styles/default/dark/symbols/subway-kharkiv-s.svg b/data/styles/walking/dark/symbols/subway-kharkiv-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kharkiv-s.svg rename to data/styles/walking/dark/symbols/subway-kharkiv-s.svg diff --git a/data/styles/default/dark/symbols/subway-kiev-m.svg b/data/styles/walking/dark/symbols/subway-kiev-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kiev-m.svg rename to data/styles/walking/dark/symbols/subway-kiev-m.svg diff --git a/data/styles/default/dark/symbols/subway-kiev-s.svg b/data/styles/walking/dark/symbols/subway-kiev-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kiev-s.svg rename to data/styles/walking/dark/symbols/subway-kiev-s.svg diff --git a/data/styles/default/dark/symbols/subway-kobe-m.svg b/data/styles/walking/dark/symbols/subway-kobe-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kobe-m.svg rename to data/styles/walking/dark/symbols/subway-kobe-m.svg diff --git a/data/styles/default/dark/symbols/subway-kobe-s.svg b/data/styles/walking/dark/symbols/subway-kobe-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kobe-s.svg rename to data/styles/walking/dark/symbols/subway-kobe-s.svg diff --git a/data/styles/default/dark/symbols/subway-kolkata-m.svg b/data/styles/walking/dark/symbols/subway-kolkata-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kolkata-m.svg rename to data/styles/walking/dark/symbols/subway-kolkata-m.svg diff --git a/data/styles/default/dark/symbols/subway-kolkata-s.svg b/data/styles/walking/dark/symbols/subway-kolkata-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kolkata-s.svg rename to data/styles/walking/dark/symbols/subway-kolkata-s.svg diff --git a/data/styles/default/dark/symbols/subway-kryvyirih-m.svg b/data/styles/walking/dark/symbols/subway-kryvyirih-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kryvyirih-m.svg rename to data/styles/walking/dark/symbols/subway-kryvyirih-m.svg diff --git a/data/styles/default/dark/symbols/subway-kryvyirih-s.svg b/data/styles/walking/dark/symbols/subway-kryvyirih-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kryvyirih-s.svg rename to data/styles/walking/dark/symbols/subway-kryvyirih-s.svg diff --git a/data/styles/default/dark/symbols/subway-kunming-m.svg b/data/styles/walking/dark/symbols/subway-kunming-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kunming-m.svg rename to data/styles/walking/dark/symbols/subway-kunming-m.svg diff --git a/data/styles/default/dark/symbols/subway-kunming-s.svg b/data/styles/walking/dark/symbols/subway-kunming-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kunming-s.svg rename to data/styles/walking/dark/symbols/subway-kunming-s.svg diff --git a/data/styles/default/dark/symbols/subway-kyoto-m.svg b/data/styles/walking/dark/symbols/subway-kyoto-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kyoto-m.svg rename to data/styles/walking/dark/symbols/subway-kyoto-m.svg diff --git a/data/styles/default/dark/symbols/subway-kyoto-s.svg b/data/styles/walking/dark/symbols/subway-kyoto-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-kyoto-s.svg rename to data/styles/walking/dark/symbols/subway-kyoto-s.svg diff --git a/data/styles/default/dark/symbols/subway-lausanne-m.svg b/data/styles/walking/dark/symbols/subway-lausanne-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lausanne-m.svg rename to data/styles/walking/dark/symbols/subway-lausanne-m.svg diff --git a/data/styles/default/dark/symbols/subway-lausanne-s.svg b/data/styles/walking/dark/symbols/subway-lausanne-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lausanne-s.svg rename to data/styles/walking/dark/symbols/subway-lausanne-s.svg diff --git a/data/styles/default/dark/symbols/subway-lille-m.svg b/data/styles/walking/dark/symbols/subway-lille-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lille-m.svg rename to data/styles/walking/dark/symbols/subway-lille-m.svg diff --git a/data/styles/default/dark/symbols/subway-lille-s.svg b/data/styles/walking/dark/symbols/subway-lille-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lille-s.svg rename to data/styles/walking/dark/symbols/subway-lille-s.svg diff --git a/data/styles/default/dark/symbols/subway-lima-m.svg b/data/styles/walking/dark/symbols/subway-lima-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lima-m.svg rename to data/styles/walking/dark/symbols/subway-lima-m.svg diff --git a/data/styles/default/dark/symbols/subway-lima-s.svg b/data/styles/walking/dark/symbols/subway-lima-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lima-s.svg rename to data/styles/walking/dark/symbols/subway-lima-s.svg diff --git a/data/styles/default/dark/symbols/subway-lisboa-m.svg b/data/styles/walking/dark/symbols/subway-lisboa-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lisboa-m.svg rename to data/styles/walking/dark/symbols/subway-lisboa-m.svg diff --git a/data/styles/default/dark/symbols/subway-lisboa-s.svg b/data/styles/walking/dark/symbols/subway-lisboa-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lisboa-s.svg rename to data/styles/walking/dark/symbols/subway-lisboa-s.svg diff --git a/data/styles/default/dark/symbols/subway-london-m.svg b/data/styles/walking/dark/symbols/subway-london-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-london-m.svg rename to data/styles/walking/dark/symbols/subway-london-m.svg diff --git a/data/styles/default/dark/symbols/subway-london-s.svg b/data/styles/walking/dark/symbols/subway-london-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-london-s.svg rename to data/styles/walking/dark/symbols/subway-london-s.svg diff --git a/data/styles/default/dark/symbols/subway-losangeles-m.svg b/data/styles/walking/dark/symbols/subway-losangeles-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-losangeles-m.svg rename to data/styles/walking/dark/symbols/subway-losangeles-m.svg diff --git a/data/styles/default/dark/symbols/subway-losangeles-s.svg b/data/styles/walking/dark/symbols/subway-losangeles-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-losangeles-s.svg rename to data/styles/walking/dark/symbols/subway-losangeles-s.svg diff --git a/data/styles/default/dark/symbols/subway-lucknow-m.svg b/data/styles/walking/dark/symbols/subway-lucknow-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lucknow-m.svg rename to data/styles/walking/dark/symbols/subway-lucknow-m.svg diff --git a/data/styles/default/dark/symbols/subway-lucknow-s.svg b/data/styles/walking/dark/symbols/subway-lucknow-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lucknow-s.svg rename to data/styles/walking/dark/symbols/subway-lucknow-s.svg diff --git a/data/styles/default/dark/symbols/subway-lyon-m.svg b/data/styles/walking/dark/symbols/subway-lyon-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lyon-m.svg rename to data/styles/walking/dark/symbols/subway-lyon-m.svg diff --git a/data/styles/default/dark/symbols/subway-lyon-s.svg b/data/styles/walking/dark/symbols/subway-lyon-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-lyon-s.svg rename to data/styles/walking/dark/symbols/subway-lyon-s.svg diff --git a/data/styles/default/dark/symbols/subway-m.svg b/data/styles/walking/dark/symbols/subway-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-m.svg rename to data/styles/walking/dark/symbols/subway-m.svg diff --git a/data/styles/default/dark/symbols/subway-madrid-m.svg b/data/styles/walking/dark/symbols/subway-madrid-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-madrid-m.svg rename to data/styles/walking/dark/symbols/subway-madrid-m.svg diff --git a/data/styles/default/dark/symbols/subway-madrid-s.svg b/data/styles/walking/dark/symbols/subway-madrid-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-madrid-s.svg rename to data/styles/walking/dark/symbols/subway-madrid-s.svg diff --git a/data/styles/default/dark/symbols/subway-malaga-m.svg b/data/styles/walking/dark/symbols/subway-malaga-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-malaga-m.svg rename to data/styles/walking/dark/symbols/subway-malaga-m.svg diff --git a/data/styles/default/dark/symbols/subway-malaga-s.svg b/data/styles/walking/dark/symbols/subway-malaga-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-malaga-s.svg rename to data/styles/walking/dark/symbols/subway-malaga-s.svg diff --git a/data/styles/default/dark/symbols/subway-manila-m.svg b/data/styles/walking/dark/symbols/subway-manila-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-manila-m.svg rename to data/styles/walking/dark/symbols/subway-manila-m.svg diff --git a/data/styles/default/dark/symbols/subway-manila-s.svg b/data/styles/walking/dark/symbols/subway-manila-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-manila-s.svg rename to data/styles/walking/dark/symbols/subway-manila-s.svg diff --git a/data/styles/default/dark/symbols/subway-maracaibo-m.svg b/data/styles/walking/dark/symbols/subway-maracaibo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-maracaibo-m.svg rename to data/styles/walking/dark/symbols/subway-maracaibo-m.svg diff --git a/data/styles/default/dark/symbols/subway-maracaibo-s.svg b/data/styles/walking/dark/symbols/subway-maracaibo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-maracaibo-s.svg rename to data/styles/walking/dark/symbols/subway-maracaibo-s.svg diff --git a/data/styles/default/dark/symbols/subway-marseille-m.svg b/data/styles/walking/dark/symbols/subway-marseille-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-marseille-m.svg rename to data/styles/walking/dark/symbols/subway-marseille-m.svg diff --git a/data/styles/default/dark/symbols/subway-marseille-s.svg b/data/styles/walking/dark/symbols/subway-marseille-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-marseille-s.svg rename to data/styles/walking/dark/symbols/subway-marseille-s.svg diff --git a/data/styles/default/dark/symbols/subway-mashhad-m.svg b/data/styles/walking/dark/symbols/subway-mashhad-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mashhad-m.svg rename to data/styles/walking/dark/symbols/subway-mashhad-m.svg diff --git a/data/styles/default/dark/symbols/subway-mashhad-s.svg b/data/styles/walking/dark/symbols/subway-mashhad-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mashhad-s.svg rename to data/styles/walking/dark/symbols/subway-mashhad-s.svg diff --git a/data/styles/default/dark/symbols/subway-massachusetts-m.svg b/data/styles/walking/dark/symbols/subway-massachusetts-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-massachusetts-m.svg rename to data/styles/walking/dark/symbols/subway-massachusetts-m.svg diff --git a/data/styles/default/dark/symbols/subway-massachusetts-s.svg b/data/styles/walking/dark/symbols/subway-massachusetts-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-massachusetts-s.svg rename to data/styles/walking/dark/symbols/subway-massachusetts-s.svg diff --git a/data/styles/default/dark/symbols/subway-mecca-m.svg b/data/styles/walking/dark/symbols/subway-mecca-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mecca-m.svg rename to data/styles/walking/dark/symbols/subway-mecca-m.svg diff --git a/data/styles/default/dark/symbols/subway-mecca-s.svg b/data/styles/walking/dark/symbols/subway-mecca-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mecca-s.svg rename to data/styles/walking/dark/symbols/subway-mecca-s.svg diff --git a/data/styles/default/dark/symbols/subway-medellin-m.svg b/data/styles/walking/dark/symbols/subway-medellin-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-medellin-m.svg rename to data/styles/walking/dark/symbols/subway-medellin-m.svg diff --git a/data/styles/default/dark/symbols/subway-medellin-s.svg b/data/styles/walking/dark/symbols/subway-medellin-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-medellin-s.svg rename to data/styles/walking/dark/symbols/subway-medellin-s.svg diff --git a/data/styles/default/dark/symbols/subway-mexico-m.svg b/data/styles/walking/dark/symbols/subway-mexico-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mexico-m.svg rename to data/styles/walking/dark/symbols/subway-mexico-m.svg diff --git a/data/styles/default/dark/symbols/subway-mexico-s.svg b/data/styles/walking/dark/symbols/subway-mexico-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-mexico-s.svg rename to data/styles/walking/dark/symbols/subway-mexico-s.svg diff --git a/data/styles/default/dark/symbols/subway-milan-m.svg b/data/styles/walking/dark/symbols/subway-milan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-milan-m.svg rename to data/styles/walking/dark/symbols/subway-milan-m.svg diff --git a/data/styles/default/dark/symbols/subway-milan-s.svg b/data/styles/walking/dark/symbols/subway-milan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-milan-s.svg rename to data/styles/walking/dark/symbols/subway-milan-s.svg diff --git a/data/styles/default/dark/symbols/subway-minatomirai-m.svg b/data/styles/walking/dark/symbols/subway-minatomirai-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-minatomirai-m.svg rename to data/styles/walking/dark/symbols/subway-minatomirai-m.svg diff --git a/data/styles/default/dark/symbols/subway-minatomirai-s.svg b/data/styles/walking/dark/symbols/subway-minatomirai-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-minatomirai-s.svg rename to data/styles/walking/dark/symbols/subway-minatomirai-s.svg diff --git a/data/styles/default/dark/symbols/subway-minsk-m.svg b/data/styles/walking/dark/symbols/subway-minsk-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-minsk-m.svg rename to data/styles/walking/dark/symbols/subway-minsk-m.svg diff --git a/data/styles/default/dark/symbols/subway-minsk-s.svg b/data/styles/walking/dark/symbols/subway-minsk-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-minsk-s.svg rename to data/styles/walking/dark/symbols/subway-minsk-s.svg diff --git a/data/styles/default/dark/symbols/subway-montreal-m.svg b/data/styles/walking/dark/symbols/subway-montreal-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-montreal-m.svg rename to data/styles/walking/dark/symbols/subway-montreal-m.svg diff --git a/data/styles/default/dark/symbols/subway-montreal-s.svg b/data/styles/walking/dark/symbols/subway-montreal-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-montreal-s.svg rename to data/styles/walking/dark/symbols/subway-montreal-s.svg diff --git a/data/styles/default/dark/symbols/subway-moscow-m.svg b/data/styles/walking/dark/symbols/subway-moscow-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-moscow-m.svg rename to data/styles/walking/dark/symbols/subway-moscow-m.svg diff --git a/data/styles/default/dark/symbols/subway-moscow-s.svg b/data/styles/walking/dark/symbols/subway-moscow-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-moscow-s.svg rename to data/styles/walking/dark/symbols/subway-moscow-s.svg diff --git a/data/styles/default/dark/symbols/subway-nagoya-m.svg b/data/styles/walking/dark/symbols/subway-nagoya-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-nagoya-m.svg rename to data/styles/walking/dark/symbols/subway-nagoya-m.svg diff --git a/data/styles/default/dark/symbols/subway-nagoya-s.svg b/data/styles/walking/dark/symbols/subway-nagoya-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-nagoya-s.svg rename to data/styles/walking/dark/symbols/subway-nagoya-s.svg diff --git a/data/styles/default/dark/symbols/subway-newyork-m.svg b/data/styles/walking/dark/symbols/subway-newyork-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-newyork-m.svg rename to data/styles/walking/dark/symbols/subway-newyork-m.svg diff --git a/data/styles/default/dark/symbols/subway-newyork-s.svg b/data/styles/walking/dark/symbols/subway-newyork-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-newyork-s.svg rename to data/styles/walking/dark/symbols/subway-newyork-s.svg diff --git a/data/styles/default/dark/symbols/subway-newyork-xs.svg b/data/styles/walking/dark/symbols/subway-newyork-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-newyork-xs.svg rename to data/styles/walking/dark/symbols/subway-newyork-xs.svg diff --git a/data/styles/default/dark/symbols/subway-nnov-m.svg b/data/styles/walking/dark/symbols/subway-nnov-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-nnov-m.svg rename to data/styles/walking/dark/symbols/subway-nnov-m.svg diff --git a/data/styles/default/dark/symbols/subway-nnov-s.svg b/data/styles/walking/dark/symbols/subway-nnov-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-nnov-s.svg rename to data/styles/walking/dark/symbols/subway-nnov-s.svg diff --git a/data/styles/default/dark/symbols/subway-novosibirsk-m.svg b/data/styles/walking/dark/symbols/subway-novosibirsk-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-novosibirsk-m.svg rename to data/styles/walking/dark/symbols/subway-novosibirsk-m.svg diff --git a/data/styles/default/dark/symbols/subway-novosibirsk-s.svg b/data/styles/walking/dark/symbols/subway-novosibirsk-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-novosibirsk-s.svg rename to data/styles/walking/dark/symbols/subway-novosibirsk-s.svg diff --git a/data/styles/default/dark/symbols/subway-omsk-m.svg b/data/styles/walking/dark/symbols/subway-omsk-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-omsk-m.svg rename to data/styles/walking/dark/symbols/subway-omsk-m.svg diff --git a/data/styles/default/dark/symbols/subway-omsk-s.svg b/data/styles/walking/dark/symbols/subway-omsk-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-omsk-s.svg rename to data/styles/walking/dark/symbols/subway-omsk-s.svg diff --git a/data/styles/default/dark/symbols/subway-osaka-m.svg b/data/styles/walking/dark/symbols/subway-osaka-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-osaka-m.svg rename to data/styles/walking/dark/symbols/subway-osaka-m.svg diff --git a/data/styles/default/dark/symbols/subway-osaka-s.svg b/data/styles/walking/dark/symbols/subway-osaka-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-osaka-s.svg rename to data/styles/walking/dark/symbols/subway-osaka-s.svg diff --git a/data/styles/default/dark/symbols/subway-oslo-m.svg b/data/styles/walking/dark/symbols/subway-oslo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-oslo-m.svg rename to data/styles/walking/dark/symbols/subway-oslo-m.svg diff --git a/data/styles/default/dark/symbols/subway-oslo-s.svg b/data/styles/walking/dark/symbols/subway-oslo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-oslo-s.svg rename to data/styles/walking/dark/symbols/subway-oslo-s.svg diff --git a/data/styles/default/dark/symbols/subway-palma-m.svg b/data/styles/walking/dark/symbols/subway-palma-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-palma-m.svg rename to data/styles/walking/dark/symbols/subway-palma-m.svg diff --git a/data/styles/default/dark/symbols/subway-palma-s.svg b/data/styles/walking/dark/symbols/subway-palma-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-palma-s.svg rename to data/styles/walking/dark/symbols/subway-palma-s.svg diff --git a/data/styles/default/dark/symbols/subway-panama-m.svg b/data/styles/walking/dark/symbols/subway-panama-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-panama-m.svg rename to data/styles/walking/dark/symbols/subway-panama-m.svg diff --git a/data/styles/default/dark/symbols/subway-panama-s.svg b/data/styles/walking/dark/symbols/subway-panama-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-panama-s.svg rename to data/styles/walking/dark/symbols/subway-panama-s.svg diff --git a/data/styles/default/dark/symbols/subway-paris-m.svg b/data/styles/walking/dark/symbols/subway-paris-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-paris-m.svg rename to data/styles/walking/dark/symbols/subway-paris-m.svg diff --git a/data/styles/default/dark/symbols/subway-paris-s.svg b/data/styles/walking/dark/symbols/subway-paris-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-paris-s.svg rename to data/styles/walking/dark/symbols/subway-paris-s.svg diff --git a/data/styles/default/dark/symbols/subway-perugia-m.svg b/data/styles/walking/dark/symbols/subway-perugia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-perugia-m.svg rename to data/styles/walking/dark/symbols/subway-perugia-m.svg diff --git a/data/styles/default/dark/symbols/subway-perugia-s.svg b/data/styles/walking/dark/symbols/subway-perugia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-perugia-s.svg rename to data/styles/walking/dark/symbols/subway-perugia-s.svg diff --git a/data/styles/default/dark/symbols/subway-philadelphia-m.svg b/data/styles/walking/dark/symbols/subway-philadelphia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-philadelphia-m.svg rename to data/styles/walking/dark/symbols/subway-philadelphia-m.svg diff --git a/data/styles/default/dark/symbols/subway-philadelphia-s.svg b/data/styles/walking/dark/symbols/subway-philadelphia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-philadelphia-s.svg rename to data/styles/walking/dark/symbols/subway-philadelphia-s.svg diff --git a/data/styles/default/dark/symbols/subway-pittsburgh-m.svg b/data/styles/walking/dark/symbols/subway-pittsburgh-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-pittsburgh-m.svg rename to data/styles/walking/dark/symbols/subway-pittsburgh-m.svg diff --git a/data/styles/default/dark/symbols/subway-pittsburgh-s.svg b/data/styles/walking/dark/symbols/subway-pittsburgh-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-pittsburgh-s.svg rename to data/styles/walking/dark/symbols/subway-pittsburgh-s.svg diff --git a/data/styles/default/dark/symbols/subway-pyongyang-m.svg b/data/styles/walking/dark/symbols/subway-pyongyang-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-pyongyang-m.svg rename to data/styles/walking/dark/symbols/subway-pyongyang-m.svg diff --git a/data/styles/default/dark/symbols/subway-pyongyang-s.svg b/data/styles/walking/dark/symbols/subway-pyongyang-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-pyongyang-s.svg rename to data/styles/walking/dark/symbols/subway-pyongyang-s.svg diff --git a/data/styles/default/dark/symbols/subway-qingdao-m.svg b/data/styles/walking/dark/symbols/subway-qingdao-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-qingdao-m.svg rename to data/styles/walking/dark/symbols/subway-qingdao-m.svg diff --git a/data/styles/default/dark/symbols/subway-qingdao-s.svg b/data/styles/walking/dark/symbols/subway-qingdao-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-qingdao-s.svg rename to data/styles/walking/dark/symbols/subway-qingdao-s.svg diff --git a/data/styles/default/dark/symbols/subway-rennes-m.svg b/data/styles/walking/dark/symbols/subway-rennes-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rennes-m.svg rename to data/styles/walking/dark/symbols/subway-rennes-m.svg diff --git a/data/styles/default/dark/symbols/subway-rennes-s.svg b/data/styles/walking/dark/symbols/subway-rennes-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rennes-s.svg rename to data/styles/walking/dark/symbols/subway-rennes-s.svg diff --git a/data/styles/default/dark/symbols/subway-reseau-paris-m.svg b/data/styles/walking/dark/symbols/subway-reseau-paris-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-reseau-paris-m.svg rename to data/styles/walking/dark/symbols/subway-reseau-paris-m.svg diff --git a/data/styles/default/dark/symbols/subway-reseau-paris-s.svg b/data/styles/walking/dark/symbols/subway-reseau-paris-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-reseau-paris-s.svg rename to data/styles/walking/dark/symbols/subway-reseau-paris-s.svg diff --git a/data/styles/default/dark/symbols/subway-riodejaneiro-m.svg b/data/styles/walking/dark/symbols/subway-riodejaneiro-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-riodejaneiro-m.svg rename to data/styles/walking/dark/symbols/subway-riodejaneiro-m.svg diff --git a/data/styles/default/dark/symbols/subway-riodejaneiro-s.svg b/data/styles/walking/dark/symbols/subway-riodejaneiro-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-riodejaneiro-s.svg rename to data/styles/walking/dark/symbols/subway-riodejaneiro-s.svg diff --git a/data/styles/default/dark/symbols/subway-rome-m.svg b/data/styles/walking/dark/symbols/subway-rome-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rome-m.svg rename to data/styles/walking/dark/symbols/subway-rome-m.svg diff --git a/data/styles/default/dark/symbols/subway-rome-s.svg b/data/styles/walking/dark/symbols/subway-rome-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rome-s.svg rename to data/styles/walking/dark/symbols/subway-rome-s.svg diff --git a/data/styles/default/dark/symbols/subway-rotterdam-m.svg b/data/styles/walking/dark/symbols/subway-rotterdam-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rotterdam-m.svg rename to data/styles/walking/dark/symbols/subway-rotterdam-m.svg diff --git a/data/styles/default/dark/symbols/subway-rotterdam-s.svg b/data/styles/walking/dark/symbols/subway-rotterdam-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-rotterdam-s.svg rename to data/styles/walking/dark/symbols/subway-rotterdam-s.svg diff --git a/data/styles/default/dark/symbols/subway-s.svg b/data/styles/walking/dark/symbols/subway-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-s.svg rename to data/styles/walking/dark/symbols/subway-s.svg diff --git a/data/styles/default/dark/symbols/subway-samara-m.svg b/data/styles/walking/dark/symbols/subway-samara-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-samara-m.svg rename to data/styles/walking/dark/symbols/subway-samara-m.svg diff --git a/data/styles/default/dark/symbols/subway-samara-s.svg b/data/styles/walking/dark/symbols/subway-samara-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-samara-s.svg rename to data/styles/walking/dark/symbols/subway-samara-s.svg diff --git a/data/styles/default/dark/symbols/subway-sanfrancisco-m.svg b/data/styles/walking/dark/symbols/subway-sanfrancisco-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sanfrancisco-m.svg rename to data/styles/walking/dark/symbols/subway-sanfrancisco-m.svg diff --git a/data/styles/default/dark/symbols/subway-sanfrancisco-s.svg b/data/styles/walking/dark/symbols/subway-sanfrancisco-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sanfrancisco-s.svg rename to data/styles/walking/dark/symbols/subway-sanfrancisco-s.svg diff --git a/data/styles/default/dark/symbols/subway-santiago-m.svg b/data/styles/walking/dark/symbols/subway-santiago-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-santiago-m.svg rename to data/styles/walking/dark/symbols/subway-santiago-m.svg diff --git a/data/styles/default/dark/symbols/subway-santiago-s.svg b/data/styles/walking/dark/symbols/subway-santiago-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-santiago-s.svg rename to data/styles/walking/dark/symbols/subway-santiago-s.svg diff --git a/data/styles/default/dark/symbols/subway-santodomingo-m.svg b/data/styles/walking/dark/symbols/subway-santodomingo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-santodomingo-m.svg rename to data/styles/walking/dark/symbols/subway-santodomingo-m.svg diff --git a/data/styles/default/dark/symbols/subway-santodomingo-s.svg b/data/styles/walking/dark/symbols/subway-santodomingo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-santodomingo-s.svg rename to data/styles/walking/dark/symbols/subway-santodomingo-s.svg diff --git a/data/styles/default/dark/symbols/subway-saopaulo-m.svg b/data/styles/walking/dark/symbols/subway-saopaulo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-saopaulo-m.svg rename to data/styles/walking/dark/symbols/subway-saopaulo-m.svg diff --git a/data/styles/default/dark/symbols/subway-saopaulo-s.svg b/data/styles/walking/dark/symbols/subway-saopaulo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-saopaulo-s.svg rename to data/styles/walking/dark/symbols/subway-saopaulo-s.svg diff --git a/data/styles/default/dark/symbols/subway-sapporo-m.svg b/data/styles/walking/dark/symbols/subway-sapporo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sapporo-m.svg rename to data/styles/walking/dark/symbols/subway-sapporo-m.svg diff --git a/data/styles/default/dark/symbols/subway-sapporo-s.svg b/data/styles/walking/dark/symbols/subway-sapporo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sapporo-s.svg rename to data/styles/walking/dark/symbols/subway-sapporo-s.svg diff --git a/data/styles/default/dark/symbols/subway-seattle-m.svg b/data/styles/walking/dark/symbols/subway-seattle-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-seattle-m.svg rename to data/styles/walking/dark/symbols/subway-seattle-m.svg diff --git a/data/styles/default/dark/symbols/subway-seattle-s.svg b/data/styles/walking/dark/symbols/subway-seattle-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-seattle-s.svg rename to data/styles/walking/dark/symbols/subway-seattle-s.svg diff --git a/data/styles/default/dark/symbols/subway-sendai-m.svg b/data/styles/walking/dark/symbols/subway-sendai-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sendai-m.svg rename to data/styles/walking/dark/symbols/subway-sendai-m.svg diff --git a/data/styles/default/dark/symbols/subway-sendai-s.svg b/data/styles/walking/dark/symbols/subway-sendai-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sendai-s.svg rename to data/styles/walking/dark/symbols/subway-sendai-s.svg diff --git a/data/styles/default/dark/symbols/subway-shanghai-m.svg b/data/styles/walking/dark/symbols/subway-shanghai-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shanghai-m.svg rename to data/styles/walking/dark/symbols/subway-shanghai-m.svg diff --git a/data/styles/default/dark/symbols/subway-shanghai-s.svg b/data/styles/walking/dark/symbols/subway-shanghai-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shanghai-s.svg rename to data/styles/walking/dark/symbols/subway-shanghai-s.svg diff --git a/data/styles/default/dark/symbols/subway-shenzhen-m.svg b/data/styles/walking/dark/symbols/subway-shenzhen-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shenzhen-m.svg rename to data/styles/walking/dark/symbols/subway-shenzhen-m.svg diff --git a/data/styles/default/dark/symbols/subway-shenzhen-s.svg b/data/styles/walking/dark/symbols/subway-shenzhen-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shenzhen-s.svg rename to data/styles/walking/dark/symbols/subway-shenzhen-s.svg diff --git a/data/styles/default/dark/symbols/subway-shiraz-m.svg b/data/styles/walking/dark/symbols/subway-shiraz-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shiraz-m.svg rename to data/styles/walking/dark/symbols/subway-shiraz-m.svg diff --git a/data/styles/default/dark/symbols/subway-shiraz-s.svg b/data/styles/walking/dark/symbols/subway-shiraz-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-shiraz-s.svg rename to data/styles/walking/dark/symbols/subway-shiraz-s.svg diff --git a/data/styles/default/dark/symbols/subway-singapore-m.svg b/data/styles/walking/dark/symbols/subway-singapore-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-singapore-m.svg rename to data/styles/walking/dark/symbols/subway-singapore-m.svg diff --git a/data/styles/default/dark/symbols/subway-singapore-s.svg b/data/styles/walking/dark/symbols/subway-singapore-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-singapore-s.svg rename to data/styles/walking/dark/symbols/subway-singapore-s.svg diff --git a/data/styles/default/dark/symbols/subway-sofia-m.svg b/data/styles/walking/dark/symbols/subway-sofia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sofia-m.svg rename to data/styles/walking/dark/symbols/subway-sofia-m.svg diff --git a/data/styles/default/dark/symbols/subway-sofia-s.svg b/data/styles/walking/dark/symbols/subway-sofia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-sofia-s.svg rename to data/styles/walking/dark/symbols/subway-sofia-s.svg diff --git a/data/styles/default/dark/symbols/subway-southkorea-m.svg b/data/styles/walking/dark/symbols/subway-southkorea-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-southkorea-m.svg rename to data/styles/walking/dark/symbols/subway-southkorea-m.svg diff --git a/data/styles/default/dark/symbols/subway-southkorea-s.svg b/data/styles/walking/dark/symbols/subway-southkorea-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-southkorea-s.svg rename to data/styles/walking/dark/symbols/subway-southkorea-s.svg diff --git a/data/styles/default/dark/symbols/subway-spb-m.svg b/data/styles/walking/dark/symbols/subway-spb-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-spb-m.svg rename to data/styles/walking/dark/symbols/subway-spb-m.svg diff --git a/data/styles/default/dark/symbols/subway-spb-s.svg b/data/styles/walking/dark/symbols/subway-spb-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-spb-s.svg rename to data/styles/walking/dark/symbols/subway-spb-s.svg diff --git a/data/styles/default/dark/symbols/subway-stlouis-m.svg b/data/styles/walking/dark/symbols/subway-stlouis-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-stlouis-m.svg rename to data/styles/walking/dark/symbols/subway-stlouis-m.svg diff --git a/data/styles/default/dark/symbols/subway-stlouis-s.svg b/data/styles/walking/dark/symbols/subway-stlouis-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-stlouis-s.svg rename to data/styles/walking/dark/symbols/subway-stlouis-s.svg diff --git a/data/styles/default/dark/symbols/subway-stockholm-m.svg b/data/styles/walking/dark/symbols/subway-stockholm-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-stockholm-m.svg rename to data/styles/walking/dark/symbols/subway-stockholm-m.svg diff --git a/data/styles/default/dark/symbols/subway-stockholm-s.svg b/data/styles/walking/dark/symbols/subway-stockholm-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-stockholm-s.svg rename to data/styles/walking/dark/symbols/subway-stockholm-s.svg diff --git a/data/styles/default/dark/symbols/subway-tabriz-m.svg b/data/styles/walking/dark/symbols/subway-tabriz-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tabriz-m.svg rename to data/styles/walking/dark/symbols/subway-tabriz-m.svg diff --git a/data/styles/default/dark/symbols/subway-tabriz-s.svg b/data/styles/walking/dark/symbols/subway-tabriz-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tabriz-s.svg rename to data/styles/walking/dark/symbols/subway-tabriz-s.svg diff --git a/data/styles/default/dark/symbols/subway-taipei-m.svg b/data/styles/walking/dark/symbols/subway-taipei-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-taipei-m.svg rename to data/styles/walking/dark/symbols/subway-taipei-m.svg diff --git a/data/styles/default/dark/symbols/subway-taipei-s.svg b/data/styles/walking/dark/symbols/subway-taipei-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-taipei-s.svg rename to data/styles/walking/dark/symbols/subway-taipei-s.svg diff --git a/data/styles/default/dark/symbols/subway-taoyuan-m.svg b/data/styles/walking/dark/symbols/subway-taoyuan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-taoyuan-m.svg rename to data/styles/walking/dark/symbols/subway-taoyuan-m.svg diff --git a/data/styles/default/dark/symbols/subway-taoyuan-s.svg b/data/styles/walking/dark/symbols/subway-taoyuan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-taoyuan-s.svg rename to data/styles/walking/dark/symbols/subway-taoyuan-s.svg diff --git a/data/styles/default/dark/symbols/subway-tashkent-m.svg b/data/styles/walking/dark/symbols/subway-tashkent-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tashkent-m.svg rename to data/styles/walking/dark/symbols/subway-tashkent-m.svg diff --git a/data/styles/default/dark/symbols/subway-tashkent-s.svg b/data/styles/walking/dark/symbols/subway-tashkent-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tashkent-s.svg rename to data/styles/walking/dark/symbols/subway-tashkent-s.svg diff --git a/data/styles/default/dark/symbols/subway-tbilisi-m.svg b/data/styles/walking/dark/symbols/subway-tbilisi-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tbilisi-m.svg rename to data/styles/walking/dark/symbols/subway-tbilisi-m.svg diff --git a/data/styles/default/dark/symbols/subway-tbilisi-s.svg b/data/styles/walking/dark/symbols/subway-tbilisi-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tbilisi-s.svg rename to data/styles/walking/dark/symbols/subway-tbilisi-s.svg diff --git a/data/styles/default/dark/symbols/subway-tehran-m.svg b/data/styles/walking/dark/symbols/subway-tehran-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tehran-m.svg rename to data/styles/walking/dark/symbols/subway-tehran-m.svg diff --git a/data/styles/default/dark/symbols/subway-tehran-s.svg b/data/styles/walking/dark/symbols/subway-tehran-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tehran-s.svg rename to data/styles/walking/dark/symbols/subway-tehran-s.svg diff --git a/data/styles/default/dark/symbols/subway-tianjin-m.svg b/data/styles/walking/dark/symbols/subway-tianjin-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tianjin-m.svg rename to data/styles/walking/dark/symbols/subway-tianjin-m.svg diff --git a/data/styles/default/dark/symbols/subway-tianjin-s.svg b/data/styles/walking/dark/symbols/subway-tianjin-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tianjin-s.svg rename to data/styles/walking/dark/symbols/subway-tianjin-s.svg diff --git a/data/styles/default/dark/symbols/subway-tokyo-m.svg b/data/styles/walking/dark/symbols/subway-tokyo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tokyo-m.svg rename to data/styles/walking/dark/symbols/subway-tokyo-m.svg diff --git a/data/styles/default/dark/symbols/subway-tokyo-s.svg b/data/styles/walking/dark/symbols/subway-tokyo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tokyo-s.svg rename to data/styles/walking/dark/symbols/subway-tokyo-s.svg diff --git a/data/styles/default/dark/symbols/subway-tyneandwear-m.svg b/data/styles/walking/dark/symbols/subway-tyneandwear-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tyneandwear-m.svg rename to data/styles/walking/dark/symbols/subway-tyneandwear-m.svg diff --git a/data/styles/default/dark/symbols/subway-tyneandwear-s.svg b/data/styles/walking/dark/symbols/subway-tyneandwear-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-tyneandwear-s.svg rename to data/styles/walking/dark/symbols/subway-tyneandwear-s.svg diff --git a/data/styles/default/dark/symbols/subway-ubahn-m.svg b/data/styles/walking/dark/symbols/subway-ubahn-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ubahn-m.svg rename to data/styles/walking/dark/symbols/subway-ubahn-m.svg diff --git a/data/styles/default/dark/symbols/subway-ubahn-s.svg b/data/styles/walking/dark/symbols/subway-ubahn-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-ubahn-s.svg rename to data/styles/walking/dark/symbols/subway-ubahn-s.svg diff --git a/data/styles/default/dark/symbols/subway-valencia-m.svg b/data/styles/walking/dark/symbols/subway-valencia-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-valencia-m.svg rename to data/styles/walking/dark/symbols/subway-valencia-m.svg diff --git a/data/styles/default/dark/symbols/subway-valencia-s.svg b/data/styles/walking/dark/symbols/subway-valencia-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-valencia-s.svg rename to data/styles/walking/dark/symbols/subway-valencia-s.svg diff --git a/data/styles/default/dark/symbols/subway-vienna-m.svg b/data/styles/walking/dark/symbols/subway-vienna-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-vienna-m.svg rename to data/styles/walking/dark/symbols/subway-vienna-m.svg diff --git a/data/styles/default/dark/symbols/subway-vienna-s.svg b/data/styles/walking/dark/symbols/subway-vienna-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-vienna-s.svg rename to data/styles/walking/dark/symbols/subway-vienna-s.svg diff --git a/data/styles/default/dark/symbols/subway-volgograd-m.svg b/data/styles/walking/dark/symbols/subway-volgograd-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-volgograd-m.svg rename to data/styles/walking/dark/symbols/subway-volgograd-m.svg diff --git a/data/styles/default/dark/symbols/subway-volgograd-s.svg b/data/styles/walking/dark/symbols/subway-volgograd-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-volgograd-s.svg rename to data/styles/walking/dark/symbols/subway-volgograd-s.svg diff --git a/data/styles/default/dark/symbols/subway-warsaw-m.svg b/data/styles/walking/dark/symbols/subway-warsaw-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-warsaw-m.svg rename to data/styles/walking/dark/symbols/subway-warsaw-m.svg diff --git a/data/styles/default/dark/symbols/subway-warsaw-s.svg b/data/styles/walking/dark/symbols/subway-warsaw-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-warsaw-s.svg rename to data/styles/walking/dark/symbols/subway-warsaw-s.svg diff --git a/data/styles/default/dark/symbols/subway-warszawa-m.svg b/data/styles/walking/dark/symbols/subway-warszawa-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-warszawa-m.svg rename to data/styles/walking/dark/symbols/subway-warszawa-m.svg diff --git a/data/styles/default/dark/symbols/subway-warszawa-s.svg b/data/styles/walking/dark/symbols/subway-warszawa-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-warszawa-s.svg rename to data/styles/walking/dark/symbols/subway-warszawa-s.svg diff --git a/data/styles/default/dark/symbols/subway-washington-m.svg b/data/styles/walking/dark/symbols/subway-washington-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-washington-m.svg rename to data/styles/walking/dark/symbols/subway-washington-m.svg diff --git a/data/styles/default/dark/symbols/subway-washington-s.svg b/data/styles/walking/dark/symbols/subway-washington-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-washington-s.svg rename to data/styles/walking/dark/symbols/subway-washington-s.svg diff --git a/data/styles/default/dark/symbols/subway-wuhan-m.svg b/data/styles/walking/dark/symbols/subway-wuhan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-wuhan-m.svg rename to data/styles/walking/dark/symbols/subway-wuhan-m.svg diff --git a/data/styles/default/dark/symbols/subway-wuhan-s.svg b/data/styles/walking/dark/symbols/subway-wuhan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-wuhan-s.svg rename to data/styles/walking/dark/symbols/subway-wuhan-s.svg diff --git a/data/styles/default/dark/symbols/subway-xs.svg b/data/styles/walking/dark/symbols/subway-xs.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-xs.svg rename to data/styles/walking/dark/symbols/subway-xs.svg diff --git a/data/styles/default/dark/symbols/subway-yerevan-m.svg b/data/styles/walking/dark/symbols/subway-yerevan-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-yerevan-m.svg rename to data/styles/walking/dark/symbols/subway-yerevan-m.svg diff --git a/data/styles/default/dark/symbols/subway-yerevan-s.svg b/data/styles/walking/dark/symbols/subway-yerevan-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-yerevan-s.svg rename to data/styles/walking/dark/symbols/subway-yerevan-s.svg diff --git a/data/styles/default/dark/symbols/subway-yokohama-m.svg b/data/styles/walking/dark/symbols/subway-yokohama-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-yokohama-m.svg rename to data/styles/walking/dark/symbols/subway-yokohama-m.svg diff --git a/data/styles/default/dark/symbols/subway-yokohama-s.svg b/data/styles/walking/dark/symbols/subway-yokohama-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway-yokohama-s.svg rename to data/styles/walking/dark/symbols/subway-yokohama-s.svg diff --git a/data/styles/default/dark/symbols/subway_entrance-london-m.svg b/data/styles/walking/dark/symbols/subway_entrance-london-m.svg similarity index 100% rename from data/styles/default/dark/symbols/subway_entrance-london-m.svg rename to data/styles/walking/dark/symbols/subway_entrance-london-m.svg diff --git a/data/styles/default/dark/symbols/subway_entrance-london-s.svg b/data/styles/walking/dark/symbols/subway_entrance-london-s.svg similarity index 100% rename from data/styles/default/dark/symbols/subway_entrance-london-s.svg rename to data/styles/walking/dark/symbols/subway_entrance-london-s.svg diff --git a/data/styles/default/dark/symbols/supermarket-m.svg b/data/styles/walking/dark/symbols/supermarket-m.svg similarity index 100% rename from data/styles/default/dark/symbols/supermarket-m.svg rename to data/styles/walking/dark/symbols/supermarket-m.svg diff --git a/data/styles/default/dark/symbols/survey_point-m.svg b/data/styles/walking/dark/symbols/survey_point-m.svg similarity index 100% rename from data/styles/default/dark/symbols/survey_point-m.svg rename to data/styles/walking/dark/symbols/survey_point-m.svg diff --git a/data/styles/default/dark/symbols/swimming-centre-m.svg b/data/styles/walking/dark/symbols/swimming-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/swimming-centre-m.svg rename to data/styles/walking/dark/symbols/swimming-centre-m.svg diff --git a/data/styles/default/dark/symbols/swimming-m.svg b/data/styles/walking/dark/symbols/swimming-m.svg similarity index 100% rename from data/styles/default/dark/symbols/swimming-m.svg rename to data/styles/walking/dark/symbols/swimming-m.svg diff --git a/data/styles/default/dark/symbols/table-tennis-centre-m.svg b/data/styles/walking/dark/symbols/table-tennis-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/table-tennis-centre-m.svg rename to data/styles/walking/dark/symbols/table-tennis-centre-m.svg diff --git a/data/styles/default/dark/symbols/table-tennis-m.svg b/data/styles/walking/dark/symbols/table-tennis-m.svg similarity index 100% rename from data/styles/default/dark/symbols/table-tennis-m.svg rename to data/styles/walking/dark/symbols/table-tennis-m.svg diff --git a/data/styles/default/dark/symbols/tank-m.svg b/data/styles/walking/dark/symbols/tank-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tank-m.svg rename to data/styles/walking/dark/symbols/tank-m.svg diff --git a/data/styles/default/dark/symbols/taoist-m.svg b/data/styles/walking/dark/symbols/taoist-m.svg similarity index 100% rename from data/styles/default/dark/symbols/taoist-m.svg rename to data/styles/walking/dark/symbols/taoist-m.svg diff --git a/data/styles/default/dark/symbols/taoist-s.svg b/data/styles/walking/dark/symbols/taoist-s.svg similarity index 100% rename from data/styles/default/dark/symbols/taoist-s.svg rename to data/styles/walking/dark/symbols/taoist-s.svg diff --git a/data/styles/default/dark/symbols/taxi-xm.svg b/data/styles/walking/dark/symbols/taxi-xm.svg similarity index 100% rename from data/styles/default/dark/symbols/taxi-xm.svg rename to data/styles/walking/dark/symbols/taxi-xm.svg diff --git a/data/styles/default/dark/symbols/telescope-gamma-m.svg b/data/styles/walking/dark/symbols/telescope-gamma-m.svg similarity index 100% rename from data/styles/default/dark/symbols/telescope-gamma-m.svg rename to data/styles/walking/dark/symbols/telescope-gamma-m.svg diff --git a/data/styles/default/dark/symbols/telescope-m.svg b/data/styles/walking/dark/symbols/telescope-m.svg similarity index 100% rename from data/styles/default/dark/symbols/telescope-m.svg rename to data/styles/walking/dark/symbols/telescope-m.svg diff --git a/data/styles/default/dark/symbols/telescope-optical-m.svg b/data/styles/walking/dark/symbols/telescope-optical-m.svg similarity index 100% rename from data/styles/default/dark/symbols/telescope-optical-m.svg rename to data/styles/walking/dark/symbols/telescope-optical-m.svg diff --git a/data/styles/default/dark/symbols/telescope-radio-m.svg b/data/styles/walking/dark/symbols/telescope-radio-m.svg similarity index 100% rename from data/styles/default/dark/symbols/telescope-radio-m.svg rename to data/styles/walking/dark/symbols/telescope-radio-m.svg diff --git a/data/styles/default/dark/symbols/tennis-centre-m.svg b/data/styles/walking/dark/symbols/tennis-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tennis-centre-m.svg rename to data/styles/walking/dark/symbols/tennis-centre-m.svg diff --git a/data/styles/default/dark/symbols/tennis-m.svg b/data/styles/walking/dark/symbols/tennis-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tennis-m.svg rename to data/styles/walking/dark/symbols/tennis-m.svg diff --git a/data/styles/default/dark/symbols/theatre-m.svg b/data/styles/walking/dark/symbols/theatre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/theatre-m.svg rename to data/styles/walking/dark/symbols/theatre-m.svg diff --git a/data/styles/default/dark/symbols/theatre-s.svg b/data/styles/walking/dark/symbols/theatre-s.svg similarity index 100% rename from data/styles/default/dark/symbols/theatre-s.svg rename to data/styles/walking/dark/symbols/theatre-s.svg diff --git a/data/styles/default/dark/symbols/theme_park-m.svg b/data/styles/walking/dark/symbols/theme_park-m.svg similarity index 100% rename from data/styles/default/dark/symbols/theme_park-m.svg rename to data/styles/walking/dark/symbols/theme_park-m.svg diff --git a/data/styles/default/dark/symbols/theme_park-s.svg b/data/styles/walking/dark/symbols/theme_park-s.svg similarity index 100% rename from data/styles/default/dark/symbols/theme_park-s.svg rename to data/styles/walking/dark/symbols/theme_park-s.svg diff --git a/data/styles/default/dark/symbols/ticket-shop-m.svg b/data/styles/walking/dark/symbols/ticket-shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/ticket-shop-m.svg rename to data/styles/walking/dark/symbols/ticket-shop-m.svg diff --git a/data/styles/default/dark/symbols/tire-repair-m.svg b/data/styles/walking/dark/symbols/tire-repair-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tire-repair-m.svg rename to data/styles/walking/dark/symbols/tire-repair-m.svg diff --git a/data/styles/default/dark/symbols/tobacco-m.svg b/data/styles/walking/dark/symbols/tobacco-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tobacco-m.svg rename to data/styles/walking/dark/symbols/tobacco-m.svg diff --git a/data/styles/default/dark/symbols/toilets-m.svg b/data/styles/walking/dark/symbols/toilets-m.svg similarity index 100% rename from data/styles/default/dark/symbols/toilets-m.svg rename to data/styles/walking/dark/symbols/toilets-m.svg diff --git a/data/styles/default/dark/symbols/toll_booth-m.svg b/data/styles/walking/dark/symbols/toll_booth-m.svg similarity index 100% rename from data/styles/default/dark/symbols/toll_booth-m.svg rename to data/styles/walking/dark/symbols/toll_booth-m.svg diff --git a/data/styles/default/dark/symbols/toll_booth-s.svg b/data/styles/walking/dark/symbols/toll_booth-s.svg similarity index 100% rename from data/styles/default/dark/symbols/toll_booth-s.svg rename to data/styles/walking/dark/symbols/toll_booth-s.svg diff --git a/data/styles/default/dark/symbols/tomb-m.svg b/data/styles/walking/dark/symbols/tomb-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tomb-m.svg rename to data/styles/walking/dark/symbols/tomb-m.svg diff --git a/data/styles/default/dark/symbols/tourism-m.svg b/data/styles/walking/dark/symbols/tourism-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tourism-m.svg rename to data/styles/walking/dark/symbols/tourism-m.svg diff --git a/data/styles/default/dark/symbols/tourism-s.svg b/data/styles/walking/dark/symbols/tourism-s.svg similarity index 100% rename from data/styles/default/dark/symbols/tourism-s.svg rename to data/styles/walking/dark/symbols/tourism-s.svg diff --git a/data/styles/default/dark/symbols/tower-m.svg b/data/styles/walking/dark/symbols/tower-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tower-m.svg rename to data/styles/walking/dark/symbols/tower-m.svg diff --git a/data/styles/default/dark/symbols/toys-m.svg b/data/styles/walking/dark/symbols/toys-m.svg similarity index 100% rename from data/styles/default/dark/symbols/toys-m.svg rename to data/styles/walking/dark/symbols/toys-m.svg diff --git a/data/styles/default/dark/symbols/track_marker_deselected.svg b/data/styles/walking/dark/symbols/track_marker_deselected.svg similarity index 100% rename from data/styles/default/dark/symbols/track_marker_deselected.svg rename to data/styles/walking/dark/symbols/track_marker_deselected.svg diff --git a/data/styles/default/dark/symbols/track_marker_selected.svg b/data/styles/walking/dark/symbols/track_marker_selected.svg similarity index 100% rename from data/styles/default/dark/symbols/track_marker_selected.svg rename to data/styles/walking/dark/symbols/track_marker_selected.svg diff --git a/data/styles/default/dark/symbols/traffic_signals-l.svg b/data/styles/walking/dark/symbols/traffic_signals-l.svg similarity index 100% rename from data/styles/default/dark/symbols/traffic_signals-l.svg rename to data/styles/walking/dark/symbols/traffic_signals-l.svg diff --git a/data/styles/default/dark/symbols/traffic_signals.svg b/data/styles/walking/dark/symbols/traffic_signals.svg similarity index 100% rename from data/styles/default/dark/symbols/traffic_signals.svg rename to data/styles/walking/dark/symbols/traffic_signals.svg diff --git a/data/styles/default/dark/symbols/train-m.svg b/data/styles/walking/dark/symbols/train-m.svg similarity index 100% rename from data/styles/default/dark/symbols/train-m.svg rename to data/styles/walking/dark/symbols/train-m.svg diff --git a/data/styles/default/dark/symbols/train-s.svg b/data/styles/walking/dark/symbols/train-s.svg similarity index 100% rename from data/styles/default/dark/symbols/train-s.svg rename to data/styles/walking/dark/symbols/train-s.svg diff --git a/data/styles/default/dark/symbols/train_building-m.svg b/data/styles/walking/dark/symbols/train_building-m.svg similarity index 100% rename from data/styles/default/dark/symbols/train_building-m.svg rename to data/styles/walking/dark/symbols/train_building-m.svg diff --git a/data/styles/default/dark/symbols/train_light-m.svg b/data/styles/walking/dark/symbols/train_light-m.svg similarity index 100% rename from data/styles/default/dark/symbols/train_light-m.svg rename to data/styles/walking/dark/symbols/train_light-m.svg diff --git a/data/styles/default/dark/symbols/train_light-s.svg b/data/styles/walking/dark/symbols/train_light-s.svg similarity index 100% rename from data/styles/default/dark/symbols/train_light-s.svg rename to data/styles/walking/dark/symbols/train_light-s.svg diff --git a/data/styles/default/dark/symbols/tram-m.svg b/data/styles/walking/dark/symbols/tram-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tram-m.svg rename to data/styles/walking/dark/symbols/tram-m.svg diff --git a/data/styles/default/dark/symbols/tram-s.svg b/data/styles/walking/dark/symbols/tram-s.svg similarity index 100% rename from data/styles/default/dark/symbols/tram-s.svg rename to data/styles/walking/dark/symbols/tram-s.svg diff --git a/data/styles/default/dark/symbols/transfer_arrow.svg b/data/styles/walking/dark/symbols/transfer_arrow.svg similarity index 100% rename from data/styles/default/dark/symbols/transfer_arrow.svg rename to data/styles/walking/dark/symbols/transfer_arrow.svg diff --git a/data/styles/default/dark/symbols/transit_light_rail-m.svg b/data/styles/walking/dark/symbols/transit_light_rail-m.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_light_rail-m.svg rename to data/styles/walking/dark/symbols/transit_light_rail-m.svg diff --git a/data/styles/default/dark/symbols/transit_light_rail-s.svg b/data/styles/walking/dark/symbols/transit_light_rail-s.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_light_rail-s.svg rename to data/styles/walking/dark/symbols/transit_light_rail-s.svg diff --git a/data/styles/default/dark/symbols/transit_monorail-m.svg b/data/styles/walking/dark/symbols/transit_monorail-m.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_monorail-m.svg rename to data/styles/walking/dark/symbols/transit_monorail-m.svg diff --git a/data/styles/default/dark/symbols/transit_monorail-s.svg b/data/styles/walking/dark/symbols/transit_monorail-s.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_monorail-s.svg rename to data/styles/walking/dark/symbols/transit_monorail-s.svg diff --git a/data/styles/default/dark/symbols/transit_subway-m.svg b/data/styles/walking/dark/symbols/transit_subway-m.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_subway-m.svg rename to data/styles/walking/dark/symbols/transit_subway-m.svg diff --git a/data/styles/default/dark/symbols/transit_subway-s.svg b/data/styles/walking/dark/symbols/transit_subway-s.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_subway-s.svg rename to data/styles/walking/dark/symbols/transit_subway-s.svg diff --git a/data/styles/default/dark/symbols/transit_train-m.svg b/data/styles/walking/dark/symbols/transit_train-m.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_train-m.svg rename to data/styles/walking/dark/symbols/transit_train-m.svg diff --git a/data/styles/default/dark/symbols/transit_train-s.svg b/data/styles/walking/dark/symbols/transit_train-s.svg similarity index 100% rename from data/styles/default/dark/symbols/transit_train-s.svg rename to data/styles/walking/dark/symbols/transit_train-s.svg diff --git a/data/styles/default/dark/symbols/travel_agency_shop-m.svg b/data/styles/walking/dark/symbols/travel_agency_shop-m.svg similarity index 100% rename from data/styles/default/dark/symbols/travel_agency_shop-m.svg rename to data/styles/walking/dark/symbols/travel_agency_shop-m.svg diff --git a/data/styles/default/dark/symbols/tree-m.svg b/data/styles/walking/dark/symbols/tree-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tree-m.svg rename to data/styles/walking/dark/symbols/tree-m.svg diff --git a/data/styles/default/dark/symbols/tree-special-m.svg b/data/styles/walking/dark/symbols/tree-special-m.svg similarity index 100% rename from data/styles/default/dark/symbols/tree-special-m.svg rename to data/styles/walking/dark/symbols/tree-special-m.svg diff --git a/data/styles/default/dark/symbols/vehicle_inspection-m.svg b/data/styles/walking/dark/symbols/vehicle_inspection-m.svg similarity index 100% rename from data/styles/default/dark/symbols/vehicle_inspection-m.svg rename to data/styles/walking/dark/symbols/vehicle_inspection-m.svg diff --git a/data/styles/default/dark/symbols/vending-m.svg b/data/styles/walking/dark/symbols/vending-m.svg similarity index 100% rename from data/styles/default/dark/symbols/vending-m.svg rename to data/styles/walking/dark/symbols/vending-m.svg diff --git a/data/styles/default/dark/symbols/veterinary-m.svg b/data/styles/walking/dark/symbols/veterinary-m.svg similarity index 100% rename from data/styles/default/dark/symbols/veterinary-m.svg rename to data/styles/walking/dark/symbols/veterinary-m.svg diff --git a/data/styles/default/dark/symbols/video-games-m.svg b/data/styles/walking/dark/symbols/video-games-m.svg similarity index 100% rename from data/styles/default/dark/symbols/video-games-m.svg rename to data/styles/walking/dark/symbols/video-games-m.svg diff --git a/data/styles/default/dark/symbols/viewpoint-m.svg b/data/styles/walking/dark/symbols/viewpoint-m.svg similarity index 100% rename from data/styles/default/dark/symbols/viewpoint-m.svg rename to data/styles/walking/dark/symbols/viewpoint-m.svg diff --git a/data/styles/default/dark/symbols/viewpoint-s.svg b/data/styles/walking/dark/symbols/viewpoint-s.svg similarity index 100% rename from data/styles/default/dark/symbols/viewpoint-s.svg rename to data/styles/walking/dark/symbols/viewpoint-s.svg diff --git a/data/styles/default/dark/symbols/volcano-m.svg b/data/styles/walking/dark/symbols/volcano-m.svg similarity index 100% rename from data/styles/default/dark/symbols/volcano-m.svg rename to data/styles/walking/dark/symbols/volcano-m.svg diff --git a/data/styles/default/dark/symbols/volcano-s.svg b/data/styles/walking/dark/symbols/volcano-s.svg similarity index 100% rename from data/styles/default/dark/symbols/volcano-s.svg rename to data/styles/walking/dark/symbols/volcano-s.svg diff --git a/data/styles/default/dark/symbols/volleyball-centre-m.svg b/data/styles/walking/dark/symbols/volleyball-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/volleyball-centre-m.svg rename to data/styles/walking/dark/symbols/volleyball-centre-m.svg diff --git a/data/styles/default/dark/symbols/volleyball-m.svg b/data/styles/walking/dark/symbols/volleyball-m.svg similarity index 100% rename from data/styles/default/dark/symbols/volleyball-m.svg rename to data/styles/walking/dark/symbols/volleyball-m.svg diff --git a/data/styles/default/dark/symbols/warning-ferry.svg b/data/styles/walking/dark/symbols/warning-ferry.svg similarity index 100% rename from data/styles/default/dark/symbols/warning-ferry.svg rename to data/styles/walking/dark/symbols/warning-ferry.svg diff --git a/data/styles/default/dark/symbols/warning-general.svg b/data/styles/walking/dark/symbols/warning-general.svg similarity index 100% rename from data/styles/default/dark/symbols/warning-general.svg rename to data/styles/walking/dark/symbols/warning-general.svg diff --git a/data/styles/default/dark/symbols/warning-paid_road.svg b/data/styles/walking/dark/symbols/warning-paid_road.svg similarity index 100% rename from data/styles/default/dark/symbols/warning-paid_road.svg rename to data/styles/walking/dark/symbols/warning-paid_road.svg diff --git a/data/styles/default/dark/symbols/warning-unpaved_road.svg b/data/styles/walking/dark/symbols/warning-unpaved_road.svg similarity index 100% rename from data/styles/default/dark/symbols/warning-unpaved_road.svg rename to data/styles/walking/dark/symbols/warning-unpaved_road.svg diff --git a/data/styles/default/dark/symbols/waste-basket-m.svg b/data/styles/walking/dark/symbols/waste-basket-m.svg similarity index 100% rename from data/styles/default/dark/symbols/waste-basket-m.svg rename to data/styles/walking/dark/symbols/waste-basket-m.svg diff --git a/data/styles/default/dark/symbols/waste-basket-s.svg b/data/styles/walking/dark/symbols/waste-basket-s.svg similarity index 100% rename from data/styles/default/dark/symbols/waste-basket-s.svg rename to data/styles/walking/dark/symbols/waste-basket-s.svg diff --git a/data/styles/default/dark/symbols/water_slide-m.svg b/data/styles/walking/dark/symbols/water_slide-m.svg similarity index 100% rename from data/styles/default/dark/symbols/water_slide-m.svg rename to data/styles/walking/dark/symbols/water_slide-m.svg diff --git a/data/styles/default/dark/symbols/waterfall-m.svg b/data/styles/walking/dark/symbols/waterfall-m.svg similarity index 100% rename from data/styles/default/dark/symbols/waterfall-m.svg rename to data/styles/walking/dark/symbols/waterfall-m.svg diff --git a/data/styles/default/dark/symbols/waterfall-s.svg b/data/styles/walking/dark/symbols/waterfall-s.svg similarity index 100% rename from data/styles/default/dark/symbols/waterfall-s.svg rename to data/styles/walking/dark/symbols/waterfall-s.svg diff --git a/data/styles/default/dark/symbols/wayside_cross-m.svg b/data/styles/walking/dark/symbols/wayside_cross-m.svg similarity index 100% rename from data/styles/default/dark/symbols/wayside_cross-m.svg rename to data/styles/walking/dark/symbols/wayside_cross-m.svg diff --git a/data/styles/default/dark/symbols/wayside_shrine-m.svg b/data/styles/walking/dark/symbols/wayside_shrine-m.svg similarity index 100% rename from data/styles/default/dark/symbols/wayside_shrine-m.svg rename to data/styles/walking/dark/symbols/wayside_shrine-m.svg diff --git a/data/styles/default/dark/symbols/wholesale-m.svg b/data/styles/walking/dark/symbols/wholesale-m.svg similarity index 100% rename from data/styles/default/dark/symbols/wholesale-m.svg rename to data/styles/walking/dark/symbols/wholesale-m.svg diff --git a/data/styles/default/dark/symbols/wind_turbine-m.svg b/data/styles/walking/dark/symbols/wind_turbine-m.svg similarity index 100% rename from data/styles/default/dark/symbols/wind_turbine-m.svg rename to data/styles/walking/dark/symbols/wind_turbine-m.svg diff --git a/data/styles/default/dark/symbols/windmill-m.svg b/data/styles/walking/dark/symbols/windmill-m.svg similarity index 100% rename from data/styles/default/dark/symbols/windmill-m.svg rename to data/styles/walking/dark/symbols/windmill-m.svg diff --git a/data/styles/default/dark/symbols/winery-m.svg b/data/styles/walking/dark/symbols/winery-m.svg similarity index 100% rename from data/styles/default/dark/symbols/winery-m.svg rename to data/styles/walking/dark/symbols/winery-m.svg diff --git a/data/styles/default/dark/symbols/wreck-m.svg b/data/styles/walking/dark/symbols/wreck-m.svg similarity index 100% rename from data/styles/default/dark/symbols/wreck-m.svg rename to data/styles/walking/dark/symbols/wreck-m.svg diff --git a/data/styles/default/dark/symbols/yoga-centre-m.svg b/data/styles/walking/dark/symbols/yoga-centre-m.svg similarity index 100% rename from data/styles/default/dark/symbols/yoga-centre-m.svg rename to data/styles/walking/dark/symbols/yoga-centre-m.svg diff --git a/data/styles/default/dark/symbols/yoga-m.svg b/data/styles/walking/dark/symbols/yoga-m.svg similarity index 100% rename from data/styles/default/dark/symbols/yoga-m.svg rename to data/styles/walking/dark/symbols/yoga-m.svg diff --git a/data/styles/default/dark/symbols/zero-icon.svg b/data/styles/walking/dark/symbols/zero-icon.svg similarity index 100% rename from data/styles/default/dark/symbols/zero-icon.svg rename to data/styles/walking/dark/symbols/zero-icon.svg diff --git a/data/styles/default/dark/symbols/zoo-m.svg b/data/styles/walking/dark/symbols/zoo-m.svg similarity index 100% rename from data/styles/default/dark/symbols/zoo-m.svg rename to data/styles/walking/dark/symbols/zoo-m.svg diff --git a/data/styles/default/dark/symbols/zoo-s.svg b/data/styles/walking/dark/symbols/zoo-s.svg similarity index 100% rename from data/styles/default/dark/symbols/zoo-s.svg rename to data/styles/walking/dark/symbols/zoo-s.svg diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/walking/include/basemap.mapcss similarity index 99% rename from data/styles/default/include/Basemap.mapcss rename to data/styles/walking/include/basemap.mapcss index 267ae714f..80ae4a6d3 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/walking/include/basemap.mapcss @@ -1,6 +1,6 @@ /* ~~~~ CONTENT OF BASEMAP ~~~~~ -1.Z-INDEX of BASEMAP +1.BASICS 2.LAND 3.BOUNDARY 3.1 Countries @@ -28,6 +28,35 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* 1. BASICS */ + +way|z1-12::* +{ + linejoin: bevel; +} + +way|z13-::* +{ + linejoin: round; +} + +way|z1-15::* +{ + linecap: butt; +} + +way|z16-::* +{ + linecap: round; +} + +*::int_name +{ + text-offset: 1; +} + + /* 2.LAND */ area|z0-[natural=coastline], diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/walking/include/basemap_label.mapcss similarity index 100% rename from data/styles/default/include/Basemap_label.mapcss rename to data/styles/walking/include/basemap_label.mapcss diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/walking/include/icons.mapcss similarity index 98% rename from data/styles/default/include/Icons.mapcss rename to data/styles/walking/include/icons.mapcss index 0a1fea9a0..a19d4c653 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/walking/include/icons.mapcss @@ -22,7 +22,6 @@ 6.1 Craft 7.CAR 7.1 Parking -8. COLORED LABELS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -2392,16 +2391,16 @@ area|z14-[highway=services], area|z15-[highway=rest_area], {text-position: center;} -node|z14-[amenity=fuel], -node|z15-[amenity=charging_station][motorcar?][!capacity], -node|z15-[amenity=charging_station][motorcar?][capacity=1], -node|z15-[amenity=charging_station][motorcar?][capacity=2], -node|z14-[amenity=charging_station][motorcar?][capacity?], +node|z15-[amenity=fuel], +node|z17-[amenity=charging_station][motorcar?][!capacity], +node|z17-[amenity=charging_station][motorcar?][capacity=1], +node|z17-[amenity=charging_station][motorcar?][capacity=2], +node|z16-[amenity=charging_station][motorcar?][capacity?], area|z14-[highway=services], area|z15-[highway=rest_area], area|z15-[landuse=garages], node|z15-[amenity=sanitary_dump_station], -node|z16-[amenity=charging_station], +node|z18-[amenity=charging_station], node|z17-[amenity=bicycle_parking], node|z17-[amenity=motorcycle_parking], node|z17-[amenity=car_wash], @@ -2414,46 +2413,30 @@ node|z18-[amenity=car_sharing], area|z18-[landuse=garages], {font-size: 11;} -node|z14[amenity=fuel], -{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;} -node|z15[amenity=fuel], -{icon-image: fuel-m.svg; icon-min-distance: 20;} -node|z16[amenity=fuel], -{icon-image: fuel-m.svg; icon-min-distance: 10;} -node|z17-[amenity=fuel], -{icon-image: fuel-m.svg;} -node|z18-[amenity=fuel], -{font-size: 11;} +node|z15-[amenity=fuel], +{icon-image: fuel-m.svg; text-offset: 1;} -node|z15-[amenity=charging_station][motorcar?], -node|z16-[amenity=charging_station][motorcycle?], -node|z16-[amenity=charging_station][bicycle?], -node|z16-[amenity=charging_station][motorcar=not], -node|z16-[amenity=charging_station], +node|z17-[amenity=charging_station][motorcar?], +node|z18-[amenity=charging_station][motorcycle?], +node|z18-[amenity=charging_station][bicycle?], +node|z18-[amenity=charging_station][motorcar=not], +node|z18-[amenity=charging_station], {icon-image: charging_station-small-m.svg;} -node|z14[amenity=charging_station][motorcar?][capacity?], -{icon-image: charging_station-s.svg;} -node|z15-[amenity=charging_station][motorcar?][capacity?], +node|z16-[amenity=charging_station][motorcar?][capacity?], {icon-image: charging_station-m.svg;} -node|z14[amenity=charging_station][motorcar?][!capacity], -node|z14[amenity=charging_station][motorcar?][capacity=1], -node|z14[amenity=charging_station][motorcar?][capacity=2], +node|z16[amenity=charging_station][motorcar?][!capacity], +node|z16[amenity=charging_station][motorcar?][capacity=1], +node|z16[amenity=charging_station][motorcar?][capacity=2], {icon-image: none;} -node|z15-[amenity=charging_station][motorcar?][!capacity], -node|z15-[amenity=charging_station][motorcar?][capacity=1], -node|z15-[amenity=charging_station][motorcar?][capacity=2], +node|z17-[amenity=charging_station][motorcar?][!capacity], +node|z17-[amenity=charging_station][motorcar?][capacity=1], +node|z17-[amenity=charging_station][motorcar?][capacity=2], {icon-image: charging_station-small-m.svg;} -node|z14[amenity=charging_station][motorcar?], -{text-offset: 1;font-size: 10;icon-min-distance: 20;} -node|z15[amenity=charging_station][motorcar?], -{icon-min-distance: 20;} -node|z16[amenity=charging_station], -{icon-min-distance: 10;} -node|z18-[amenity=charging_station], -{font-size: 11;} +node|z16[amenity=charging_station][motorcar?], +{text-offset: 1;font-size: 10;} area|z14[highway=services], {icon-image: car-repair-s.svg; icon-min-distance: 20;} @@ -2558,7 +2541,3 @@ node|z18-[amenity=parking_space][parking_space=disabled], node|z16-[waterway=fuel], {icon-image: marina_fuel_station-m.svg;} - -/* 8. Colored Labels */ - -@import("../../default/include/Icons_Label_Colors.mapcss"); diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/walking/include/icons_label_colors.mapcss similarity index 100% rename from data/styles/default/include/Icons_Label_Colors.mapcss rename to data/styles/walking/include/icons_label_colors.mapcss diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/walking/include/priorities_1_BG-by-size.prio.txt similarity index 97% rename from data/styles/default/include/priorities_1_BG-by-size.prio.txt rename to data/styles/walking/include/priorities_1_BG-by-size.prio.txt index edcf5cedc..d07d161cd 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/walking/include/priorities_1_BG-by-size.prio.txt @@ -88,15 +88,15 @@ landuse-cemetery-christian # area z10- (also has icon z === 180 amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) -amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) -amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-) -amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-) +amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) -amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) +amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z16-, caption(optional) z17-) amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) @@ -195,12 +195,12 @@ natural-shingle # area z12- === 80 landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) -leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) +leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) leisure-garden-residential # area z12- -leisure-park # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-) -leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-) +leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) === 70 landuse-forest # area z10- (also has icon z13-, caption(optional) z14-) @@ -237,7 +237,7 @@ amenity-college # area z13- (also has icon z amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) amenity-school # area z13- (also has icon z16-, caption(optional) z16-) -amenity-university # area z13- (also has icon z14-, caption(optional) z14-) +amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) === 40 aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/default/include/priorities_2_BG-top.prio.txt b/data/styles/walking/include/priorities_2_BG-top.prio.txt similarity index 100% rename from data/styles/default/include/priorities_2_BG-top.prio.txt rename to data/styles/walking/include/priorities_2_BG-top.prio.txt diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/walking/include/priorities_3_FG.prio.txt similarity index 100% rename from data/styles/default/include/priorities_3_FG.prio.txt rename to data/styles/walking/include/priorities_3_FG.prio.txt diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/walking/include/priorities_4_overlays.prio.txt similarity index 98% rename from data/styles/default/include/priorities_4_overlays.prio.txt rename to data/styles/walking/include/priorities_4_overlays.prio.txt index 1d898111d..b4bf030ab 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/walking/include/priorities_4_overlays.prio.txt @@ -23,7 +23,7 @@ place-country # caption z3- === 7600 place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) -# place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) +place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) === 7550 place-city-capital-3 # caption z4- @@ -114,7 +114,7 @@ natural-water-reservoir # caption z10- (also has are barrier-toll_booth # icon z16- (also has caption(optional) z16-) === 6600 -historic-ruins # icon z17- (also has caption(optional) z17-) +historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) === 6551 historic-castle # icon z12- (also has caption(optional) z12-) @@ -326,13 +326,13 @@ tourism-zoo # icon z13- (also has captio === 5200 amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) -amenity-university # icon z14- (also has caption(optional) z14-, area z13-) +amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) === 5100 leisure-marina # icon z16- (also has caption(optional) z16-) -leisure-park # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-permissive # icon z14- (also has caption(optional) z14-, area z10-) +leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) mountain_pass # icon z14- (also has caption(optional) z15-) place-square # caption z16- === 5050 @@ -375,11 +375,11 @@ tourism-attraction # icon z14- (also has captio tourism-gallery # icon z15- (also has caption(optional) z15-) === 4300 -amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-) +amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) === 4280 -amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-) -amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-) +amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) waterway-fuel # icon z16- (also has caption(optional) z16-) === 4270 @@ -431,16 +431,16 @@ tourism-chalet # icon z16- (also has captio shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) === 3800 -amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-) +amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) === 3752 -amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-) +amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) === 3751 -amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-) +amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) === 3750 -amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-) +amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) === 3749 railway-subway_entrance # icon z16- (also has caption(optional) z17-) @@ -843,7 +843,7 @@ highway-living_street-bridge # pathtext z14- (also has li highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-) landuse-plant_nursery # icon z17- (also has caption(optional) z17-, area z12-) leisure-bowling_alley # icon z17- (also has caption(optional) z17-) -leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) +leisure-garden # icon z16- and caption z17- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) @@ -1407,12 +1407,12 @@ amenity-parking-private # icon z18- (also has captio amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) -leisure-park-no-access # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-private # icon z14- (also has caption(optional) z14-, area z10-) +leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) === 100 -natural-tree # icon z17- (also has caption(optional) z17-) +natural-tree # icon z17- and caption z17- (also has caption(optional) z17-) === 6 # @@ -1448,7 +1448,7 @@ natural-tree # icon z17- (also has captio # barrier-toll_booth # caption(optional) z16- (also has icon z16-) # === -3400 -# historic-ruins # caption(optional) z17- (also has icon z17-) +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) # === -3449 # historic-castle # caption(optional) z12- (also has icon z12-) @@ -1618,13 +1618,13 @@ natural-tree # icon z17- (also has captio # === -4800 # amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) -# amenity-university # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) # leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) # === -4900 # leisure-marina # caption(optional) z16- (also has icon z16-) -# leisure-park # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-permissive # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # mountain_pass # caption(optional) z15- (also has icon z14-) # === -4950 @@ -1665,11 +1665,11 @@ natural-tree # icon z17- (also has captio # tourism-gallery # caption(optional) z15- (also has icon z15-) # === -5700 -# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-) +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) # === -5720 -# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-) -# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-) +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) # waterway-fuel # caption(optional) z16- (also has icon z16-) # === -5730 @@ -1721,16 +1721,16 @@ natural-tree # icon z17- (also has captio # shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) # === -6200 -# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) # === -6248 -# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) # === -6249 -# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) # === -6250 -# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) # === -6251 # railway-subway_entrance # caption(optional) z17- (also has icon z16-) @@ -1953,7 +1953,7 @@ natural-tree # icon z17- (also has captio # attraction-water_slide # caption(optional) z17- (also has icon z17-) # landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) -# leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) # office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) @@ -2419,8 +2419,8 @@ xmas-tree # icon z18- # amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) # amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) -# leisure-park-no-access # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) # === -9900 @@ -2485,7 +2485,7 @@ emergency-life_ring # icon z19- (also has captio power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 -# natural-tree # caption(optional) z17- (also has icon z17-) +# natural-tree # caption(optional) z17- (also has icon z17-, caption z17-) # === -9994 # amenity-bench # caption(optional) z19- (also has icon z18-) @@ -2494,7 +2494,7 @@ power-substation # icon z17- (also has captio # amenity-give_box # caption(optional) z18- (also has icon z18-) # amenity-hydrant # caption(optional) z19- (also has icon z19-) amenity-loading_dock # icon z19- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) @@ -2519,7 +2519,7 @@ amenity-loading_dock # icon z19- (also has captio # entrance-garage # caption(optional) z19- (also has icon z19-) # entrance-house # caption(optional) z19- (also has icon z18-) entrance-service # icon z19- (also has caption(optional) z19-) -# entrance-service # caption(optional) z19- (also has icon z19-) +entrance-service # caption(optional) z19- (also has icon z19-) # man_made-cairn # caption(optional) z19- (also has icon z19-) # man_made-survey_point # caption(optional) z18- (also has icon z18-) # man_made-telescope # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/default/include/Subways.mapcss b/data/styles/walking/include/transit_systems.mapcss similarity index 100% rename from data/styles/default/include/Subways.mapcss rename to data/styles/walking/include/transit_systems.mapcss diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/walking/include/ways.mapcss similarity index 100% rename from data/styles/default/include/Roads.mapcss rename to data/styles/walking/include/ways.mapcss diff --git a/data/styles/default/include/Roads_label.mapcss b/data/styles/walking/include/ways_label.mapcss similarity index 100% rename from data/styles/default/include/Roads_label.mapcss rename to data/styles/walking/include/ways_label.mapcss diff --git a/data/styles/default/light/colors.mapcss b/data/styles/walking/light/colors.mapcss similarity index 100% rename from data/styles/default/light/colors.mapcss rename to data/styles/walking/light/colors.mapcss diff --git a/data/styles/default/light/style.mapcss b/data/styles/walking/light/dynamic_colors.mapcss similarity index 93% rename from data/styles/default/light/style.mapcss rename to data/styles/walking/light/dynamic_colors.mapcss index ab819679d..a679ef03e 100644 --- a/data/styles/default/light/style.mapcss +++ b/data/styles/walking/light/dynamic_colors.mapcss @@ -1,12 +1,3 @@ -@import("colors.mapcss"); -@import("../include/defaults_new.mapcss"); -@import("../include/Basemap.mapcss"); -@import("../include/Basemap_label.mapcss"); -@import("../include/Roads.mapcss"); -@import("../include/Roads_label.mapcss"); -@import("../include/Icons.mapcss"); -@import("../include/Subways.mapcss"); - colors { GuiText-color: #4D4D4D; diff --git a/data/styles/walking/light/style.mapcss b/data/styles/walking/light/style.mapcss new file mode 100644 index 000000000..a0e78c2b1 --- /dev/null +++ b/data/styles/walking/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("dynamic_colors.mapcss"); diff --git a/data/styles/default/light/symbols-ad/00000_keep.svg b/data/styles/walking/light/symbols-ad/00000_keep.svg similarity index 100% rename from data/styles/default/light/symbols-ad/00000_keep.svg rename to data/styles/walking/light/symbols-ad/00000_keep.svg diff --git a/data/styles/default/light/symbols/access_point-m.svg b/data/styles/walking/light/symbols/access_point-m.svg similarity index 100% rename from data/styles/default/light/symbols/access_point-m.svg rename to data/styles/walking/light/symbols/access_point-m.svg diff --git a/data/styles/default/light/symbols/aircraft-m.svg b/data/styles/walking/light/symbols/aircraft-m.svg similarity index 100% rename from data/styles/default/light/symbols/aircraft-m.svg rename to data/styles/walking/light/symbols/aircraft-m.svg diff --git a/data/styles/default/light/symbols/airport-m.svg b/data/styles/walking/light/symbols/airport-m.svg similarity index 100% rename from data/styles/default/light/symbols/airport-m.svg rename to data/styles/walking/light/symbols/airport-m.svg diff --git a/data/styles/default/light/symbols/airport-s.svg b/data/styles/walking/light/symbols/airport-s.svg similarity index 100% rename from data/styles/default/light/symbols/airport-s.svg rename to data/styles/walking/light/symbols/airport-s.svg diff --git a/data/styles/default/light/symbols/airport_gate-m.svg b/data/styles/walking/light/symbols/airport_gate-m.svg similarity index 100% rename from data/styles/default/light/symbols/airport_gate-m.svg rename to data/styles/walking/light/symbols/airport_gate-m.svg diff --git a/data/styles/default/light/symbols/alcohol-m.svg b/data/styles/walking/light/symbols/alcohol-m.svg similarity index 100% rename from data/styles/default/light/symbols/alcohol-m.svg rename to data/styles/walking/light/symbols/alcohol-m.svg diff --git a/data/styles/default/light/symbols/alpine_hut-m.svg b/data/styles/walking/light/symbols/alpine_hut-m.svg similarity index 100% rename from data/styles/default/light/symbols/alpine_hut-m.svg rename to data/styles/walking/light/symbols/alpine_hut-m.svg diff --git a/data/styles/default/light/symbols/alpine_hut-s.svg b/data/styles/walking/light/symbols/alpine_hut-s.svg similarity index 100% rename from data/styles/default/light/symbols/alpine_hut-s.svg rename to data/styles/walking/light/symbols/alpine_hut-s.svg diff --git a/data/styles/default/light/symbols/alternative-m.svg b/data/styles/walking/light/symbols/alternative-m.svg similarity index 100% rename from data/styles/default/light/symbols/alternative-m.svg rename to data/styles/walking/light/symbols/alternative-m.svg diff --git a/data/styles/default/light/symbols/america-football-centre-m.svg b/data/styles/walking/light/symbols/america-football-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/america-football-centre-m.svg rename to data/styles/walking/light/symbols/america-football-centre-m.svg diff --git a/data/styles/default/light/symbols/america-football-m.svg b/data/styles/walking/light/symbols/america-football-m.svg similarity index 100% rename from data/styles/default/light/symbols/america-football-m.svg rename to data/styles/walking/light/symbols/america-football-m.svg diff --git a/data/styles/default/light/symbols/anchor-m.svg b/data/styles/walking/light/symbols/anchor-m.svg similarity index 100% rename from data/styles/default/light/symbols/anchor-m.svg rename to data/styles/walking/light/symbols/anchor-m.svg diff --git a/data/styles/default/light/symbols/animal-m.svg b/data/styles/walking/light/symbols/animal-m.svg similarity index 100% rename from data/styles/default/light/symbols/animal-m.svg rename to data/styles/walking/light/symbols/animal-m.svg diff --git a/data/styles/default/light/symbols/animal_shelter-m.svg b/data/styles/walking/light/symbols/animal_shelter-m.svg similarity index 100% rename from data/styles/default/light/symbols/animal_shelter-m.svg rename to data/styles/walking/light/symbols/animal_shelter-m.svg diff --git a/data/styles/default/light/symbols/antiques-m.svg b/data/styles/walking/light/symbols/antiques-m.svg similarity index 100% rename from data/styles/default/light/symbols/antiques-m.svg rename to data/styles/walking/light/symbols/antiques-m.svg diff --git a/data/styles/default/light/symbols/apartment-m.svg b/data/styles/walking/light/symbols/apartment-m.svg similarity index 100% rename from data/styles/default/light/symbols/apartment-m.svg rename to data/styles/walking/light/symbols/apartment-m.svg diff --git a/data/styles/default/light/symbols/aquarium-m.svg b/data/styles/walking/light/symbols/aquarium-m.svg similarity index 100% rename from data/styles/default/light/symbols/aquarium-m.svg rename to data/styles/walking/light/symbols/aquarium-m.svg diff --git a/data/styles/default/light/symbols/arcade-m.svg b/data/styles/walking/light/symbols/arcade-m.svg similarity index 100% rename from data/styles/default/light/symbols/arcade-m.svg rename to data/styles/walking/light/symbols/arcade-m.svg diff --git a/data/styles/default/light/symbols/archaeological-site-m.svg b/data/styles/walking/light/symbols/archaeological-site-m.svg similarity index 100% rename from data/styles/default/light/symbols/archaeological-site-m.svg rename to data/styles/walking/light/symbols/archaeological-site-m.svg diff --git a/data/styles/default/light/symbols/archery-centre-m.svg b/data/styles/walking/light/symbols/archery-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/archery-centre-m.svg rename to data/styles/walking/light/symbols/archery-centre-m.svg diff --git a/data/styles/default/light/symbols/archery-m.svg b/data/styles/walking/light/symbols/archery-m.svg similarity index 100% rename from data/styles/default/light/symbols/archery-m.svg rename to data/styles/walking/light/symbols/archery-m.svg diff --git a/data/styles/default/light/symbols/arrow-m.svg b/data/styles/walking/light/symbols/arrow-m.svg similarity index 100% rename from data/styles/default/light/symbols/arrow-m.svg rename to data/styles/walking/light/symbols/arrow-m.svg diff --git a/data/styles/default/light/symbols/arrow-s.svg b/data/styles/walking/light/symbols/arrow-s.svg similarity index 100% rename from data/styles/default/light/symbols/arrow-s.svg rename to data/styles/walking/light/symbols/arrow-s.svg diff --git a/data/styles/default/light/symbols/arrow-xs.svg b/data/styles/walking/light/symbols/arrow-xs.svg similarity index 100% rename from data/styles/default/light/symbols/arrow-xs.svg rename to data/styles/walking/light/symbols/arrow-xs.svg diff --git a/data/styles/default/light/symbols/art-m.svg b/data/styles/walking/light/symbols/art-m.svg similarity index 100% rename from data/styles/default/light/symbols/art-m.svg rename to data/styles/walking/light/symbols/art-m.svg diff --git a/data/styles/default/light/symbols/artwork-m.svg b/data/styles/walking/light/symbols/artwork-m.svg similarity index 100% rename from data/styles/default/light/symbols/artwork-m.svg rename to data/styles/walking/light/symbols/artwork-m.svg diff --git a/data/styles/default/light/symbols/assembly_point-m.svg b/data/styles/walking/light/symbols/assembly_point-m.svg similarity index 100% rename from data/styles/default/light/symbols/assembly_point-m.svg rename to data/styles/walking/light/symbols/assembly_point-m.svg diff --git a/data/styles/default/light/symbols/atm-m.svg b/data/styles/walking/light/symbols/atm-m.svg similarity index 100% rename from data/styles/default/light/symbols/atm-m.svg rename to data/styles/walking/light/symbols/atm-m.svg diff --git a/data/styles/default/light/symbols/attraction-m.svg b/data/styles/walking/light/symbols/attraction-m.svg similarity index 100% rename from data/styles/default/light/symbols/attraction-m.svg rename to data/styles/walking/light/symbols/attraction-m.svg diff --git a/data/styles/default/light/symbols/auction-m.svg b/data/styles/walking/light/symbols/auction-m.svg similarity index 100% rename from data/styles/default/light/symbols/auction-m.svg rename to data/styles/walking/light/symbols/auction-m.svg diff --git a/data/styles/default/light/symbols/audiologist-m.svg b/data/styles/walking/light/symbols/audiologist-m.svg similarity index 100% rename from data/styles/default/light/symbols/audiologist-m.svg rename to data/styles/walking/light/symbols/audiologist-m.svg diff --git a/data/styles/default/light/symbols/australian-football-centre-m.svg b/data/styles/walking/light/symbols/australian-football-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/australian-football-centre-m.svg rename to data/styles/walking/light/symbols/australian-football-centre-m.svg diff --git a/data/styles/default/light/symbols/australian-football-m.svg b/data/styles/walking/light/symbols/australian-football-m.svg similarity index 100% rename from data/styles/default/light/symbols/australian-football-m.svg rename to data/styles/walking/light/symbols/australian-football-m.svg diff --git a/data/styles/default/light/symbols/badminton-centre-m.svg b/data/styles/walking/light/symbols/badminton-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/badminton-centre-m.svg rename to data/styles/walking/light/symbols/badminton-centre-m.svg diff --git a/data/styles/default/light/symbols/badminton-m.svg b/data/styles/walking/light/symbols/badminton-m.svg similarity index 100% rename from data/styles/default/light/symbols/badminton-m.svg rename to data/styles/walking/light/symbols/badminton-m.svg diff --git a/data/styles/default/light/symbols/bakery-m.svg b/data/styles/walking/light/symbols/bakery-m.svg similarity index 100% rename from data/styles/default/light/symbols/bakery-m.svg rename to data/styles/walking/light/symbols/bakery-m.svg diff --git a/data/styles/default/light/symbols/bandstand-m.svg b/data/styles/walking/light/symbols/bandstand-m.svg similarity index 100% rename from data/styles/default/light/symbols/bandstand-m.svg rename to data/styles/walking/light/symbols/bandstand-m.svg diff --git a/data/styles/default/light/symbols/bank-m.svg b/data/styles/walking/light/symbols/bank-m.svg similarity index 100% rename from data/styles/default/light/symbols/bank-m.svg rename to data/styles/walking/light/symbols/bank-m.svg diff --git a/data/styles/default/light/symbols/banknote-m.svg b/data/styles/walking/light/symbols/banknote-m.svg similarity index 100% rename from data/styles/default/light/symbols/banknote-m.svg rename to data/styles/walking/light/symbols/banknote-m.svg diff --git a/data/styles/default/light/symbols/bar-m.svg b/data/styles/walking/light/symbols/bar-m.svg similarity index 100% rename from data/styles/default/light/symbols/bar-m.svg rename to data/styles/walking/light/symbols/bar-m.svg diff --git a/data/styles/default/light/symbols/baseball-centre-m.svg b/data/styles/walking/light/symbols/baseball-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/baseball-centre-m.svg rename to data/styles/walking/light/symbols/baseball-centre-m.svg diff --git a/data/styles/default/light/symbols/baseball-m.svg b/data/styles/walking/light/symbols/baseball-m.svg similarity index 100% rename from data/styles/default/light/symbols/baseball-m.svg rename to data/styles/walking/light/symbols/baseball-m.svg diff --git a/data/styles/default/light/symbols/basketball-centre-m.svg b/data/styles/walking/light/symbols/basketball-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/basketball-centre-m.svg rename to data/styles/walking/light/symbols/basketball-centre-m.svg diff --git a/data/styles/default/light/symbols/basketball-m.svg b/data/styles/walking/light/symbols/basketball-m.svg similarity index 100% rename from data/styles/default/light/symbols/basketball-m.svg rename to data/styles/walking/light/symbols/basketball-m.svg diff --git a/data/styles/default/light/symbols/bbq-m.svg b/data/styles/walking/light/symbols/bbq-m.svg similarity index 100% rename from data/styles/default/light/symbols/bbq-m.svg rename to data/styles/walking/light/symbols/bbq-m.svg diff --git a/data/styles/default/light/symbols/bcontrol-m.svg b/data/styles/walking/light/symbols/bcontrol-m.svg similarity index 100% rename from data/styles/default/light/symbols/bcontrol-m.svg rename to data/styles/walking/light/symbols/bcontrol-m.svg diff --git a/data/styles/default/light/symbols/bcontrol-s.svg b/data/styles/walking/light/symbols/bcontrol-s.svg similarity index 100% rename from data/styles/default/light/symbols/bcontrol-s.svg rename to data/styles/walking/light/symbols/bcontrol-s.svg diff --git a/data/styles/default/light/symbols/beach-m.svg b/data/styles/walking/light/symbols/beach-m.svg similarity index 100% rename from data/styles/default/light/symbols/beach-m.svg rename to data/styles/walking/light/symbols/beach-m.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-east-m.svg b/data/styles/walking/light/symbols/beacon-cardinal-east-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-east-m.svg rename to data/styles/walking/light/symbols/beacon-cardinal-east-m.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-east-s.svg b/data/styles/walking/light/symbols/beacon-cardinal-east-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-east-s.svg rename to data/styles/walking/light/symbols/beacon-cardinal-east-s.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-north-m.svg b/data/styles/walking/light/symbols/beacon-cardinal-north-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-north-m.svg rename to data/styles/walking/light/symbols/beacon-cardinal-north-m.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-north-s.svg b/data/styles/walking/light/symbols/beacon-cardinal-north-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-north-s.svg rename to data/styles/walking/light/symbols/beacon-cardinal-north-s.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-south-m.svg b/data/styles/walking/light/symbols/beacon-cardinal-south-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-south-m.svg rename to data/styles/walking/light/symbols/beacon-cardinal-south-m.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-south-s.svg b/data/styles/walking/light/symbols/beacon-cardinal-south-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-south-s.svg rename to data/styles/walking/light/symbols/beacon-cardinal-south-s.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-west-m.svg b/data/styles/walking/light/symbols/beacon-cardinal-west-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-west-m.svg rename to data/styles/walking/light/symbols/beacon-cardinal-west-m.svg diff --git a/data/styles/default/light/symbols/beacon-cardinal-west-s.svg b/data/styles/walking/light/symbols/beacon-cardinal-west-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-cardinal-west-s.svg rename to data/styles/walking/light/symbols/beacon-cardinal-west-s.svg diff --git a/data/styles/default/light/symbols/beacon-isolated_danger-m.svg b/data/styles/walking/light/symbols/beacon-isolated_danger-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-isolated_danger-m.svg rename to data/styles/walking/light/symbols/beacon-isolated_danger-m.svg diff --git a/data/styles/default/light/symbols/beacon-isolated_danger-s.svg b/data/styles/walking/light/symbols/beacon-isolated_danger-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-isolated_danger-s.svg rename to data/styles/walking/light/symbols/beacon-isolated_danger-s.svg diff --git a/data/styles/default/light/symbols/beacon-lateral-port-m.svg b/data/styles/walking/light/symbols/beacon-lateral-port-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-lateral-port-m.svg rename to data/styles/walking/light/symbols/beacon-lateral-port-m.svg diff --git a/data/styles/default/light/symbols/beacon-lateral-port-s.svg b/data/styles/walking/light/symbols/beacon-lateral-port-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-lateral-port-s.svg rename to data/styles/walking/light/symbols/beacon-lateral-port-s.svg diff --git a/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg b/data/styles/walking/light/symbols/beacon-lateral-starboard-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-lateral-starboard-m.svg rename to data/styles/walking/light/symbols/beacon-lateral-starboard-m.svg diff --git a/data/styles/default/light/symbols/beacon-lateral-starboard-s.svg b/data/styles/walking/light/symbols/beacon-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-lateral-starboard-s.svg rename to data/styles/walking/light/symbols/beacon-lateral-starboard-s.svg diff --git a/data/styles/default/light/symbols/beacon-safe_water-m.svg b/data/styles/walking/light/symbols/beacon-safe_water-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-safe_water-m.svg rename to data/styles/walking/light/symbols/beacon-safe_water-m.svg diff --git a/data/styles/default/light/symbols/beacon-safe_water-s.svg b/data/styles/walking/light/symbols/beacon-safe_water-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-safe_water-s.svg rename to data/styles/walking/light/symbols/beacon-safe_water-s.svg diff --git a/data/styles/default/light/symbols/beacon-special_purpose-m.svg b/data/styles/walking/light/symbols/beacon-special_purpose-m.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-special_purpose-m.svg rename to data/styles/walking/light/symbols/beacon-special_purpose-m.svg diff --git a/data/styles/default/light/symbols/beacon-special_purpose-s.svg b/data/styles/walking/light/symbols/beacon-special_purpose-s.svg similarity index 100% rename from data/styles/default/light/symbols/beacon-special_purpose-s.svg rename to data/styles/walking/light/symbols/beacon-special_purpose-s.svg diff --git a/data/styles/default/light/symbols/beauty-m.svg b/data/styles/walking/light/symbols/beauty-m.svg similarity index 100% rename from data/styles/default/light/symbols/beauty-m.svg rename to data/styles/walking/light/symbols/beauty-m.svg diff --git a/data/styles/default/light/symbols/beekeeper-m.svg b/data/styles/walking/light/symbols/beekeeper-m.svg similarity index 100% rename from data/styles/default/light/symbols/beekeeper-m.svg rename to data/styles/walking/light/symbols/beekeeper-m.svg diff --git a/data/styles/default/light/symbols/bench.svg b/data/styles/walking/light/symbols/bench.svg similarity index 100% rename from data/styles/default/light/symbols/bench.svg rename to data/styles/walking/light/symbols/bench.svg diff --git a/data/styles/default/light/symbols/bench_backless.svg b/data/styles/walking/light/symbols/bench_backless.svg similarity index 100% rename from data/styles/default/light/symbols/bench_backless.svg rename to data/styles/walking/light/symbols/bench_backless.svg diff --git a/data/styles/default/light/symbols/bicycle-parking-covered-m.svg b/data/styles/walking/light/symbols/bicycle-parking-covered-m.svg similarity index 100% rename from data/styles/default/light/symbols/bicycle-parking-covered-m.svg rename to data/styles/walking/light/symbols/bicycle-parking-covered-m.svg diff --git a/data/styles/default/light/symbols/bicycle-parking-m.svg b/data/styles/walking/light/symbols/bicycle-parking-m.svg similarity index 100% rename from data/styles/default/light/symbols/bicycle-parking-m.svg rename to data/styles/walking/light/symbols/bicycle-parking-m.svg diff --git a/data/styles/default/light/symbols/bicycle-rental-xm.svg b/data/styles/walking/light/symbols/bicycle-rental-xm.svg similarity index 100% rename from data/styles/default/light/symbols/bicycle-rental-xm.svg rename to data/styles/walking/light/symbols/bicycle-rental-xm.svg diff --git a/data/styles/default/light/symbols/bicycle-repair-station.svg b/data/styles/walking/light/symbols/bicycle-repair-station.svg similarity index 100% rename from data/styles/default/light/symbols/bicycle-repair-station.svg rename to data/styles/walking/light/symbols/bicycle-repair-station.svg diff --git a/data/styles/default/light/symbols/blacksmith-m.svg b/data/styles/walking/light/symbols/blacksmith-m.svg similarity index 100% rename from data/styles/default/light/symbols/blacksmith-m.svg rename to data/styles/walking/light/symbols/blacksmith-m.svg diff --git a/data/styles/default/light/symbols/blood_donation-m.svg b/data/styles/walking/light/symbols/blood_donation-m.svg similarity index 100% rename from data/styles/default/light/symbols/blood_donation-m.svg rename to data/styles/walking/light/symbols/blood_donation-m.svg diff --git a/data/styles/default/light/symbols/board.svg b/data/styles/walking/light/symbols/board.svg similarity index 100% rename from data/styles/default/light/symbols/board.svg rename to data/styles/walking/light/symbols/board.svg diff --git a/data/styles/default/light/symbols/boat_rental-m.svg b/data/styles/walking/light/symbols/boat_rental-m.svg similarity index 100% rename from data/styles/default/light/symbols/boat_rental-m.svg rename to data/styles/walking/light/symbols/boat_rental-m.svg diff --git a/data/styles/default/light/symbols/boating_school-m.svg b/data/styles/walking/light/symbols/boating_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/boating_school-m.svg rename to data/styles/walking/light/symbols/boating_school-m.svg diff --git a/data/styles/default/light/symbols/book-shop-m.svg b/data/styles/walking/light/symbols/book-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/book-shop-m.svg rename to data/styles/walking/light/symbols/book-shop-m.svg diff --git a/data/styles/default/light/symbols/bookcase-m.svg b/data/styles/walking/light/symbols/bookcase-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookcase-m.svg rename to data/styles/walking/light/symbols/bookcase-m.svg diff --git a/data/styles/default/light/symbols/bookmark-animals-m.svg b/data/styles/walking/light/symbols/bookmark-animals-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-animals-m.svg rename to data/styles/walking/light/symbols/bookmark-animals-m.svg diff --git a/data/styles/default/light/symbols/bookmark-art-m.svg b/data/styles/walking/light/symbols/bookmark-art-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-art-m.svg rename to data/styles/walking/light/symbols/bookmark-art-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bank-m.svg b/data/styles/walking/light/symbols/bookmark-bank-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bank-m.svg rename to data/styles/walking/light/symbols/bookmark-bank-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bar-m.svg b/data/styles/walking/light/symbols/bookmark-bar-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bar-m.svg rename to data/styles/walking/light/symbols/bookmark-bar-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bg-m.svg b/data/styles/walking/light/symbols/bookmark-bg-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bg-m.svg rename to data/styles/walking/light/symbols/bookmark-bg-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bg-s.svg b/data/styles/walking/light/symbols/bookmark-bg-s.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bg-s.svg rename to data/styles/walking/light/symbols/bookmark-bg-s.svg diff --git a/data/styles/default/light/symbols/bookmark-bg-xs.svg b/data/styles/walking/light/symbols/bookmark-bg-xs.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bg-xs.svg rename to data/styles/walking/light/symbols/bookmark-bg-xs.svg diff --git a/data/styles/default/light/symbols/bookmark-bicycle_parking-m.svg b/data/styles/walking/light/symbols/bookmark-bicycle_parking-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bicycle_parking-m.svg rename to data/styles/walking/light/symbols/bookmark-bicycle_parking-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bicycle_parking_covered-m.svg b/data/styles/walking/light/symbols/bookmark-bicycle_parking_covered-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bicycle_parking_covered-m.svg rename to data/styles/walking/light/symbols/bookmark-bicycle_parking_covered-m.svg diff --git a/data/styles/default/light/symbols/bookmark-bicycle_rental-m.svg b/data/styles/walking/light/symbols/bookmark-bicycle_rental-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-bicycle_rental-m.svg rename to data/styles/walking/light/symbols/bookmark-bicycle_rental-m.svg diff --git a/data/styles/default/light/symbols/bookmark-buddhism-m.svg b/data/styles/walking/light/symbols/bookmark-buddhism-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-buddhism-m.svg rename to data/styles/walking/light/symbols/bookmark-buddhism-m.svg diff --git a/data/styles/default/light/symbols/bookmark-building-m.svg b/data/styles/walking/light/symbols/bookmark-building-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-building-m.svg rename to data/styles/walking/light/symbols/bookmark-building-m.svg diff --git a/data/styles/default/light/symbols/bookmark-cafe-m.svg b/data/styles/walking/light/symbols/bookmark-cafe-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-cafe-m.svg rename to data/styles/walking/light/symbols/bookmark-cafe-m.svg diff --git a/data/styles/default/light/symbols/bookmark-charging_station-m.svg b/data/styles/walking/light/symbols/bookmark-charging_station-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-charging_station-m.svg rename to data/styles/walking/light/symbols/bookmark-charging_station-m.svg diff --git a/data/styles/default/light/symbols/bookmark-christianity-m.svg b/data/styles/walking/light/symbols/bookmark-christianity-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-christianity-m.svg rename to data/styles/walking/light/symbols/bookmark-christianity-m.svg diff --git a/data/styles/default/light/symbols/bookmark-default-m.svg b/data/styles/walking/light/symbols/bookmark-default-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-default-m.svg rename to data/styles/walking/light/symbols/bookmark-default-m.svg diff --git a/data/styles/default/light/symbols/bookmark-default-s.svg b/data/styles/walking/light/symbols/bookmark-default-s.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-default-s.svg rename to data/styles/walking/light/symbols/bookmark-default-s.svg diff --git a/data/styles/default/light/symbols/bookmark-default-xs.svg b/data/styles/walking/light/symbols/bookmark-default-xs.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-default-xs.svg rename to data/styles/walking/light/symbols/bookmark-default-xs.svg diff --git a/data/styles/default/light/symbols/bookmark-entertainment-m.svg b/data/styles/walking/light/symbols/bookmark-entertainment-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-entertainment-m.svg rename to data/styles/walking/light/symbols/bookmark-entertainment-m.svg diff --git a/data/styles/default/light/symbols/bookmark-exchange-m.svg b/data/styles/walking/light/symbols/bookmark-exchange-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-exchange-m.svg rename to data/styles/walking/light/symbols/bookmark-exchange-m.svg diff --git a/data/styles/default/light/symbols/bookmark-fast_food-m.svg b/data/styles/walking/light/symbols/bookmark-fast_food-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-fast_food-m.svg rename to data/styles/walking/light/symbols/bookmark-fast_food-m.svg diff --git a/data/styles/default/light/symbols/bookmark-gas-m.svg b/data/styles/walking/light/symbols/bookmark-gas-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-gas-m.svg rename to data/styles/walking/light/symbols/bookmark-gas-m.svg diff --git a/data/styles/default/light/symbols/bookmark-hotel-m.svg b/data/styles/walking/light/symbols/bookmark-hotel-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-hotel-m.svg rename to data/styles/walking/light/symbols/bookmark-hotel-m.svg diff --git a/data/styles/default/light/symbols/bookmark-information-m.svg b/data/styles/walking/light/symbols/bookmark-information-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-information-m.svg rename to data/styles/walking/light/symbols/bookmark-information-m.svg diff --git a/data/styles/default/light/symbols/bookmark-islam-m.svg b/data/styles/walking/light/symbols/bookmark-islam-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-islam-m.svg rename to data/styles/walking/light/symbols/bookmark-islam-m.svg diff --git a/data/styles/default/light/symbols/bookmark-judaism-m.svg b/data/styles/walking/light/symbols/bookmark-judaism-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-judaism-m.svg rename to data/styles/walking/light/symbols/bookmark-judaism-m.svg diff --git a/data/styles/default/light/symbols/bookmark-medicine-m.svg b/data/styles/walking/light/symbols/bookmark-medicine-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-medicine-m.svg rename to data/styles/walking/light/symbols/bookmark-medicine-m.svg diff --git a/data/styles/default/light/symbols/bookmark-mountain-m.svg b/data/styles/walking/light/symbols/bookmark-mountain-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-mountain-m.svg rename to data/styles/walking/light/symbols/bookmark-mountain-m.svg diff --git a/data/styles/default/light/symbols/bookmark-museum-m.svg b/data/styles/walking/light/symbols/bookmark-museum-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-museum-m.svg rename to data/styles/walking/light/symbols/bookmark-museum-m.svg diff --git a/data/styles/default/light/symbols/bookmark-park-m.svg b/data/styles/walking/light/symbols/bookmark-park-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-park-m.svg rename to data/styles/walking/light/symbols/bookmark-park-m.svg diff --git a/data/styles/default/light/symbols/bookmark-parking-m.svg b/data/styles/walking/light/symbols/bookmark-parking-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-parking-m.svg rename to data/styles/walking/light/symbols/bookmark-parking-m.svg diff --git a/data/styles/default/light/symbols/bookmark-pharmacy-m.svg b/data/styles/walking/light/symbols/bookmark-pharmacy-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-pharmacy-m.svg rename to data/styles/walking/light/symbols/bookmark-pharmacy-m.svg diff --git a/data/styles/default/light/symbols/bookmark-pub-m.svg b/data/styles/walking/light/symbols/bookmark-pub-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-pub-m.svg rename to data/styles/walking/light/symbols/bookmark-pub-m.svg diff --git a/data/styles/default/light/symbols/bookmark-restaurant-m.svg b/data/styles/walking/light/symbols/bookmark-restaurant-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-restaurant-m.svg rename to data/styles/walking/light/symbols/bookmark-restaurant-m.svg diff --git a/data/styles/default/light/symbols/bookmark-shop-m.svg b/data/styles/walking/light/symbols/bookmark-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-shop-m.svg rename to data/styles/walking/light/symbols/bookmark-shop-m.svg diff --git a/data/styles/default/light/symbols/bookmark-sights-m.svg b/data/styles/walking/light/symbols/bookmark-sights-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-sights-m.svg rename to data/styles/walking/light/symbols/bookmark-sights-m.svg diff --git a/data/styles/default/light/symbols/bookmark-sport-m.svg b/data/styles/walking/light/symbols/bookmark-sport-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-sport-m.svg rename to data/styles/walking/light/symbols/bookmark-sport-m.svg diff --git a/data/styles/default/light/symbols/bookmark-stadium-m.svg b/data/styles/walking/light/symbols/bookmark-stadium-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-stadium-m.svg rename to data/styles/walking/light/symbols/bookmark-stadium-m.svg diff --git a/data/styles/default/light/symbols/bookmark-swim-m.svg b/data/styles/walking/light/symbols/bookmark-swim-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-swim-m.svg rename to data/styles/walking/light/symbols/bookmark-swim-m.svg diff --git a/data/styles/default/light/symbols/bookmark-theatre-m.svg b/data/styles/walking/light/symbols/bookmark-theatre-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-theatre-m.svg rename to data/styles/walking/light/symbols/bookmark-theatre-m.svg diff --git a/data/styles/default/light/symbols/bookmark-transport-m.svg b/data/styles/walking/light/symbols/bookmark-transport-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-transport-m.svg rename to data/styles/walking/light/symbols/bookmark-transport-m.svg diff --git a/data/styles/default/light/symbols/bookmark-viewpoint-m.svg b/data/styles/walking/light/symbols/bookmark-viewpoint-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-viewpoint-m.svg rename to data/styles/walking/light/symbols/bookmark-viewpoint-m.svg diff --git a/data/styles/default/light/symbols/bookmark-water-m.svg b/data/styles/walking/light/symbols/bookmark-water-m.svg similarity index 100% rename from data/styles/default/light/symbols/bookmark-water-m.svg rename to data/styles/walking/light/symbols/bookmark-water-m.svg diff --git a/data/styles/default/light/symbols/boules-centre-m.svg b/data/styles/walking/light/symbols/boules-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/boules-centre-m.svg rename to data/styles/walking/light/symbols/boules-centre-m.svg diff --git a/data/styles/default/light/symbols/boules-m.svg b/data/styles/walking/light/symbols/boules-m.svg similarity index 100% rename from data/styles/default/light/symbols/boules-m.svg rename to data/styles/walking/light/symbols/boules-m.svg diff --git a/data/styles/default/light/symbols/bowling-m.svg b/data/styles/walking/light/symbols/bowling-m.svg similarity index 100% rename from data/styles/default/light/symbols/bowling-m.svg rename to data/styles/walking/light/symbols/bowling-m.svg diff --git a/data/styles/default/light/symbols/bowling_alley-m.svg b/data/styles/walking/light/symbols/bowling_alley-m.svg similarity index 100% rename from data/styles/default/light/symbols/bowling_alley-m.svg rename to data/styles/walking/light/symbols/bowling_alley-m.svg diff --git a/data/styles/default/light/symbols/brewery-m.svg b/data/styles/walking/light/symbols/brewery-m.svg similarity index 100% rename from data/styles/default/light/symbols/brewery-m.svg rename to data/styles/walking/light/symbols/brewery-m.svg diff --git a/data/styles/default/light/symbols/buddhist-m.svg b/data/styles/walking/light/symbols/buddhist-m.svg similarity index 100% rename from data/styles/default/light/symbols/buddhist-m.svg rename to data/styles/walking/light/symbols/buddhist-m.svg diff --git a/data/styles/default/light/symbols/buddhist-s.svg b/data/styles/walking/light/symbols/buddhist-s.svg similarity index 100% rename from data/styles/default/light/symbols/buddhist-s.svg rename to data/styles/walking/light/symbols/buddhist-s.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-east-m.svg b/data/styles/walking/light/symbols/buoy-cardinal-east-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-east-m.svg rename to data/styles/walking/light/symbols/buoy-cardinal-east-m.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-east-s.svg b/data/styles/walking/light/symbols/buoy-cardinal-east-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-east-s.svg rename to data/styles/walking/light/symbols/buoy-cardinal-east-s.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-north-m.svg b/data/styles/walking/light/symbols/buoy-cardinal-north-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-north-m.svg rename to data/styles/walking/light/symbols/buoy-cardinal-north-m.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-north-s.svg b/data/styles/walking/light/symbols/buoy-cardinal-north-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-north-s.svg rename to data/styles/walking/light/symbols/buoy-cardinal-north-s.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-south-m.svg b/data/styles/walking/light/symbols/buoy-cardinal-south-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-south-m.svg rename to data/styles/walking/light/symbols/buoy-cardinal-south-m.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-south-s.svg b/data/styles/walking/light/symbols/buoy-cardinal-south-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-south-s.svg rename to data/styles/walking/light/symbols/buoy-cardinal-south-s.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-west-m.svg b/data/styles/walking/light/symbols/buoy-cardinal-west-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-west-m.svg rename to data/styles/walking/light/symbols/buoy-cardinal-west-m.svg diff --git a/data/styles/default/light/symbols/buoy-cardinal-west-s.svg b/data/styles/walking/light/symbols/buoy-cardinal-west-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-cardinal-west-s.svg rename to data/styles/walking/light/symbols/buoy-cardinal-west-s.svg diff --git a/data/styles/default/light/symbols/buoy-isolated_danger-m.svg b/data/styles/walking/light/symbols/buoy-isolated_danger-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-isolated_danger-m.svg rename to data/styles/walking/light/symbols/buoy-isolated_danger-m.svg diff --git a/data/styles/default/light/symbols/buoy-isolated_danger-s.svg b/data/styles/walking/light/symbols/buoy-isolated_danger-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-isolated_danger-s.svg rename to data/styles/walking/light/symbols/buoy-isolated_danger-s.svg diff --git a/data/styles/default/light/symbols/buoy-lateral-port-m.svg b/data/styles/walking/light/symbols/buoy-lateral-port-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-lateral-port-m.svg rename to data/styles/walking/light/symbols/buoy-lateral-port-m.svg diff --git a/data/styles/default/light/symbols/buoy-lateral-port-s.svg b/data/styles/walking/light/symbols/buoy-lateral-port-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-lateral-port-s.svg rename to data/styles/walking/light/symbols/buoy-lateral-port-s.svg diff --git a/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg b/data/styles/walking/light/symbols/buoy-lateral-starboard-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-lateral-starboard-m.svg rename to data/styles/walking/light/symbols/buoy-lateral-starboard-m.svg diff --git a/data/styles/default/light/symbols/buoy-lateral-starboard-s.svg b/data/styles/walking/light/symbols/buoy-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-lateral-starboard-s.svg rename to data/styles/walking/light/symbols/buoy-lateral-starboard-s.svg diff --git a/data/styles/default/light/symbols/buoy-safe_water-m.svg b/data/styles/walking/light/symbols/buoy-safe_water-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-safe_water-m.svg rename to data/styles/walking/light/symbols/buoy-safe_water-m.svg diff --git a/data/styles/default/light/symbols/buoy-safe_water-s.svg b/data/styles/walking/light/symbols/buoy-safe_water-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-safe_water-s.svg rename to data/styles/walking/light/symbols/buoy-safe_water-s.svg diff --git a/data/styles/default/light/symbols/buoy-special_purpose-m.svg b/data/styles/walking/light/symbols/buoy-special_purpose-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-special_purpose-m.svg rename to data/styles/walking/light/symbols/buoy-special_purpose-m.svg diff --git a/data/styles/default/light/symbols/buoy-special_purpose-s.svg b/data/styles/walking/light/symbols/buoy-special_purpose-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-special_purpose-s.svg rename to data/styles/walking/light/symbols/buoy-special_purpose-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-east-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-east-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-east-s.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-east-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-east-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-east-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-north-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-north-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-north-s.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-north-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-north-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-north-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-south-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-south-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-south-s.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-south-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-south-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-south-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-west-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-west-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-cardinal-west-s.svg b/data/styles/walking/light/symbols/buoy-spherical-cardinal-west-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-cardinal-west-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-cardinal-west-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg b/data/styles/walking/light/symbols/buoy-spherical-isolated_danger-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-isolated_danger-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-isolated_danger-s.svg b/data/styles/walking/light/symbols/buoy-spherical-isolated_danger-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-isolated_danger-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-isolated_danger-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg b/data/styles/walking/light/symbols/buoy-spherical-lateral-port-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-lateral-port-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-port-s.svg b/data/styles/walking/light/symbols/buoy-spherical-lateral-port-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-lateral-port-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-lateral-port-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg b/data/styles/walking/light/symbols/buoy-spherical-lateral-starboard-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-lateral-starboard-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-s.svg b/data/styles/walking/light/symbols/buoy-spherical-lateral-starboard-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-lateral-starboard-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-lateral-starboard-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg b/data/styles/walking/light/symbols/buoy-spherical-safe_water-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-safe_water-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-safe_water-s.svg b/data/styles/walking/light/symbols/buoy-spherical-safe_water-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-safe_water-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-safe_water-s.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg b/data/styles/walking/light/symbols/buoy-spherical-special_purpose-m.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg rename to data/styles/walking/light/symbols/buoy-spherical-special_purpose-m.svg diff --git a/data/styles/default/light/symbols/buoy-spherical-special_purpose-s.svg b/data/styles/walking/light/symbols/buoy-spherical-special_purpose-s.svg similarity index 100% rename from data/styles/default/light/symbols/buoy-spherical-special_purpose-s.svg rename to data/styles/walking/light/symbols/buoy-spherical-special_purpose-s.svg diff --git a/data/styles/default/light/symbols/bus-xm.svg b/data/styles/walking/light/symbols/bus-xm.svg similarity index 100% rename from data/styles/default/light/symbols/bus-xm.svg rename to data/styles/walking/light/symbols/bus-xm.svg diff --git a/data/styles/default/light/symbols/bus-xs.svg b/data/styles/walking/light/symbols/bus-xs.svg similarity index 100% rename from data/styles/default/light/symbols/bus-xs.svg rename to data/styles/walking/light/symbols/bus-xs.svg diff --git a/data/styles/default/light/symbols/bus-xvs.svg b/data/styles/walking/light/symbols/bus-xvs.svg similarity index 100% rename from data/styles/default/light/symbols/bus-xvs.svg rename to data/styles/walking/light/symbols/bus-xvs.svg diff --git a/data/styles/default/light/symbols/buses-m.svg b/data/styles/walking/light/symbols/buses-m.svg similarity index 100% rename from data/styles/default/light/symbols/buses-m.svg rename to data/styles/walking/light/symbols/buses-m.svg diff --git a/data/styles/default/light/symbols/buses-s.svg b/data/styles/walking/light/symbols/buses-s.svg similarity index 100% rename from data/styles/default/light/symbols/buses-s.svg rename to data/styles/walking/light/symbols/buses-s.svg diff --git a/data/styles/default/light/symbols/butcher-m.svg b/data/styles/walking/light/symbols/butcher-m.svg similarity index 100% rename from data/styles/default/light/symbols/butcher-m.svg rename to data/styles/walking/light/symbols/butcher-m.svg diff --git a/data/styles/default/light/symbols/cable-car-m.svg b/data/styles/walking/light/symbols/cable-car-m.svg similarity index 100% rename from data/styles/default/light/symbols/cable-car-m.svg rename to data/styles/walking/light/symbols/cable-car-m.svg diff --git a/data/styles/default/light/symbols/cable-car-s.svg b/data/styles/walking/light/symbols/cable-car-s.svg similarity index 100% rename from data/styles/default/light/symbols/cable-car-s.svg rename to data/styles/walking/light/symbols/cable-car-s.svg diff --git a/data/styles/default/light/symbols/cafe-m.svg b/data/styles/walking/light/symbols/cafe-m.svg similarity index 100% rename from data/styles/default/light/symbols/cafe-m.svg rename to data/styles/walking/light/symbols/cafe-m.svg diff --git a/data/styles/default/light/symbols/cairn-m.svg b/data/styles/walking/light/symbols/cairn-m.svg similarity index 100% rename from data/styles/default/light/symbols/cairn-m.svg rename to data/styles/walking/light/symbols/cairn-m.svg diff --git a/data/styles/default/light/symbols/campsite-m.svg b/data/styles/walking/light/symbols/campsite-m.svg similarity index 100% rename from data/styles/default/light/symbols/campsite-m.svg rename to data/styles/walking/light/symbols/campsite-m.svg diff --git a/data/styles/default/light/symbols/campsite-s.svg b/data/styles/walking/light/symbols/campsite-s.svg similarity index 100% rename from data/styles/default/light/symbols/campsite-s.svg rename to data/styles/walking/light/symbols/campsite-s.svg diff --git a/data/styles/default/light/symbols/cannon-m.svg b/data/styles/walking/light/symbols/cannon-m.svg similarity index 100% rename from data/styles/default/light/symbols/cannon-m.svg rename to data/styles/walking/light/symbols/cannon-m.svg diff --git a/data/styles/default/light/symbols/car-part-m.svg b/data/styles/walking/light/symbols/car-part-m.svg similarity index 100% rename from data/styles/default/light/symbols/car-part-m.svg rename to data/styles/walking/light/symbols/car-part-m.svg diff --git a/data/styles/default/light/symbols/car-repair-m.svg b/data/styles/walking/light/symbols/car-repair-m.svg similarity index 100% rename from data/styles/default/light/symbols/car-repair-m.svg rename to data/styles/walking/light/symbols/car-repair-m.svg diff --git a/data/styles/default/light/symbols/car-repair-s.svg b/data/styles/walking/light/symbols/car-repair-s.svg similarity index 100% rename from data/styles/default/light/symbols/car-repair-s.svg rename to data/styles/walking/light/symbols/car-repair-s.svg diff --git a/data/styles/default/light/symbols/car-wash-m.svg b/data/styles/walking/light/symbols/car-wash-m.svg similarity index 100% rename from data/styles/default/light/symbols/car-wash-m.svg rename to data/styles/walking/light/symbols/car-wash-m.svg diff --git a/data/styles/default/light/symbols/car_sharing-m.svg b/data/styles/walking/light/symbols/car_sharing-m.svg similarity index 100% rename from data/styles/default/light/symbols/car_sharing-m.svg rename to data/styles/walking/light/symbols/car_sharing-m.svg diff --git a/data/styles/default/light/symbols/car_shop-m.svg b/data/styles/walking/light/symbols/car_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/car_shop-m.svg rename to data/styles/walking/light/symbols/car_shop-m.svg diff --git a/data/styles/default/light/symbols/caravan-shop-m.svg b/data/styles/walking/light/symbols/caravan-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/caravan-shop-m.svg rename to data/styles/walking/light/symbols/caravan-shop-m.svg diff --git a/data/styles/default/light/symbols/caravan_site-m.svg b/data/styles/walking/light/symbols/caravan_site-m.svg similarity index 100% rename from data/styles/default/light/symbols/caravan_site-m.svg rename to data/styles/walking/light/symbols/caravan_site-m.svg diff --git a/data/styles/default/light/symbols/caravan_site-s.svg b/data/styles/walking/light/symbols/caravan_site-s.svg similarity index 100% rename from data/styles/default/light/symbols/caravan_site-s.svg rename to data/styles/walking/light/symbols/caravan_site-s.svg diff --git a/data/styles/default/light/symbols/carpenter-m.svg b/data/styles/walking/light/symbols/carpenter-m.svg similarity index 100% rename from data/styles/default/light/symbols/carpenter-m.svg rename to data/styles/walking/light/symbols/carpenter-m.svg diff --git a/data/styles/default/light/symbols/casino-m.svg b/data/styles/walking/light/symbols/casino-m.svg similarity index 100% rename from data/styles/default/light/symbols/casino-m.svg rename to data/styles/walking/light/symbols/casino-m.svg diff --git a/data/styles/default/light/symbols/castle-m.svg b/data/styles/walking/light/symbols/castle-m.svg similarity index 100% rename from data/styles/default/light/symbols/castle-m.svg rename to data/styles/walking/light/symbols/castle-m.svg diff --git a/data/styles/default/light/symbols/castle-s.svg b/data/styles/walking/light/symbols/castle-s.svg similarity index 100% rename from data/styles/default/light/symbols/castle-s.svg rename to data/styles/walking/light/symbols/castle-s.svg diff --git a/data/styles/default/light/symbols/caterer-m.svg b/data/styles/walking/light/symbols/caterer-m.svg similarity index 100% rename from data/styles/default/light/symbols/caterer-m.svg rename to data/styles/walking/light/symbols/caterer-m.svg diff --git a/data/styles/default/light/symbols/cave-m.svg b/data/styles/walking/light/symbols/cave-m.svg similarity index 100% rename from data/styles/default/light/symbols/cave-m.svg rename to data/styles/walking/light/symbols/cave-m.svg diff --git a/data/styles/default/light/symbols/cave-s.svg b/data/styles/walking/light/symbols/cave-s.svg similarity index 100% rename from data/styles/default/light/symbols/cave-s.svg rename to data/styles/walking/light/symbols/cave-s.svg diff --git a/data/styles/default/light/symbols/cemetery-m.svg b/data/styles/walking/light/symbols/cemetery-m.svg similarity index 100% rename from data/styles/default/light/symbols/cemetery-m.svg rename to data/styles/walking/light/symbols/cemetery-m.svg diff --git a/data/styles/default/light/symbols/cemetery-s.svg b/data/styles/walking/light/symbols/cemetery-s.svg similarity index 100% rename from data/styles/default/light/symbols/cemetery-s.svg rename to data/styles/walking/light/symbols/cemetery-s.svg diff --git a/data/styles/default/light/symbols/charging_station-m.svg b/data/styles/walking/light/symbols/charging_station-m.svg similarity index 100% rename from data/styles/default/light/symbols/charging_station-m.svg rename to data/styles/walking/light/symbols/charging_station-m.svg diff --git a/data/styles/default/light/symbols/charging_station-s.svg b/data/styles/walking/light/symbols/charging_station-s.svg similarity index 100% rename from data/styles/default/light/symbols/charging_station-s.svg rename to data/styles/walking/light/symbols/charging_station-s.svg diff --git a/data/styles/default/light/symbols/charging_station-small-m.svg b/data/styles/walking/light/symbols/charging_station-small-m.svg similarity index 100% rename from data/styles/default/light/symbols/charging_station-small-m.svg rename to data/styles/walking/light/symbols/charging_station-small-m.svg diff --git a/data/styles/default/light/symbols/charging_station-small-s.svg b/data/styles/walking/light/symbols/charging_station-small-s.svg similarity index 100% rename from data/styles/default/light/symbols/charging_station-small-s.svg rename to data/styles/walking/light/symbols/charging_station-small-s.svg diff --git a/data/styles/default/light/symbols/charity_shop-m.svg b/data/styles/walking/light/symbols/charity_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/charity_shop-m.svg rename to data/styles/walking/light/symbols/charity_shop-m.svg diff --git a/data/styles/default/light/symbols/cheese-m.svg b/data/styles/walking/light/symbols/cheese-m.svg similarity index 100% rename from data/styles/default/light/symbols/cheese-m.svg rename to data/styles/walking/light/symbols/cheese-m.svg diff --git a/data/styles/default/light/symbols/chemist-m.svg b/data/styles/walking/light/symbols/chemist-m.svg similarity index 100% rename from data/styles/default/light/symbols/chemist-m.svg rename to data/styles/walking/light/symbols/chemist-m.svg diff --git a/data/styles/default/light/symbols/chess-m.svg b/data/styles/walking/light/symbols/chess-m.svg similarity index 100% rename from data/styles/default/light/symbols/chess-m.svg rename to data/styles/walking/light/symbols/chess-m.svg diff --git a/data/styles/default/light/symbols/chimney-m.svg b/data/styles/walking/light/symbols/chimney-m.svg similarity index 100% rename from data/styles/default/light/symbols/chimney-m.svg rename to data/styles/walking/light/symbols/chimney-m.svg diff --git a/data/styles/default/light/symbols/christian-m.svg b/data/styles/walking/light/symbols/christian-m.svg similarity index 100% rename from data/styles/default/light/symbols/christian-m.svg rename to data/styles/walking/light/symbols/christian-m.svg diff --git a/data/styles/default/light/symbols/christian-s.svg b/data/styles/walking/light/symbols/christian-s.svg similarity index 100% rename from data/styles/default/light/symbols/christian-s.svg rename to data/styles/walking/light/symbols/christian-s.svg diff --git a/data/styles/default/light/symbols/christmas-tree-m.svg b/data/styles/walking/light/symbols/christmas-tree-m.svg similarity index 100% rename from data/styles/default/light/symbols/christmas-tree-m.svg rename to data/styles/walking/light/symbols/christmas-tree-m.svg diff --git a/data/styles/default/light/symbols/cinema-m.svg b/data/styles/walking/light/symbols/cinema-m.svg similarity index 100% rename from data/styles/default/light/symbols/cinema-m.svg rename to data/styles/walking/light/symbols/cinema-m.svg diff --git a/data/styles/default/light/symbols/climbing-centre-m.svg b/data/styles/walking/light/symbols/climbing-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/climbing-centre-m.svg rename to data/styles/walking/light/symbols/climbing-centre-m.svg diff --git a/data/styles/default/light/symbols/climbing-m.svg b/data/styles/walking/light/symbols/climbing-m.svg similarity index 100% rename from data/styles/default/light/symbols/climbing-m.svg rename to data/styles/walking/light/symbols/climbing-m.svg diff --git a/data/styles/default/light/symbols/clinic-m.svg b/data/styles/walking/light/symbols/clinic-m.svg similarity index 100% rename from data/styles/default/light/symbols/clinic-m.svg rename to data/styles/walking/light/symbols/clinic-m.svg diff --git a/data/styles/default/light/symbols/clothes-m.svg b/data/styles/walking/light/symbols/clothes-m.svg similarity index 100% rename from data/styles/default/light/symbols/clothes-m.svg rename to data/styles/walking/light/symbols/clothes-m.svg diff --git a/data/styles/default/light/symbols/college-m.svg b/data/styles/walking/light/symbols/college-m.svg similarity index 100% rename from data/styles/default/light/symbols/college-m.svg rename to data/styles/walking/light/symbols/college-m.svg diff --git a/data/styles/default/light/symbols/college-s.svg b/data/styles/walking/light/symbols/college-s.svg similarity index 100% rename from data/styles/default/light/symbols/college-s.svg rename to data/styles/walking/light/symbols/college-s.svg diff --git a/data/styles/default/light/symbols/coloredmark-bg-l.svg b/data/styles/walking/light/symbols/coloredmark-bg-l.svg similarity index 100% rename from data/styles/default/light/symbols/coloredmark-bg-l.svg rename to data/styles/walking/light/symbols/coloredmark-bg-l.svg diff --git a/data/styles/default/light/symbols/coloredmark-bg-s.svg b/data/styles/walking/light/symbols/coloredmark-bg-s.svg similarity index 100% rename from data/styles/default/light/symbols/coloredmark-bg-s.svg rename to data/styles/walking/light/symbols/coloredmark-bg-s.svg diff --git a/data/styles/default/light/symbols/coloredmark-default-l.svg b/data/styles/walking/light/symbols/coloredmark-default-l.svg similarity index 100% rename from data/styles/default/light/symbols/coloredmark-default-l.svg rename to data/styles/walking/light/symbols/coloredmark-default-l.svg diff --git a/data/styles/default/light/symbols/coloredmark-default-s.svg b/data/styles/walking/light/symbols/coloredmark-default-s.svg similarity index 100% rename from data/styles/default/light/symbols/coloredmark-default-s.svg rename to data/styles/walking/light/symbols/coloredmark-default-s.svg diff --git a/data/styles/default/light/symbols/communications_mast-m.svg b/data/styles/walking/light/symbols/communications_mast-m.svg similarity index 100% rename from data/styles/default/light/symbols/communications_mast-m.svg rename to data/styles/walking/light/symbols/communications_mast-m.svg diff --git a/data/styles/default/light/symbols/communications_tower_major-m.svg b/data/styles/walking/light/symbols/communications_tower_major-m.svg similarity index 100% rename from data/styles/default/light/symbols/communications_tower_major-m.svg rename to data/styles/walking/light/symbols/communications_tower_major-m.svg diff --git a/data/styles/default/light/symbols/communications_tower_major-s.svg b/data/styles/walking/light/symbols/communications_tower_major-s.svg similarity index 100% rename from data/styles/default/light/symbols/communications_tower_major-s.svg rename to data/styles/walking/light/symbols/communications_tower_major-s.svg diff --git a/data/styles/default/light/symbols/communications_tower_minor-m.svg b/data/styles/walking/light/symbols/communications_tower_minor-m.svg similarity index 100% rename from data/styles/default/light/symbols/communications_tower_minor-m.svg rename to data/styles/walking/light/symbols/communications_tower_minor-m.svg diff --git a/data/styles/default/light/symbols/community-m.svg b/data/styles/walking/light/symbols/community-m.svg similarity index 100% rename from data/styles/default/light/symbols/community-m.svg rename to data/styles/walking/light/symbols/community-m.svg diff --git a/data/styles/walking/light/symbols/compass.svg b/data/styles/walking/light/symbols/compass.svg new file mode 100644 index 000000000..1759b3538 --- /dev/null +++ b/data/styles/walking/light/symbols/compass.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/compressed_air-m.svg b/data/styles/walking/light/symbols/compressed_air-m.svg similarity index 100% rename from data/styles/default/light/symbols/compressed_air-m.svg rename to data/styles/walking/light/symbols/compressed_air-m.svg diff --git a/data/styles/default/light/symbols/computer-m.svg b/data/styles/walking/light/symbols/computer-m.svg similarity index 100% rename from data/styles/default/light/symbols/computer-m.svg rename to data/styles/walking/light/symbols/computer-m.svg diff --git a/data/styles/default/light/symbols/confectionery-m.svg b/data/styles/walking/light/symbols/confectionery-m.svg similarity index 100% rename from data/styles/default/light/symbols/confectionery-m.svg rename to data/styles/walking/light/symbols/confectionery-m.svg diff --git a/data/styles/default/light/symbols/convenience-m.svg b/data/styles/walking/light/symbols/convenience-m.svg similarity index 100% rename from data/styles/default/light/symbols/convenience-m.svg rename to data/styles/walking/light/symbols/convenience-m.svg diff --git a/data/styles/default/light/symbols/copyshop-m.svg b/data/styles/walking/light/symbols/copyshop-m.svg similarity index 100% rename from data/styles/default/light/symbols/copyshop-m.svg rename to data/styles/walking/light/symbols/copyshop-m.svg diff --git a/data/styles/default/light/symbols/craft-m.svg b/data/styles/walking/light/symbols/craft-m.svg similarity index 100% rename from data/styles/default/light/symbols/craft-m.svg rename to data/styles/walking/light/symbols/craft-m.svg diff --git a/data/styles/default/light/symbols/crane-m.svg b/data/styles/walking/light/symbols/crane-m.svg similarity index 100% rename from data/styles/default/light/symbols/crane-m.svg rename to data/styles/walking/light/symbols/crane-m.svg diff --git a/data/styles/default/light/symbols/cricket-centre-m.svg b/data/styles/walking/light/symbols/cricket-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/cricket-centre-m.svg rename to data/styles/walking/light/symbols/cricket-centre-m.svg diff --git a/data/styles/default/light/symbols/cricket-m.svg b/data/styles/walking/light/symbols/cricket-m.svg similarity index 100% rename from data/styles/default/light/symbols/cricket-m.svg rename to data/styles/walking/light/symbols/cricket-m.svg diff --git a/data/styles/default/light/symbols/cross-m.svg b/data/styles/walking/light/symbols/cross-m.svg similarity index 100% rename from data/styles/default/light/symbols/cross-m.svg rename to data/styles/walking/light/symbols/cross-m.svg diff --git a/data/styles/default/light/symbols/cross_geoposition.svg b/data/styles/walking/light/symbols/cross_geoposition.svg similarity index 100% rename from data/styles/default/light/symbols/cross_geoposition.svg rename to data/styles/walking/light/symbols/cross_geoposition.svg diff --git a/data/styles/default/light/symbols/curling-centre-m.svg b/data/styles/walking/light/symbols/curling-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/curling-centre-m.svg rename to data/styles/walking/light/symbols/curling-centre-m.svg diff --git a/data/styles/default/light/symbols/curling-m.svg b/data/styles/walking/light/symbols/curling-m.svg similarity index 100% rename from data/styles/default/light/symbols/curling-m.svg rename to data/styles/walking/light/symbols/curling-m.svg diff --git a/data/styles/default/light/symbols/current-position.svg b/data/styles/walking/light/symbols/current-position.svg similarity index 100% rename from data/styles/default/light/symbols/current-position.svg rename to data/styles/walking/light/symbols/current-position.svg diff --git a/data/styles/default/light/symbols/cycle_barrier-s.svg b/data/styles/walking/light/symbols/cycle_barrier-s.svg similarity index 100% rename from data/styles/default/light/symbols/cycle_barrier-s.svg rename to data/styles/walking/light/symbols/cycle_barrier-s.svg diff --git a/data/styles/default/light/symbols/dance-m.svg b/data/styles/walking/light/symbols/dance-m.svg similarity index 100% rename from data/styles/default/light/symbols/dance-m.svg rename to data/styles/walking/light/symbols/dance-m.svg diff --git a/data/styles/default/light/symbols/day-spa-m.svg b/data/styles/walking/light/symbols/day-spa-m.svg similarity index 100% rename from data/styles/default/light/symbols/day-spa-m.svg rename to data/styles/walking/light/symbols/day-spa-m.svg diff --git a/data/styles/default/light/symbols/defibrillator-m.svg b/data/styles/walking/light/symbols/defibrillator-m.svg similarity index 100% rename from data/styles/default/light/symbols/defibrillator-m.svg rename to data/styles/walking/light/symbols/defibrillator-m.svg diff --git a/data/styles/default/light/symbols/dentist-m.svg b/data/styles/walking/light/symbols/dentist-m.svg similarity index 100% rename from data/styles/default/light/symbols/dentist-m.svg rename to data/styles/walking/light/symbols/dentist-m.svg diff --git a/data/styles/default/light/symbols/department_store-m.svg b/data/styles/walking/light/symbols/department_store-m.svg similarity index 100% rename from data/styles/default/light/symbols/department_store-m.svg rename to data/styles/walking/light/symbols/department_store-m.svg diff --git a/data/styles/default/light/symbols/disaster_help_point-m.svg b/data/styles/walking/light/symbols/disaster_help_point-m.svg similarity index 100% rename from data/styles/default/light/symbols/disaster_help_point-m.svg rename to data/styles/walking/light/symbols/disaster_help_point-m.svg diff --git a/data/styles/default/light/symbols/disusedbusiness-m.svg b/data/styles/walking/light/symbols/disusedbusiness-m.svg similarity index 100% rename from data/styles/default/light/symbols/disusedbusiness-m.svg rename to data/styles/walking/light/symbols/disusedbusiness-m.svg diff --git a/data/styles/default/light/symbols/diving-centre-m.svg b/data/styles/walking/light/symbols/diving-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/diving-centre-m.svg rename to data/styles/walking/light/symbols/diving-centre-m.svg diff --git a/data/styles/default/light/symbols/diving-m.svg b/data/styles/walking/light/symbols/diving-m.svg similarity index 100% rename from data/styles/default/light/symbols/diving-m.svg rename to data/styles/walking/light/symbols/diving-m.svg diff --git a/data/styles/default/light/symbols/dog_park-m.svg b/data/styles/walking/light/symbols/dog_park-m.svg similarity index 100% rename from data/styles/default/light/symbols/dog_park-m.svg rename to data/styles/walking/light/symbols/dog_park-m.svg diff --git a/data/styles/default/light/symbols/doityourself-m.svg b/data/styles/walking/light/symbols/doityourself-m.svg similarity index 100% rename from data/styles/default/light/symbols/doityourself-m.svg rename to data/styles/walking/light/symbols/doityourself-m.svg diff --git a/data/styles/default/light/symbols/dot-m.svg b/data/styles/walking/light/symbols/dot-m.svg similarity index 100% rename from data/styles/default/light/symbols/dot-m.svg rename to data/styles/walking/light/symbols/dot-m.svg diff --git a/data/styles/default/light/symbols/drinking-water-m.svg b/data/styles/walking/light/symbols/drinking-water-m.svg similarity index 100% rename from data/styles/default/light/symbols/drinking-water-m.svg rename to data/styles/walking/light/symbols/drinking-water-m.svg diff --git a/data/styles/default/light/symbols/drinking-water-no-m.svg b/data/styles/walking/light/symbols/drinking-water-no-m.svg similarity index 100% rename from data/styles/default/light/symbols/drinking-water-no-m.svg rename to data/styles/walking/light/symbols/drinking-water-no-m.svg diff --git a/data/styles/default/light/symbols/drinking-water-no-s.svg b/data/styles/walking/light/symbols/drinking-water-no-s.svg similarity index 100% rename from data/styles/default/light/symbols/drinking-water-no-s.svg rename to data/styles/walking/light/symbols/drinking-water-no-s.svg diff --git a/data/styles/default/light/symbols/drinking-water-s.svg b/data/styles/walking/light/symbols/drinking-water-s.svg similarity index 100% rename from data/styles/default/light/symbols/drinking-water-s.svg rename to data/styles/walking/light/symbols/drinking-water-s.svg diff --git a/data/styles/default/light/symbols/driving_school-m.svg b/data/styles/walking/light/symbols/driving_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/driving_school-m.svg rename to data/styles/walking/light/symbols/driving_school-m.svg diff --git a/data/styles/default/light/symbols/dry_cleaning-m.svg b/data/styles/walking/light/symbols/dry_cleaning-m.svg similarity index 100% rename from data/styles/default/light/symbols/dry_cleaning-m.svg rename to data/styles/walking/light/symbols/dry_cleaning-m.svg diff --git a/data/styles/default/light/symbols/dump-station-m.svg b/data/styles/walking/light/symbols/dump-station-m.svg similarity index 100% rename from data/styles/default/light/symbols/dump-station-m.svg rename to data/styles/walking/light/symbols/dump-station-m.svg diff --git a/data/styles/default/light/symbols/electrician-m.svg b/data/styles/walking/light/symbols/electrician-m.svg similarity index 100% rename from data/styles/default/light/symbols/electrician-m.svg rename to data/styles/walking/light/symbols/electrician-m.svg diff --git a/data/styles/default/light/symbols/electronics-m.svg b/data/styles/walking/light/symbols/electronics-m.svg similarity index 100% rename from data/styles/default/light/symbols/electronics-m.svg rename to data/styles/walking/light/symbols/electronics-m.svg diff --git a/data/styles/default/light/symbols/elevator-s.svg b/data/styles/walking/light/symbols/elevator-s.svg similarity index 100% rename from data/styles/default/light/symbols/elevator-s.svg rename to data/styles/walking/light/symbols/elevator-s.svg diff --git a/data/styles/default/light/symbols/embassy-m.svg b/data/styles/walking/light/symbols/embassy-m.svg similarity index 100% rename from data/styles/default/light/symbols/embassy-m.svg rename to data/styles/walking/light/symbols/embassy-m.svg diff --git a/data/styles/default/light/symbols/emergency-exit-m.svg b/data/styles/walking/light/symbols/emergency-exit-m.svg similarity index 100% rename from data/styles/default/light/symbols/emergency-exit-m.svg rename to data/styles/walking/light/symbols/emergency-exit-m.svg diff --git a/data/styles/default/light/symbols/emergency-phone-m.svg b/data/styles/walking/light/symbols/emergency-phone-m.svg similarity index 100% rename from data/styles/default/light/symbols/emergency-phone-m.svg rename to data/styles/walking/light/symbols/emergency-phone-m.svg diff --git a/data/styles/default/light/symbols/entrance-barrier-m.svg b/data/styles/walking/light/symbols/entrance-barrier-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-barrier-m.svg rename to data/styles/walking/light/symbols/entrance-barrier-m.svg diff --git a/data/styles/default/light/symbols/entrance-barrier-xs.svg b/data/styles/walking/light/symbols/entrance-barrier-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-barrier-xs.svg rename to data/styles/walking/light/symbols/entrance-barrier-xs.svg diff --git a/data/styles/default/light/symbols/entrance-emergency-m.svg b/data/styles/walking/light/symbols/entrance-emergency-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-emergency-m.svg rename to data/styles/walking/light/symbols/entrance-emergency-m.svg diff --git a/data/styles/default/light/symbols/entrance-emergency-xs.svg b/data/styles/walking/light/symbols/entrance-emergency-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-emergency-xs.svg rename to data/styles/walking/light/symbols/entrance-emergency-xs.svg diff --git a/data/styles/default/light/symbols/entrance-entry-m.svg b/data/styles/walking/light/symbols/entrance-entry-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-entry-m.svg rename to data/styles/walking/light/symbols/entrance-entry-m.svg diff --git a/data/styles/default/light/symbols/entrance-entry-xs.svg b/data/styles/walking/light/symbols/entrance-entry-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-entry-xs.svg rename to data/styles/walking/light/symbols/entrance-entry-xs.svg diff --git a/data/styles/default/light/symbols/entrance-exit-m.svg b/data/styles/walking/light/symbols/entrance-exit-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-exit-m.svg rename to data/styles/walking/light/symbols/entrance-exit-m.svg diff --git a/data/styles/default/light/symbols/entrance-exit-xs.svg b/data/styles/walking/light/symbols/entrance-exit-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-exit-xs.svg rename to data/styles/walking/light/symbols/entrance-exit-xs.svg diff --git a/data/styles/default/light/symbols/entrance-m.svg b/data/styles/walking/light/symbols/entrance-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-m.svg rename to data/styles/walking/light/symbols/entrance-m.svg diff --git a/data/styles/default/light/symbols/entrance-main-m.svg b/data/styles/walking/light/symbols/entrance-main-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-main-m.svg rename to data/styles/walking/light/symbols/entrance-main-m.svg diff --git a/data/styles/default/light/symbols/entrance-main-xs.svg b/data/styles/walking/light/symbols/entrance-main-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-main-xs.svg rename to data/styles/walking/light/symbols/entrance-main-xs.svg diff --git a/data/styles/default/light/symbols/entrance-service-m.svg b/data/styles/walking/light/symbols/entrance-service-m.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-service-m.svg rename to data/styles/walking/light/symbols/entrance-service-m.svg diff --git a/data/styles/default/light/symbols/entrance-service-xs.svg b/data/styles/walking/light/symbols/entrance-service-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-service-xs.svg rename to data/styles/walking/light/symbols/entrance-service-xs.svg diff --git a/data/styles/default/light/symbols/entrance-xs.svg b/data/styles/walking/light/symbols/entrance-xs.svg similarity index 100% rename from data/styles/default/light/symbols/entrance-xs.svg rename to data/styles/walking/light/symbols/entrance-xs.svg diff --git a/data/styles/default/light/symbols/equestrian-centre-m.svg b/data/styles/walking/light/symbols/equestrian-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/equestrian-centre-m.svg rename to data/styles/walking/light/symbols/equestrian-centre-m.svg diff --git a/data/styles/default/light/symbols/equestrian-m.svg b/data/styles/walking/light/symbols/equestrian-m.svg similarity index 100% rename from data/styles/default/light/symbols/equestrian-m.svg rename to data/styles/walking/light/symbols/equestrian-m.svg diff --git a/data/styles/default/light/symbols/erotic-m.svg b/data/styles/walking/light/symbols/erotic-m.svg similarity index 100% rename from data/styles/default/light/symbols/erotic-m.svg rename to data/styles/walking/light/symbols/erotic-m.svg diff --git a/data/styles/default/light/symbols/escape_game.svg b/data/styles/walking/light/symbols/escape_game.svg similarity index 100% rename from data/styles/default/light/symbols/escape_game.svg rename to data/styles/walking/light/symbols/escape_game.svg diff --git a/data/styles/default/light/symbols/events_venue-m.svg b/data/styles/walking/light/symbols/events_venue-m.svg similarity index 100% rename from data/styles/default/light/symbols/events_venue-m.svg rename to data/styles/walking/light/symbols/events_venue-m.svg diff --git a/data/styles/default/light/symbols/excrement_bags-m.svg b/data/styles/walking/light/symbols/excrement_bags-m.svg similarity index 100% rename from data/styles/default/light/symbols/excrement_bags-m.svg rename to data/styles/walking/light/symbols/excrement_bags-m.svg diff --git a/data/styles/default/light/symbols/factory-m.svg b/data/styles/walking/light/symbols/factory-m.svg similarity index 100% rename from data/styles/default/light/symbols/factory-m.svg rename to data/styles/walking/light/symbols/factory-m.svg diff --git a/data/styles/default/light/symbols/fastfood-m.svg b/data/styles/walking/light/symbols/fastfood-m.svg similarity index 100% rename from data/styles/default/light/symbols/fastfood-m.svg rename to data/styles/walking/light/symbols/fastfood-m.svg diff --git a/data/styles/default/light/symbols/fire_station-m.svg b/data/styles/walking/light/symbols/fire_station-m.svg similarity index 100% rename from data/styles/default/light/symbols/fire_station-m.svg rename to data/styles/walking/light/symbols/fire_station-m.svg diff --git a/data/styles/default/light/symbols/firehydrant-m.svg b/data/styles/walking/light/symbols/firehydrant-m.svg similarity index 100% rename from data/styles/default/light/symbols/firehydrant-m.svg rename to data/styles/walking/light/symbols/firehydrant-m.svg diff --git a/data/styles/default/light/symbols/firepit-m.svg b/data/styles/walking/light/symbols/firepit-m.svg similarity index 100% rename from data/styles/default/light/symbols/firepit-m.svg rename to data/styles/walking/light/symbols/firepit-m.svg diff --git a/data/styles/default/light/symbols/fitness-m.svg b/data/styles/walking/light/symbols/fitness-m.svg similarity index 100% rename from data/styles/default/light/symbols/fitness-m.svg rename to data/styles/walking/light/symbols/fitness-m.svg diff --git a/data/styles/default/light/symbols/fitness_centre-m.svg b/data/styles/walking/light/symbols/fitness_centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/fitness_centre-m.svg rename to data/styles/walking/light/symbols/fitness_centre-m.svg diff --git a/data/styles/default/light/symbols/flagpole-m.svg b/data/styles/walking/light/symbols/flagpole-m.svg similarity index 100% rename from data/styles/default/light/symbols/flagpole-m.svg rename to data/styles/walking/light/symbols/flagpole-m.svg diff --git a/data/styles/default/light/symbols/florist-m.svg b/data/styles/walking/light/symbols/florist-m.svg similarity index 100% rename from data/styles/default/light/symbols/florist-m.svg rename to data/styles/walking/light/symbols/florist-m.svg diff --git a/data/styles/default/light/symbols/flying_school-m.svg b/data/styles/walking/light/symbols/flying_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/flying_school-m.svg rename to data/styles/walking/light/symbols/flying_school-m.svg diff --git a/data/styles/default/light/symbols/food_bank-m.svg b/data/styles/walking/light/symbols/food_bank-m.svg similarity index 100% rename from data/styles/default/light/symbols/food_bank-m.svg rename to data/styles/walking/light/symbols/food_bank-m.svg diff --git a/data/styles/default/light/symbols/food_sharing-m.svg b/data/styles/walking/light/symbols/food_sharing-m.svg similarity index 100% rename from data/styles/default/light/symbols/food_sharing-m.svg rename to data/styles/walking/light/symbols/food_sharing-m.svg diff --git a/data/styles/default/light/symbols/ford-m.svg b/data/styles/walking/light/symbols/ford-m.svg similarity index 100% rename from data/styles/default/light/symbols/ford-m.svg rename to data/styles/walking/light/symbols/ford-m.svg diff --git a/data/styles/default/light/symbols/fountain-m.svg b/data/styles/walking/light/symbols/fountain-m.svg similarity index 100% rename from data/styles/default/light/symbols/fountain-m.svg rename to data/styles/walking/light/symbols/fountain-m.svg diff --git a/data/styles/default/light/symbols/fountain-s.svg b/data/styles/walking/light/symbols/fountain-s.svg similarity index 100% rename from data/styles/default/light/symbols/fountain-s.svg rename to data/styles/walking/light/symbols/fountain-s.svg diff --git a/data/styles/default/light/symbols/four_square-centre-m.svg b/data/styles/walking/light/symbols/four_square-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/four_square-centre-m.svg rename to data/styles/walking/light/symbols/four_square-centre-m.svg diff --git a/data/styles/default/light/symbols/four_square-m.svg b/data/styles/walking/light/symbols/four_square-m.svg similarity index 100% rename from data/styles/default/light/symbols/four_square-m.svg rename to data/styles/walking/light/symbols/four_square-m.svg diff --git a/data/styles/default/light/symbols/fuel-dispenser-m.svg b/data/styles/walking/light/symbols/fuel-dispenser-m.svg similarity index 100% rename from data/styles/default/light/symbols/fuel-dispenser-m.svg rename to data/styles/walking/light/symbols/fuel-dispenser-m.svg diff --git a/data/styles/default/light/symbols/fuel-m.svg b/data/styles/walking/light/symbols/fuel-m.svg similarity index 100% rename from data/styles/default/light/symbols/fuel-m.svg rename to data/styles/walking/light/symbols/fuel-m.svg diff --git a/data/styles/default/light/symbols/fuel-s.svg b/data/styles/walking/light/symbols/fuel-s.svg similarity index 100% rename from data/styles/default/light/symbols/fuel-s.svg rename to data/styles/walking/light/symbols/fuel-s.svg diff --git a/data/styles/default/light/symbols/funeral_directors-m.svg b/data/styles/walking/light/symbols/funeral_directors-m.svg similarity index 100% rename from data/styles/default/light/symbols/funeral_directors-m.svg rename to data/styles/walking/light/symbols/funeral_directors-m.svg diff --git a/data/styles/default/light/symbols/funicular-m.svg b/data/styles/walking/light/symbols/funicular-m.svg similarity index 100% rename from data/styles/default/light/symbols/funicular-m.svg rename to data/styles/walking/light/symbols/funicular-m.svg diff --git a/data/styles/default/light/symbols/funicular-s.svg b/data/styles/walking/light/symbols/funicular-s.svg similarity index 100% rename from data/styles/default/light/symbols/funicular-s.svg rename to data/styles/walking/light/symbols/funicular-s.svg diff --git a/data/styles/default/light/symbols/furniture-m.svg b/data/styles/walking/light/symbols/furniture-m.svg similarity index 100% rename from data/styles/default/light/symbols/furniture-m.svg rename to data/styles/walking/light/symbols/furniture-m.svg diff --git a/data/styles/default/light/symbols/gallery-m.svg b/data/styles/walking/light/symbols/gallery-m.svg similarity index 100% rename from data/styles/default/light/symbols/gallery-m.svg rename to data/styles/walking/light/symbols/gallery-m.svg diff --git a/data/styles/default/light/symbols/gambling-m.svg b/data/styles/walking/light/symbols/gambling-m.svg similarity index 100% rename from data/styles/default/light/symbols/gambling-m.svg rename to data/styles/walking/light/symbols/gambling-m.svg diff --git a/data/styles/default/light/symbols/garden-m.svg b/data/styles/walking/light/symbols/garden-m.svg similarity index 100% rename from data/styles/default/light/symbols/garden-m.svg rename to data/styles/walking/light/symbols/garden-m.svg diff --git a/data/styles/default/light/symbols/garden-outline-m.svg b/data/styles/walking/light/symbols/garden-outline-m.svg similarity index 100% rename from data/styles/default/light/symbols/garden-outline-m.svg rename to data/styles/walking/light/symbols/garden-outline-m.svg diff --git a/data/styles/default/light/symbols/garden_center-m.svg b/data/styles/walking/light/symbols/garden_center-m.svg similarity index 100% rename from data/styles/default/light/symbols/garden_center-m.svg rename to data/styles/walking/light/symbols/garden_center-m.svg diff --git a/data/styles/default/light/symbols/gate-s.svg b/data/styles/walking/light/symbols/gate-s.svg similarity index 100% rename from data/styles/default/light/symbols/gate-s.svg rename to data/styles/walking/light/symbols/gate-s.svg diff --git a/data/styles/default/light/symbols/geyser-m.svg b/data/styles/walking/light/symbols/geyser-m.svg similarity index 100% rename from data/styles/default/light/symbols/geyser-m.svg rename to data/styles/walking/light/symbols/geyser-m.svg diff --git a/data/styles/default/light/symbols/geyser-s.svg b/data/styles/walking/light/symbols/geyser-s.svg similarity index 100% rename from data/styles/default/light/symbols/geyser-s.svg rename to data/styles/walking/light/symbols/geyser-s.svg diff --git a/data/styles/default/light/symbols/gift-m.svg b/data/styles/walking/light/symbols/gift-m.svg similarity index 100% rename from data/styles/default/light/symbols/gift-m.svg rename to data/styles/walking/light/symbols/gift-m.svg diff --git a/data/styles/default/light/symbols/give_box-m.svg b/data/styles/walking/light/symbols/give_box-m.svg similarity index 100% rename from data/styles/default/light/symbols/give_box-m.svg rename to data/styles/walking/light/symbols/give_box-m.svg diff --git a/data/styles/default/light/symbols/golf-centre-m.svg b/data/styles/walking/light/symbols/golf-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/golf-centre-m.svg rename to data/styles/walking/light/symbols/golf-centre-m.svg diff --git a/data/styles/default/light/symbols/golf-m.svg b/data/styles/walking/light/symbols/golf-m.svg similarity index 100% rename from data/styles/default/light/symbols/golf-m.svg rename to data/styles/walking/light/symbols/golf-m.svg diff --git a/data/styles/default/light/symbols/greengrocer-m.svg b/data/styles/walking/light/symbols/greengrocer-m.svg similarity index 100% rename from data/styles/default/light/symbols/greengrocer-m.svg rename to data/styles/walking/light/symbols/greengrocer-m.svg diff --git a/data/styles/default/light/symbols/grinding_mill-m.svg b/data/styles/walking/light/symbols/grinding_mill-m.svg similarity index 100% rename from data/styles/default/light/symbols/grinding_mill-m.svg rename to data/styles/walking/light/symbols/grinding_mill-m.svg diff --git a/data/styles/default/light/symbols/guest_house-m.svg b/data/styles/walking/light/symbols/guest_house-m.svg similarity index 100% rename from data/styles/default/light/symbols/guest_house-m.svg rename to data/styles/walking/light/symbols/guest_house-m.svg diff --git a/data/styles/default/light/symbols/guidepost.svg b/data/styles/walking/light/symbols/guidepost.svg similarity index 100% rename from data/styles/default/light/symbols/guidepost.svg rename to data/styles/walking/light/symbols/guidepost.svg diff --git a/data/styles/default/light/symbols/hackerspace-m.svg b/data/styles/walking/light/symbols/hackerspace-m.svg similarity index 100% rename from data/styles/default/light/symbols/hackerspace-m.svg rename to data/styles/walking/light/symbols/hackerspace-m.svg diff --git a/data/styles/default/light/symbols/hairdresser-m.svg b/data/styles/walking/light/symbols/hairdresser-m.svg similarity index 100% rename from data/styles/default/light/symbols/hairdresser-m.svg rename to data/styles/walking/light/symbols/hairdresser-m.svg diff --git a/data/styles/default/light/symbols/handball-centre-m.svg b/data/styles/walking/light/symbols/handball-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/handball-centre-m.svg rename to data/styles/walking/light/symbols/handball-centre-m.svg diff --git a/data/styles/default/light/symbols/handball-m.svg b/data/styles/walking/light/symbols/handball-m.svg similarity index 100% rename from data/styles/default/light/symbols/handball-m.svg rename to data/styles/walking/light/symbols/handball-m.svg diff --git a/data/styles/default/light/symbols/handicraft-m.svg b/data/styles/walking/light/symbols/handicraft-m.svg similarity index 100% rename from data/styles/default/light/symbols/handicraft-m.svg rename to data/styles/walking/light/symbols/handicraft-m.svg diff --git a/data/styles/default/light/symbols/hearing_aids-m.svg b/data/styles/walking/light/symbols/hearing_aids-m.svg similarity index 100% rename from data/styles/default/light/symbols/hearing_aids-m.svg rename to data/styles/walking/light/symbols/hearing_aids-m.svg diff --git a/data/styles/default/light/symbols/helipad-m.svg b/data/styles/walking/light/symbols/helipad-m.svg similarity index 100% rename from data/styles/default/light/symbols/helipad-m.svg rename to data/styles/walking/light/symbols/helipad-m.svg diff --git a/data/styles/default/light/symbols/hindu-m.svg b/data/styles/walking/light/symbols/hindu-m.svg similarity index 100% rename from data/styles/default/light/symbols/hindu-m.svg rename to data/styles/walking/light/symbols/hindu-m.svg diff --git a/data/styles/default/light/symbols/hindu-s.svg b/data/styles/walking/light/symbols/hindu-s.svg similarity index 100% rename from data/styles/default/light/symbols/hindu-s.svg rename to data/styles/walking/light/symbols/hindu-s.svg diff --git a/data/styles/default/light/symbols/historic-ship-m.svg b/data/styles/walking/light/symbols/historic-ship-m.svg similarity index 100% rename from data/styles/default/light/symbols/historic-ship-m.svg rename to data/styles/walking/light/symbols/historic-ship-m.svg diff --git a/data/styles/default/light/symbols/historic_attraction-m.svg b/data/styles/walking/light/symbols/historic_attraction-m.svg similarity index 100% rename from data/styles/default/light/symbols/historic_attraction-m.svg rename to data/styles/walking/light/symbols/historic_attraction-m.svg diff --git a/data/styles/default/light/symbols/hockey-centre-m.svg b/data/styles/walking/light/symbols/hockey-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/hockey-centre-m.svg rename to data/styles/walking/light/symbols/hockey-centre-m.svg diff --git a/data/styles/default/light/symbols/hockey-m.svg b/data/styles/walking/light/symbols/hockey-m.svg similarity index 100% rename from data/styles/default/light/symbols/hockey-m.svg rename to data/styles/walking/light/symbols/hockey-m.svg diff --git a/data/styles/default/light/symbols/home-m.svg b/data/styles/walking/light/symbols/home-m.svg similarity index 100% rename from data/styles/default/light/symbols/home-m.svg rename to data/styles/walking/light/symbols/home-m.svg diff --git a/data/styles/default/light/symbols/hospital-m.svg b/data/styles/walking/light/symbols/hospital-m.svg similarity index 100% rename from data/styles/default/light/symbols/hospital-m.svg rename to data/styles/walking/light/symbols/hospital-m.svg diff --git a/data/styles/default/light/symbols/hospital-s.svg b/data/styles/walking/light/symbols/hospital-s.svg similarity index 100% rename from data/styles/default/light/symbols/hospital-s.svg rename to data/styles/walking/light/symbols/hospital-s.svg diff --git a/data/styles/default/light/symbols/hostel-m.svg b/data/styles/walking/light/symbols/hostel-m.svg similarity index 100% rename from data/styles/default/light/symbols/hostel-m.svg rename to data/styles/walking/light/symbols/hostel-m.svg diff --git a/data/styles/default/light/symbols/hotel-m.svg b/data/styles/walking/light/symbols/hotel-m.svg similarity index 100% rename from data/styles/default/light/symbols/hotel-m.svg rename to data/styles/walking/light/symbols/hotel-m.svg diff --git a/data/styles/default/light/symbols/hotel-s.svg b/data/styles/walking/light/symbols/hotel-s.svg similarity index 100% rename from data/styles/default/light/symbols/hotel-s.svg rename to data/styles/walking/light/symbols/hotel-s.svg diff --git a/data/styles/default/light/symbols/hunting-tower-m.svg b/data/styles/walking/light/symbols/hunting-tower-m.svg similarity index 100% rename from data/styles/default/light/symbols/hunting-tower-m.svg rename to data/styles/walking/light/symbols/hunting-tower-m.svg diff --git a/data/styles/default/light/symbols/hydrant-m.svg b/data/styles/walking/light/symbols/hydrant-m.svg similarity index 100% rename from data/styles/default/light/symbols/hydrant-m.svg rename to data/styles/walking/light/symbols/hydrant-m.svg diff --git a/data/styles/default/light/symbols/ice_cream-m.svg b/data/styles/walking/light/symbols/ice_cream-m.svg similarity index 100% rename from data/styles/default/light/symbols/ice_cream-m.svg rename to data/styles/walking/light/symbols/ice_cream-m.svg diff --git a/data/styles/default/light/symbols/indoor_play-m.svg b/data/styles/walking/light/symbols/indoor_play-m.svg similarity index 100% rename from data/styles/default/light/symbols/indoor_play-m.svg rename to data/styles/walking/light/symbols/indoor_play-m.svg diff --git a/data/styles/default/light/symbols/information-m.svg b/data/styles/walking/light/symbols/information-m.svg similarity index 100% rename from data/styles/default/light/symbols/information-m.svg rename to data/styles/walking/light/symbols/information-m.svg diff --git a/data/styles/default/light/symbols/information-office-m.svg b/data/styles/walking/light/symbols/information-office-m.svg similarity index 100% rename from data/styles/default/light/symbols/information-office-m.svg rename to data/styles/walking/light/symbols/information-office-m.svg diff --git a/data/styles/default/light/symbols/infosign.svg b/data/styles/walking/light/symbols/infosign.svg similarity index 100% rename from data/styles/default/light/symbols/infosign.svg rename to data/styles/walking/light/symbols/infosign.svg diff --git a/data/styles/default/light/symbols/interior_decoration-m.svg b/data/styles/walking/light/symbols/interior_decoration-m.svg similarity index 100% rename from data/styles/default/light/symbols/interior_decoration-m.svg rename to data/styles/walking/light/symbols/interior_decoration-m.svg diff --git a/data/styles/default/light/symbols/internet_cafe-m.svg b/data/styles/walking/light/symbols/internet_cafe-m.svg similarity index 100% rename from data/styles/default/light/symbols/internet_cafe-m.svg rename to data/styles/walking/light/symbols/internet_cafe-m.svg diff --git a/data/styles/default/light/symbols/jewelry-m.svg b/data/styles/walking/light/symbols/jewelry-m.svg similarity index 100% rename from data/styles/default/light/symbols/jewelry-m.svg rename to data/styles/walking/light/symbols/jewelry-m.svg diff --git a/data/styles/default/light/symbols/jewish-m.svg b/data/styles/walking/light/symbols/jewish-m.svg similarity index 100% rename from data/styles/default/light/symbols/jewish-m.svg rename to data/styles/walking/light/symbols/jewish-m.svg diff --git a/data/styles/default/light/symbols/jewish-s.svg b/data/styles/walking/light/symbols/jewish-s.svg similarity index 100% rename from data/styles/default/light/symbols/jewish-s.svg rename to data/styles/walking/light/symbols/jewish-s.svg diff --git a/data/styles/default/light/symbols/key_cutter-m.svg b/data/styles/walking/light/symbols/key_cutter-m.svg similarity index 100% rename from data/styles/default/light/symbols/key_cutter-m.svg rename to data/styles/walking/light/symbols/key_cutter-m.svg diff --git a/data/styles/default/light/symbols/kindergarten-m.svg b/data/styles/walking/light/symbols/kindergarten-m.svg similarity index 100% rename from data/styles/default/light/symbols/kindergarten-m.svg rename to data/styles/walking/light/symbols/kindergarten-m.svg diff --git a/data/styles/default/light/symbols/kiosk-m.svg b/data/styles/walking/light/symbols/kiosk-m.svg similarity index 100% rename from data/styles/default/light/symbols/kiosk-m.svg rename to data/styles/walking/light/symbols/kiosk-m.svg diff --git a/data/styles/default/light/symbols/ladder-m.svg b/data/styles/walking/light/symbols/ladder-m.svg similarity index 100% rename from data/styles/default/light/symbols/ladder-m.svg rename to data/styles/walking/light/symbols/ladder-m.svg diff --git a/data/styles/default/light/symbols/language_school-m.svg b/data/styles/walking/light/symbols/language_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/language_school-m.svg rename to data/styles/walking/light/symbols/language_school-m.svg diff --git a/data/styles/default/light/symbols/laundry-m.svg b/data/styles/walking/light/symbols/laundry-m.svg similarity index 100% rename from data/styles/default/light/symbols/laundry-m.svg rename to data/styles/walking/light/symbols/laundry-m.svg diff --git a/data/styles/default/light/symbols/lawyer-m.svg b/data/styles/walking/light/symbols/lawyer-m.svg similarity index 100% rename from data/styles/default/light/symbols/lawyer-m.svg rename to data/styles/walking/light/symbols/lawyer-m.svg diff --git a/data/styles/default/light/symbols/library-m.svg b/data/styles/walking/light/symbols/library-m.svg similarity index 100% rename from data/styles/default/light/symbols/library-m.svg rename to data/styles/walking/light/symbols/library-m.svg diff --git a/data/styles/default/light/symbols/lifebuoy-m.svg b/data/styles/walking/light/symbols/lifebuoy-m.svg similarity index 100% rename from data/styles/default/light/symbols/lifebuoy-m.svg rename to data/styles/walking/light/symbols/lifebuoy-m.svg diff --git a/data/styles/default/light/symbols/lifeguard-m.svg b/data/styles/walking/light/symbols/lifeguard-m.svg similarity index 100% rename from data/styles/default/light/symbols/lifeguard-m.svg rename to data/styles/walking/light/symbols/lifeguard-m.svg diff --git a/data/styles/default/light/symbols/lift_gate-m.svg b/data/styles/walking/light/symbols/lift_gate-m.svg similarity index 100% rename from data/styles/default/light/symbols/lift_gate-m.svg rename to data/styles/walking/light/symbols/lift_gate-m.svg diff --git a/data/styles/default/light/symbols/light_rail-dlr-london-m.svg b/data/styles/walking/light/symbols/light_rail-dlr-london-m.svg similarity index 100% rename from data/styles/default/light/symbols/light_rail-dlr-london-m.svg rename to data/styles/walking/light/symbols/light_rail-dlr-london-m.svg diff --git a/data/styles/default/light/symbols/light_rail-dlr-london-s.svg b/data/styles/walking/light/symbols/light_rail-dlr-london-s.svg similarity index 100% rename from data/styles/default/light/symbols/light_rail-dlr-london-s.svg rename to data/styles/walking/light/symbols/light_rail-dlr-london-s.svg diff --git a/data/styles/default/light/symbols/light_rail-porto-m.svg b/data/styles/walking/light/symbols/light_rail-porto-m.svg similarity index 100% rename from data/styles/default/light/symbols/light_rail-porto-m.svg rename to data/styles/walking/light/symbols/light_rail-porto-m.svg diff --git a/data/styles/default/light/symbols/light_rail-porto-s.svg b/data/styles/walking/light/symbols/light_rail-porto-s.svg similarity index 100% rename from data/styles/default/light/symbols/light_rail-porto-s.svg rename to data/styles/walking/light/symbols/light_rail-porto-s.svg diff --git a/data/styles/default/light/symbols/lighthouse-m.svg b/data/styles/walking/light/symbols/lighthouse-m.svg similarity index 100% rename from data/styles/default/light/symbols/lighthouse-m.svg rename to data/styles/walking/light/symbols/lighthouse-m.svg diff --git a/data/styles/default/light/symbols/lighthouse-s.svg b/data/styles/walking/light/symbols/lighthouse-s.svg similarity index 100% rename from data/styles/default/light/symbols/lighthouse-s.svg rename to data/styles/walking/light/symbols/lighthouse-s.svg diff --git a/data/styles/default/light/symbols/lightrail-berlin-m.svg b/data/styles/walking/light/symbols/lightrail-berlin-m.svg similarity index 100% rename from data/styles/default/light/symbols/lightrail-berlin-m.svg rename to data/styles/walking/light/symbols/lightrail-berlin-m.svg diff --git a/data/styles/default/light/symbols/lightrail-berlin-s.svg b/data/styles/walking/light/symbols/lightrail-berlin-s.svg similarity index 100% rename from data/styles/default/light/symbols/lightrail-berlin-s.svg rename to data/styles/walking/light/symbols/lightrail-berlin-s.svg diff --git a/data/styles/default/light/symbols/locomotive-m.svg b/data/styles/walking/light/symbols/locomotive-m.svg similarity index 100% rename from data/styles/default/light/symbols/locomotive-m.svg rename to data/styles/walking/light/symbols/locomotive-m.svg diff --git a/data/styles/default/light/symbols/lottery-m.svg b/data/styles/walking/light/symbols/lottery-m.svg similarity index 100% rename from data/styles/default/light/symbols/lottery-m.svg rename to data/styles/walking/light/symbols/lottery-m.svg diff --git a/data/styles/default/light/symbols/lounger-m.svg b/data/styles/walking/light/symbols/lounger-m.svg similarity index 100% rename from data/styles/default/light/symbols/lounger-m.svg rename to data/styles/walking/light/symbols/lounger-m.svg diff --git a/data/styles/default/light/symbols/luggage_locker-m.svg b/data/styles/walking/light/symbols/luggage_locker-m.svg similarity index 100% rename from data/styles/default/light/symbols/luggage_locker-m.svg rename to data/styles/walking/light/symbols/luggage_locker-m.svg diff --git a/data/styles/default/light/symbols/mail-m.svg b/data/styles/walking/light/symbols/mail-m.svg similarity index 100% rename from data/styles/default/light/symbols/mail-m.svg rename to data/styles/walking/light/symbols/mail-m.svg diff --git a/data/styles/default/light/symbols/map.svg b/data/styles/walking/light/symbols/map.svg similarity index 100% rename from data/styles/default/light/symbols/map.svg rename to data/styles/walking/light/symbols/map.svg diff --git a/data/styles/default/light/symbols/marina-m.svg b/data/styles/walking/light/symbols/marina-m.svg similarity index 100% rename from data/styles/default/light/symbols/marina-m.svg rename to data/styles/walking/light/symbols/marina-m.svg diff --git a/data/styles/default/light/symbols/marina_fuel_station-m.svg b/data/styles/walking/light/symbols/marina_fuel_station-m.svg similarity index 100% rename from data/styles/default/light/symbols/marina_fuel_station-m.svg rename to data/styles/walking/light/symbols/marina_fuel_station-m.svg diff --git a/data/styles/default/light/symbols/marketplace-m.svg b/data/styles/walking/light/symbols/marketplace-m.svg similarity index 100% rename from data/styles/default/light/symbols/marketplace-m.svg rename to data/styles/walking/light/symbols/marketplace-m.svg diff --git a/data/styles/default/light/symbols/martial-arts-centre-m.svg b/data/styles/walking/light/symbols/martial-arts-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/martial-arts-centre-m.svg rename to data/styles/walking/light/symbols/martial-arts-centre-m.svg diff --git a/data/styles/default/light/symbols/martial-arts-m.svg b/data/styles/walking/light/symbols/martial-arts-m.svg similarity index 100% rename from data/styles/default/light/symbols/martial-arts-m.svg rename to data/styles/walking/light/symbols/martial-arts-m.svg diff --git a/data/styles/default/light/symbols/massage_salon-m.svg b/data/styles/walking/light/symbols/massage_salon-m.svg similarity index 100% rename from data/styles/default/light/symbols/massage_salon-m.svg rename to data/styles/walking/light/symbols/massage_salon-m.svg diff --git a/data/styles/default/light/symbols/mast-m.svg b/data/styles/walking/light/symbols/mast-m.svg similarity index 100% rename from data/styles/default/light/symbols/mast-m.svg rename to data/styles/walking/light/symbols/mast-m.svg diff --git a/data/styles/default/light/symbols/media-m.svg b/data/styles/walking/light/symbols/media-m.svg similarity index 100% rename from data/styles/default/light/symbols/media-m.svg rename to data/styles/walking/light/symbols/media-m.svg diff --git a/data/styles/default/light/symbols/metal_construction-m.svg b/data/styles/walking/light/symbols/metal_construction-m.svg similarity index 100% rename from data/styles/default/light/symbols/metal_construction-m.svg rename to data/styles/walking/light/symbols/metal_construction-m.svg diff --git a/data/styles/default/light/symbols/military-m.svg b/data/styles/walking/light/symbols/military-m.svg similarity index 100% rename from data/styles/default/light/symbols/military-m.svg rename to data/styles/walking/light/symbols/military-m.svg diff --git a/data/styles/default/light/symbols/mine-m.svg b/data/styles/walking/light/symbols/mine-m.svg similarity index 100% rename from data/styles/default/light/symbols/mine-m.svg rename to data/styles/walking/light/symbols/mine-m.svg diff --git a/data/styles/default/light/symbols/mobile_phone-m.svg b/data/styles/walking/light/symbols/mobile_phone-m.svg similarity index 100% rename from data/styles/default/light/symbols/mobile_phone-m.svg rename to data/styles/walking/light/symbols/mobile_phone-m.svg diff --git a/data/styles/default/light/symbols/monorail-m.svg b/data/styles/walking/light/symbols/monorail-m.svg similarity index 100% rename from data/styles/default/light/symbols/monorail-m.svg rename to data/styles/walking/light/symbols/monorail-m.svg diff --git a/data/styles/default/light/symbols/monorail-s.svg b/data/styles/walking/light/symbols/monorail-s.svg similarity index 100% rename from data/styles/default/light/symbols/monorail-s.svg rename to data/styles/walking/light/symbols/monorail-s.svg diff --git a/data/styles/default/light/symbols/monument-m.svg b/data/styles/walking/light/symbols/monument-m.svg similarity index 100% rename from data/styles/default/light/symbols/monument-m.svg rename to data/styles/walking/light/symbols/monument-m.svg diff --git a/data/styles/default/light/symbols/monument-s.svg b/data/styles/walking/light/symbols/monument-s.svg similarity index 100% rename from data/styles/default/light/symbols/monument-s.svg rename to data/styles/walking/light/symbols/monument-s.svg diff --git a/data/styles/default/light/symbols/mormon-m.svg b/data/styles/walking/light/symbols/mormon-m.svg similarity index 100% rename from data/styles/default/light/symbols/mormon-m.svg rename to data/styles/walking/light/symbols/mormon-m.svg diff --git a/data/styles/default/light/symbols/mormon-s.svg b/data/styles/walking/light/symbols/mormon-s.svg similarity index 100% rename from data/styles/default/light/symbols/mormon-s.svg rename to data/styles/walking/light/symbols/mormon-s.svg diff --git a/data/styles/default/light/symbols/motorcycle-parking-m.svg b/data/styles/walking/light/symbols/motorcycle-parking-m.svg similarity index 100% rename from data/styles/default/light/symbols/motorcycle-parking-m.svg rename to data/styles/walking/light/symbols/motorcycle-parking-m.svg diff --git a/data/styles/default/light/symbols/motorcycle_rental-m.svg b/data/styles/walking/light/symbols/motorcycle_rental-m.svg similarity index 100% rename from data/styles/default/light/symbols/motorcycle_rental-m.svg rename to data/styles/walking/light/symbols/motorcycle_rental-m.svg diff --git a/data/styles/default/light/symbols/motorcycle_repair-m.svg b/data/styles/walking/light/symbols/motorcycle_repair-m.svg similarity index 100% rename from data/styles/default/light/symbols/motorcycle_repair-m.svg rename to data/styles/walking/light/symbols/motorcycle_repair-m.svg diff --git a/data/styles/default/light/symbols/motorcycle_shop-m.svg b/data/styles/walking/light/symbols/motorcycle_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/motorcycle_shop-m.svg rename to data/styles/walking/light/symbols/motorcycle_shop-m.svg diff --git a/data/styles/default/light/symbols/mountain-pass-m.svg b/data/styles/walking/light/symbols/mountain-pass-m.svg similarity index 100% rename from data/styles/default/light/symbols/mountain-pass-m.svg rename to data/styles/walking/light/symbols/mountain-pass-m.svg diff --git a/data/styles/default/light/symbols/mountain-pass-s.svg b/data/styles/walking/light/symbols/mountain-pass-s.svg similarity index 100% rename from data/styles/default/light/symbols/mountain-pass-s.svg rename to data/styles/walking/light/symbols/mountain-pass-s.svg diff --git a/data/styles/default/light/symbols/museum-m.svg b/data/styles/walking/light/symbols/museum-m.svg similarity index 100% rename from data/styles/default/light/symbols/museum-m.svg rename to data/styles/walking/light/symbols/museum-m.svg diff --git a/data/styles/default/light/symbols/museum-s.svg b/data/styles/walking/light/symbols/museum-s.svg similarity index 100% rename from data/styles/default/light/symbols/museum-s.svg rename to data/styles/walking/light/symbols/museum-s.svg diff --git a/data/styles/default/light/symbols/music-m.svg b/data/styles/walking/light/symbols/music-m.svg similarity index 100% rename from data/styles/default/light/symbols/music-m.svg rename to data/styles/walking/light/symbols/music-m.svg diff --git a/data/styles/default/light/symbols/music_school-m.svg b/data/styles/walking/light/symbols/music_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/music_school-m.svg rename to data/styles/walking/light/symbols/music_school-m.svg diff --git a/data/styles/default/light/symbols/musical-instrument-m.svg b/data/styles/walking/light/symbols/musical-instrument-m.svg similarity index 100% rename from data/styles/default/light/symbols/musical-instrument-m.svg rename to data/styles/walking/light/symbols/musical-instrument-m.svg diff --git a/data/styles/default/light/symbols/muslim-m.svg b/data/styles/walking/light/symbols/muslim-m.svg similarity index 100% rename from data/styles/default/light/symbols/muslim-m.svg rename to data/styles/walking/light/symbols/muslim-m.svg diff --git a/data/styles/default/light/symbols/muslim-s.svg b/data/styles/walking/light/symbols/muslim-s.svg similarity index 100% rename from data/styles/default/light/symbols/muslim-s.svg rename to data/styles/walking/light/symbols/muslim-s.svg diff --git a/data/styles/default/light/symbols/nails-m.svg b/data/styles/walking/light/symbols/nails-m.svg similarity index 100% rename from data/styles/default/light/symbols/nails-m.svg rename to data/styles/walking/light/symbols/nails-m.svg diff --git a/data/styles/default/light/symbols/needle_and_thread-m.svg b/data/styles/walking/light/symbols/needle_and_thread-m.svg similarity index 100% rename from data/styles/default/light/symbols/needle_and_thread-m.svg rename to data/styles/walking/light/symbols/needle_and_thread-m.svg diff --git a/data/styles/default/light/symbols/newsagent_shop-m.svg b/data/styles/walking/light/symbols/newsagent_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/newsagent_shop-m.svg rename to data/styles/walking/light/symbols/newsagent_shop-m.svg diff --git a/data/styles/default/light/symbols/nightclub-m.svg b/data/styles/walking/light/symbols/nightclub-m.svg similarity index 100% rename from data/styles/default/light/symbols/nightclub-m.svg rename to data/styles/walking/light/symbols/nightclub-m.svg diff --git a/data/styles/default/light/symbols/npark-m.svg b/data/styles/walking/light/symbols/npark-m.svg similarity index 100% rename from data/styles/default/light/symbols/npark-m.svg rename to data/styles/walking/light/symbols/npark-m.svg diff --git a/data/styles/default/light/symbols/nparkf-m.svg b/data/styles/walking/light/symbols/nparkf-m.svg similarity index 100% rename from data/styles/default/light/symbols/nparkf-m.svg rename to data/styles/walking/light/symbols/nparkf-m.svg diff --git a/data/styles/default/light/symbols/nparkf-outline-m.svg b/data/styles/walking/light/symbols/nparkf-outline-m.svg similarity index 100% rename from data/styles/default/light/symbols/nparkf-outline-m.svg rename to data/styles/walking/light/symbols/nparkf-outline-m.svg diff --git a/data/styles/default/light/symbols/nparkf-outline-s.svg b/data/styles/walking/light/symbols/nparkf-outline-s.svg similarity index 100% rename from data/styles/default/light/symbols/nparkf-outline-s.svg rename to data/styles/walking/light/symbols/nparkf-outline-s.svg diff --git a/data/styles/default/light/symbols/nparkf-s.svg b/data/styles/walking/light/symbols/nparkf-s.svg similarity index 100% rename from data/styles/default/light/symbols/nparkf-s.svg rename to data/styles/walking/light/symbols/nparkf-s.svg diff --git a/data/styles/default/light/symbols/observatory-m.svg b/data/styles/walking/light/symbols/observatory-m.svg similarity index 100% rename from data/styles/default/light/symbols/observatory-m.svg rename to data/styles/walking/light/symbols/observatory-m.svg diff --git a/data/styles/default/light/symbols/office-m.svg b/data/styles/walking/light/symbols/office-m.svg similarity index 100% rename from data/styles/default/light/symbols/office-m.svg rename to data/styles/walking/light/symbols/office-m.svg diff --git a/data/styles/default/light/symbols/optician-m.svg b/data/styles/walking/light/symbols/optician-m.svg similarity index 100% rename from data/styles/default/light/symbols/optician-m.svg rename to data/styles/walking/light/symbols/optician-m.svg diff --git a/data/styles/default/light/symbols/optometrist-m.svg b/data/styles/walking/light/symbols/optometrist-m.svg similarity index 100% rename from data/styles/default/light/symbols/optometrist-m.svg rename to data/styles/walking/light/symbols/optometrist-m.svg diff --git a/data/styles/default/light/symbols/outdoor-shop-m.svg b/data/styles/walking/light/symbols/outdoor-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/outdoor-shop-m.svg rename to data/styles/walking/light/symbols/outdoor-shop-m.svg diff --git a/data/styles/default/light/symbols/outdoor_seating-m.svg b/data/styles/walking/light/symbols/outdoor_seating-m.svg similarity index 100% rename from data/styles/default/light/symbols/outdoor_seating-m.svg rename to data/styles/walking/light/symbols/outdoor_seating-m.svg diff --git a/data/styles/default/light/symbols/padel-centre-m.svg b/data/styles/walking/light/symbols/padel-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/padel-centre-m.svg rename to data/styles/walking/light/symbols/padel-centre-m.svg diff --git a/data/styles/default/light/symbols/padel-m.svg b/data/styles/walking/light/symbols/padel-m.svg similarity index 100% rename from data/styles/default/light/symbols/padel-m.svg rename to data/styles/walking/light/symbols/padel-m.svg diff --git a/data/styles/default/light/symbols/painter-m.svg b/data/styles/walking/light/symbols/painter-m.svg similarity index 100% rename from data/styles/default/light/symbols/painter-m.svg rename to data/styles/walking/light/symbols/painter-m.svg diff --git a/data/styles/default/light/symbols/parcel_locker-m.svg b/data/styles/walking/light/symbols/parcel_locker-m.svg similarity index 100% rename from data/styles/default/light/symbols/parcel_locker-m.svg rename to data/styles/walking/light/symbols/parcel_locker-m.svg diff --git a/data/styles/default/light/symbols/park-m.svg b/data/styles/walking/light/symbols/park-m.svg similarity index 100% rename from data/styles/default/light/symbols/park-m.svg rename to data/styles/walking/light/symbols/park-m.svg diff --git a/data/styles/default/light/symbols/park-outline-m.svg b/data/styles/walking/light/symbols/park-outline-m.svg similarity index 100% rename from data/styles/default/light/symbols/park-outline-m.svg rename to data/styles/walking/light/symbols/park-outline-m.svg diff --git a/data/styles/default/light/symbols/park-outline-s.svg b/data/styles/walking/light/symbols/park-outline-s.svg similarity index 100% rename from data/styles/default/light/symbols/park-outline-s.svg rename to data/styles/walking/light/symbols/park-outline-s.svg diff --git a/data/styles/default/light/symbols/park-s.svg b/data/styles/walking/light/symbols/park-s.svg similarity index 100% rename from data/styles/default/light/symbols/park-s.svg rename to data/styles/walking/light/symbols/park-s.svg diff --git a/data/styles/default/light/symbols/parking-disabled-m.svg b/data/styles/walking/light/symbols/parking-disabled-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking-disabled-m.svg rename to data/styles/walking/light/symbols/parking-disabled-m.svg diff --git a/data/styles/default/light/symbols/parking-m.svg b/data/styles/walking/light/symbols/parking-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking-m.svg rename to data/styles/walking/light/symbols/parking-m.svg diff --git a/data/styles/default/light/symbols/parking-meter-m.svg b/data/styles/walking/light/symbols/parking-meter-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking-meter-m.svg rename to data/styles/walking/light/symbols/parking-meter-m.svg diff --git a/data/styles/default/light/symbols/parking-s.svg b/data/styles/walking/light/symbols/parking-s.svg similarity index 100% rename from data/styles/default/light/symbols/parking-s.svg rename to data/styles/walking/light/symbols/parking-s.svg diff --git a/data/styles/default/light/symbols/parking_entrance-m.svg b/data/styles/walking/light/symbols/parking_entrance-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_entrance-m.svg rename to data/styles/walking/light/symbols/parking_entrance-m.svg diff --git a/data/styles/default/light/symbols/parking_entrance_private-m.svg b/data/styles/walking/light/symbols/parking_entrance_private-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_entrance_private-m.svg rename to data/styles/walking/light/symbols/parking_entrance_private-m.svg diff --git a/data/styles/default/light/symbols/parking_pay-m.svg b/data/styles/walking/light/symbols/parking_pay-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_pay-m.svg rename to data/styles/walking/light/symbols/parking_pay-m.svg diff --git a/data/styles/default/light/symbols/parking_pay-s.svg b/data/styles/walking/light/symbols/parking_pay-s.svg similarity index 100% rename from data/styles/default/light/symbols/parking_pay-s.svg rename to data/styles/walking/light/symbols/parking_pay-s.svg diff --git a/data/styles/default/light/symbols/parking_pooling-m.svg b/data/styles/walking/light/symbols/parking_pooling-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_pooling-m.svg rename to data/styles/walking/light/symbols/parking_pooling-m.svg diff --git a/data/styles/default/light/symbols/parking_pooling-s.svg b/data/styles/walking/light/symbols/parking_pooling-s.svg similarity index 100% rename from data/styles/default/light/symbols/parking_pooling-s.svg rename to data/styles/walking/light/symbols/parking_pooling-s.svg diff --git a/data/styles/default/light/symbols/parking_private-m.svg b/data/styles/walking/light/symbols/parking_private-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_private-m.svg rename to data/styles/walking/light/symbols/parking_private-m.svg diff --git a/data/styles/default/light/symbols/parking_private-s.svg b/data/styles/walking/light/symbols/parking_private-s.svg similarity index 100% rename from data/styles/default/light/symbols/parking_private-s.svg rename to data/styles/walking/light/symbols/parking_private-s.svg diff --git a/data/styles/default/light/symbols/parking_underground-m.svg b/data/styles/walking/light/symbols/parking_underground-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_underground-m.svg rename to data/styles/walking/light/symbols/parking_underground-m.svg diff --git a/data/styles/default/light/symbols/parking_underground_pay-m.svg b/data/styles/walking/light/symbols/parking_underground_pay-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_underground_pay-m.svg rename to data/styles/walking/light/symbols/parking_underground_pay-m.svg diff --git a/data/styles/default/light/symbols/parking_underground_private-m.svg b/data/styles/walking/light/symbols/parking_underground_private-m.svg similarity index 100% rename from data/styles/default/light/symbols/parking_underground_private-m.svg rename to data/styles/walking/light/symbols/parking_underground_private-m.svg diff --git a/data/styles/default/light/symbols/peakt-m.svg b/data/styles/walking/light/symbols/peakt-m.svg similarity index 100% rename from data/styles/default/light/symbols/peakt-m.svg rename to data/styles/walking/light/symbols/peakt-m.svg diff --git a/data/styles/default/light/symbols/peakt-s.svg b/data/styles/walking/light/symbols/peakt-s.svg similarity index 100% rename from data/styles/default/light/symbols/peakt-s.svg rename to data/styles/walking/light/symbols/peakt-s.svg diff --git a/data/styles/default/light/symbols/pelota-centre-m.svg b/data/styles/walking/light/symbols/pelota-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/pelota-centre-m.svg rename to data/styles/walking/light/symbols/pelota-centre-m.svg diff --git a/data/styles/default/light/symbols/pelota-m.svg b/data/styles/walking/light/symbols/pelota-m.svg similarity index 100% rename from data/styles/default/light/symbols/pelota-m.svg rename to data/styles/walking/light/symbols/pelota-m.svg diff --git a/data/styles/default/light/symbols/petshop-m.svg b/data/styles/walking/light/symbols/petshop-m.svg similarity index 100% rename from data/styles/default/light/symbols/petshop-m.svg rename to data/styles/walking/light/symbols/petshop-m.svg diff --git a/data/styles/default/light/symbols/petting_zoo-m.svg b/data/styles/walking/light/symbols/petting_zoo-m.svg similarity index 100% rename from data/styles/default/light/symbols/petting_zoo-m.svg rename to data/styles/walking/light/symbols/petting_zoo-m.svg diff --git a/data/styles/default/light/symbols/pharmacy-m.svg b/data/styles/walking/light/symbols/pharmacy-m.svg similarity index 100% rename from data/styles/default/light/symbols/pharmacy-m.svg rename to data/styles/walking/light/symbols/pharmacy-m.svg diff --git a/data/styles/default/light/symbols/phone-m.svg b/data/styles/walking/light/symbols/phone-m.svg similarity index 100% rename from data/styles/default/light/symbols/phone-m.svg rename to data/styles/walking/light/symbols/phone-m.svg diff --git a/data/styles/default/light/symbols/photo-shop-m.svg b/data/styles/walking/light/symbols/photo-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/photo-shop-m.svg rename to data/styles/walking/light/symbols/photo-shop-m.svg diff --git a/data/styles/default/light/symbols/physiotherapist-m.svg b/data/styles/walking/light/symbols/physiotherapist-m.svg similarity index 100% rename from data/styles/default/light/symbols/physiotherapist-m.svg rename to data/styles/walking/light/symbols/physiotherapist-m.svg diff --git a/data/styles/default/light/symbols/pickleball-centre-m.svg b/data/styles/walking/light/symbols/pickleball-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/pickleball-centre-m.svg rename to data/styles/walking/light/symbols/pickleball-centre-m.svg diff --git a/data/styles/default/light/symbols/pickleball-m.svg b/data/styles/walking/light/symbols/pickleball-m.svg similarity index 100% rename from data/styles/default/light/symbols/pickleball-m.svg rename to data/styles/walking/light/symbols/pickleball-m.svg diff --git a/data/styles/default/light/symbols/picnic-m.svg b/data/styles/walking/light/symbols/picnic-m.svg similarity index 100% rename from data/styles/default/light/symbols/picnic-m.svg rename to data/styles/walking/light/symbols/picnic-m.svg diff --git a/data/styles/default/light/symbols/picnic-s.svg b/data/styles/walking/light/symbols/picnic-s.svg similarity index 100% rename from data/styles/default/light/symbols/picnic-s.svg rename to data/styles/walking/light/symbols/picnic-s.svg diff --git a/data/styles/default/light/symbols/picnic_table-m.svg b/data/styles/walking/light/symbols/picnic_table-m.svg similarity index 100% rename from data/styles/default/light/symbols/picnic_table-m.svg rename to data/styles/walking/light/symbols/picnic_table-m.svg diff --git a/data/styles/default/light/symbols/pitch-m.svg b/data/styles/walking/light/symbols/pitch-m.svg similarity index 100% rename from data/styles/default/light/symbols/pitch-m.svg rename to data/styles/walking/light/symbols/pitch-m.svg diff --git a/data/styles/default/light/symbols/place-of-worship-m.svg b/data/styles/walking/light/symbols/place-of-worship-m.svg similarity index 100% rename from data/styles/default/light/symbols/place-of-worship-m.svg rename to data/styles/walking/light/symbols/place-of-worship-m.svg diff --git a/data/styles/default/light/symbols/place-of-worship-s.svg b/data/styles/walking/light/symbols/place-of-worship-s.svg similarity index 100% rename from data/styles/default/light/symbols/place-of-worship-s.svg rename to data/styles/walking/light/symbols/place-of-worship-s.svg diff --git a/data/styles/default/light/symbols/plant_nursery-m.svg b/data/styles/walking/light/symbols/plant_nursery-m.svg similarity index 100% rename from data/styles/default/light/symbols/plant_nursery-m.svg rename to data/styles/walking/light/symbols/plant_nursery-m.svg diff --git a/data/styles/default/light/symbols/plaque.svg b/data/styles/walking/light/symbols/plaque.svg similarity index 100% rename from data/styles/default/light/symbols/plaque.svg rename to data/styles/walking/light/symbols/plaque.svg diff --git a/data/styles/default/light/symbols/playground-m.svg b/data/styles/walking/light/symbols/playground-m.svg similarity index 100% rename from data/styles/default/light/symbols/playground-m.svg rename to data/styles/walking/light/symbols/playground-m.svg diff --git a/data/styles/default/light/symbols/plumber-m.svg b/data/styles/walking/light/symbols/plumber-m.svg similarity index 100% rename from data/styles/default/light/symbols/plumber-m.svg rename to data/styles/walking/light/symbols/plumber-m.svg diff --git a/data/styles/default/light/symbols/podiatrist-m.svg b/data/styles/walking/light/symbols/podiatrist-m.svg similarity index 100% rename from data/styles/default/light/symbols/podiatrist-m.svg rename to data/styles/walking/light/symbols/podiatrist-m.svg diff --git a/data/styles/default/light/symbols/pole-m.svg b/data/styles/walking/light/symbols/pole-m.svg similarity index 100% rename from data/styles/default/light/symbols/pole-m.svg rename to data/styles/walking/light/symbols/pole-m.svg diff --git a/data/styles/default/light/symbols/police-m.svg b/data/styles/walking/light/symbols/police-m.svg similarity index 100% rename from data/styles/default/light/symbols/police-m.svg rename to data/styles/walking/light/symbols/police-m.svg diff --git a/data/styles/default/light/symbols/postbox-m.svg b/data/styles/walking/light/symbols/postbox-m.svg similarity index 100% rename from data/styles/default/light/symbols/postbox-m.svg rename to data/styles/walking/light/symbols/postbox-m.svg diff --git a/data/styles/default/light/symbols/power-m.svg b/data/styles/walking/light/symbols/power-m.svg similarity index 100% rename from data/styles/default/light/symbols/power-m.svg rename to data/styles/walking/light/symbols/power-m.svg diff --git a/data/styles/default/light/symbols/power-tower-m.svg b/data/styles/walking/light/symbols/power-tower-m.svg similarity index 100% rename from data/styles/default/light/symbols/power-tower-m.svg rename to data/styles/walking/light/symbols/power-tower-m.svg diff --git a/data/styles/default/light/symbols/power_plant_wind-m.svg b/data/styles/walking/light/symbols/power_plant_wind-m.svg similarity index 100% rename from data/styles/default/light/symbols/power_plant_wind-m.svg rename to data/styles/walking/light/symbols/power_plant_wind-m.svg diff --git a/data/styles/default/light/symbols/prep_school-m.svg b/data/styles/walking/light/symbols/prep_school-m.svg similarity index 100% rename from data/styles/default/light/symbols/prep_school-m.svg rename to data/styles/walking/light/symbols/prep_school-m.svg diff --git a/data/styles/default/light/symbols/prison-m.svg b/data/styles/walking/light/symbols/prison-m.svg similarity index 100% rename from data/styles/default/light/symbols/prison-m.svg rename to data/styles/walking/light/symbols/prison-m.svg diff --git a/data/styles/default/light/symbols/psychotherapist-m.svg b/data/styles/walking/light/symbols/psychotherapist-m.svg similarity index 100% rename from data/styles/default/light/symbols/psychotherapist-m.svg rename to data/styles/walking/light/symbols/psychotherapist-m.svg diff --git a/data/styles/default/light/symbols/pub-m.svg b/data/styles/walking/light/symbols/pub-m.svg similarity index 100% rename from data/styles/default/light/symbols/pub-m.svg rename to data/styles/walking/light/symbols/pub-m.svg diff --git a/data/styles/default/light/symbols/public-building-m.svg b/data/styles/walking/light/symbols/public-building-m.svg similarity index 100% rename from data/styles/default/light/symbols/public-building-m.svg rename to data/styles/walking/light/symbols/public-building-m.svg diff --git a/data/styles/default/light/symbols/public_bath-m.svg b/data/styles/walking/light/symbols/public_bath-m.svg similarity index 100% rename from data/styles/default/light/symbols/public_bath-m.svg rename to data/styles/walking/light/symbols/public_bath-m.svg diff --git a/data/styles/default/light/symbols/railway-crossing-l.svg b/data/styles/walking/light/symbols/railway-crossing-l.svg similarity index 100% rename from data/styles/default/light/symbols/railway-crossing-l.svg rename to data/styles/walking/light/symbols/railway-crossing-l.svg diff --git a/data/styles/default/light/symbols/railway-crossing-m.svg b/data/styles/walking/light/symbols/railway-crossing-m.svg similarity index 100% rename from data/styles/default/light/symbols/railway-crossing-m.svg rename to data/styles/walking/light/symbols/railway-crossing-m.svg diff --git a/data/styles/default/light/symbols/ranger-station-m.svg b/data/styles/walking/light/symbols/ranger-station-m.svg similarity index 100% rename from data/styles/default/light/symbols/ranger-station-m.svg rename to data/styles/walking/light/symbols/ranger-station-m.svg diff --git a/data/styles/default/light/symbols/recycling-centre-m.svg b/data/styles/walking/light/symbols/recycling-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/recycling-centre-m.svg rename to data/styles/walking/light/symbols/recycling-centre-m.svg diff --git a/data/styles/default/light/symbols/recycling-m.svg b/data/styles/walking/light/symbols/recycling-m.svg similarity index 100% rename from data/styles/default/light/symbols/recycling-m.svg rename to data/styles/walking/light/symbols/recycling-m.svg diff --git a/data/styles/default/light/symbols/remains-m.svg b/data/styles/walking/light/symbols/remains-m.svg similarity index 100% rename from data/styles/default/light/symbols/remains-m.svg rename to data/styles/walking/light/symbols/remains-m.svg diff --git a/data/styles/default/light/symbols/remains-s.svg b/data/styles/walking/light/symbols/remains-s.svg similarity index 100% rename from data/styles/default/light/symbols/remains-s.svg rename to data/styles/walking/light/symbols/remains-s.svg diff --git a/data/styles/default/light/symbols/rental-m.svg b/data/styles/walking/light/symbols/rental-m.svg similarity index 100% rename from data/styles/default/light/symbols/rental-m.svg rename to data/styles/walking/light/symbols/rental-m.svg diff --git a/data/styles/default/light/symbols/restaurant-m.svg b/data/styles/walking/light/symbols/restaurant-m.svg similarity index 100% rename from data/styles/default/light/symbols/restaurant-m.svg rename to data/styles/walking/light/symbols/restaurant-m.svg diff --git a/data/styles/default/light/symbols/route-arrow.svg b/data/styles/walking/light/symbols/route-arrow.svg similarity index 100% rename from data/styles/default/light/symbols/route-arrow.svg rename to data/styles/walking/light/symbols/route-arrow.svg diff --git a/data/styles/default/light/symbols/route-point-1.svg b/data/styles/walking/light/symbols/route-point-1.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-1.svg rename to data/styles/walking/light/symbols/route-point-1.svg diff --git a/data/styles/default/light/symbols/route-point-10.svg b/data/styles/walking/light/symbols/route-point-10.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-10.svg rename to data/styles/walking/light/symbols/route-point-10.svg diff --git a/data/styles/default/light/symbols/route-point-11.svg b/data/styles/walking/light/symbols/route-point-11.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-11.svg rename to data/styles/walking/light/symbols/route-point-11.svg diff --git a/data/styles/default/light/symbols/route-point-12.svg b/data/styles/walking/light/symbols/route-point-12.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-12.svg rename to data/styles/walking/light/symbols/route-point-12.svg diff --git a/data/styles/default/light/symbols/route-point-13.svg b/data/styles/walking/light/symbols/route-point-13.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-13.svg rename to data/styles/walking/light/symbols/route-point-13.svg diff --git a/data/styles/default/light/symbols/route-point-14.svg b/data/styles/walking/light/symbols/route-point-14.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-14.svg rename to data/styles/walking/light/symbols/route-point-14.svg diff --git a/data/styles/default/light/symbols/route-point-15.svg b/data/styles/walking/light/symbols/route-point-15.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-15.svg rename to data/styles/walking/light/symbols/route-point-15.svg diff --git a/data/styles/default/light/symbols/route-point-16.svg b/data/styles/walking/light/symbols/route-point-16.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-16.svg rename to data/styles/walking/light/symbols/route-point-16.svg diff --git a/data/styles/default/light/symbols/route-point-17.svg b/data/styles/walking/light/symbols/route-point-17.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-17.svg rename to data/styles/walking/light/symbols/route-point-17.svg diff --git a/data/styles/default/light/symbols/route-point-18.svg b/data/styles/walking/light/symbols/route-point-18.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-18.svg rename to data/styles/walking/light/symbols/route-point-18.svg diff --git a/data/styles/default/light/symbols/route-point-19.svg b/data/styles/walking/light/symbols/route-point-19.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-19.svg rename to data/styles/walking/light/symbols/route-point-19.svg diff --git a/data/styles/default/light/symbols/route-point-2.svg b/data/styles/walking/light/symbols/route-point-2.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-2.svg rename to data/styles/walking/light/symbols/route-point-2.svg diff --git a/data/styles/default/light/symbols/route-point-20.svg b/data/styles/walking/light/symbols/route-point-20.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-20.svg rename to data/styles/walking/light/symbols/route-point-20.svg diff --git a/data/styles/default/light/symbols/route-point-3.svg b/data/styles/walking/light/symbols/route-point-3.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-3.svg rename to data/styles/walking/light/symbols/route-point-3.svg diff --git a/data/styles/default/light/symbols/route-point-4.svg b/data/styles/walking/light/symbols/route-point-4.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-4.svg rename to data/styles/walking/light/symbols/route-point-4.svg diff --git a/data/styles/default/light/symbols/route-point-5.svg b/data/styles/walking/light/symbols/route-point-5.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-5.svg rename to data/styles/walking/light/symbols/route-point-5.svg diff --git a/data/styles/default/light/symbols/route-point-6.svg b/data/styles/walking/light/symbols/route-point-6.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-6.svg rename to data/styles/walking/light/symbols/route-point-6.svg diff --git a/data/styles/default/light/symbols/route-point-7.svg b/data/styles/walking/light/symbols/route-point-7.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-7.svg rename to data/styles/walking/light/symbols/route-point-7.svg diff --git a/data/styles/default/light/symbols/route-point-8.svg b/data/styles/walking/light/symbols/route-point-8.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-8.svg rename to data/styles/walking/light/symbols/route-point-8.svg diff --git a/data/styles/default/light/symbols/route-point-9.svg b/data/styles/walking/light/symbols/route-point-9.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-9.svg rename to data/styles/walking/light/symbols/route-point-9.svg diff --git a/data/styles/default/light/symbols/route-point-finish.svg b/data/styles/walking/light/symbols/route-point-finish.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-finish.svg rename to data/styles/walking/light/symbols/route-point-finish.svg diff --git a/data/styles/default/light/symbols/route-point-start.svg b/data/styles/walking/light/symbols/route-point-start.svg similarity index 100% rename from data/styles/default/light/symbols/route-point-start.svg rename to data/styles/walking/light/symbols/route-point-start.svg diff --git a/data/styles/default/light/symbols/sample_collection-m.svg b/data/styles/walking/light/symbols/sample_collection-m.svg similarity index 100% rename from data/styles/default/light/symbols/sample_collection-m.svg rename to data/styles/walking/light/symbols/sample_collection-m.svg diff --git a/data/styles/default/light/symbols/sauna-m.svg b/data/styles/walking/light/symbols/sauna-m.svg similarity index 100% rename from data/styles/default/light/symbols/sauna-m.svg rename to data/styles/walking/light/symbols/sauna-m.svg diff --git a/data/styles/default/light/symbols/sawmill-m.svg b/data/styles/walking/light/symbols/sawmill-m.svg similarity index 100% rename from data/styles/default/light/symbols/sawmill-m.svg rename to data/styles/walking/light/symbols/sawmill-m.svg diff --git a/data/styles/default/light/symbols/school-m.svg b/data/styles/walking/light/symbols/school-m.svg similarity index 100% rename from data/styles/default/light/symbols/school-m.svg rename to data/styles/walking/light/symbols/school-m.svg diff --git a/data/styles/default/light/symbols/seafood-shop-m.svg b/data/styles/walking/light/symbols/seafood-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/seafood-shop-m.svg rename to data/styles/walking/light/symbols/seafood-shop-m.svg diff --git a/data/styles/default/light/symbols/search-result-apartment.svg b/data/styles/walking/light/symbols/search-result-apartment.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-apartment.svg rename to data/styles/walking/light/symbols/search-result-apartment.svg diff --git a/data/styles/default/light/symbols/search-result-archaeological-site.svg b/data/styles/walking/light/symbols/search-result-archaeological-site.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-archaeological-site.svg rename to data/styles/walking/light/symbols/search-result-archaeological-site.svg diff --git a/data/styles/default/light/symbols/search-result-art.svg b/data/styles/walking/light/symbols/search-result-art.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-art.svg rename to data/styles/walking/light/symbols/search-result-art.svg diff --git a/data/styles/default/light/symbols/search-result-attraction.svg b/data/styles/walking/light/symbols/search-result-attraction.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-attraction.svg rename to data/styles/walking/light/symbols/search-result-attraction.svg diff --git a/data/styles/default/light/symbols/search-result-bakery.svg b/data/styles/walking/light/symbols/search-result-bakery.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bakery.svg rename to data/styles/walking/light/symbols/search-result-bakery.svg diff --git a/data/styles/default/light/symbols/search-result-bank.svg b/data/styles/walking/light/symbols/search-result-bank.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bank.svg rename to data/styles/walking/light/symbols/search-result-bank.svg diff --git a/data/styles/default/light/symbols/search-result-bar.svg b/data/styles/walking/light/symbols/search-result-bar.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bar.svg rename to data/styles/walking/light/symbols/search-result-bar.svg diff --git a/data/styles/default/light/symbols/search-result-bicycle_parking-covered.svg b/data/styles/walking/light/symbols/search-result-bicycle_parking-covered.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bicycle_parking-covered.svg rename to data/styles/walking/light/symbols/search-result-bicycle_parking-covered.svg diff --git a/data/styles/default/light/symbols/search-result-bicycle_parking.svg b/data/styles/walking/light/symbols/search-result-bicycle_parking.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bicycle_parking.svg rename to data/styles/walking/light/symbols/search-result-bicycle_parking.svg diff --git a/data/styles/default/light/symbols/search-result-bicycle_rental.svg b/data/styles/walking/light/symbols/search-result-bicycle_rental.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-bicycle_rental.svg rename to data/styles/walking/light/symbols/search-result-bicycle_rental.svg diff --git a/data/styles/default/light/symbols/search-result-cafe.svg b/data/styles/walking/light/symbols/search-result-cafe.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-cafe.svg rename to data/styles/walking/light/symbols/search-result-cafe.svg diff --git a/data/styles/default/light/symbols/search-result-campsite.svg b/data/styles/walking/light/symbols/search-result-campsite.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-campsite.svg rename to data/styles/walking/light/symbols/search-result-campsite.svg diff --git a/data/styles/default/light/symbols/search-result-caravan-site.svg b/data/styles/walking/light/symbols/search-result-caravan-site.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-caravan-site.svg rename to data/styles/walking/light/symbols/search-result-caravan-site.svg diff --git a/data/styles/default/light/symbols/search-result-casino.svg b/data/styles/walking/light/symbols/search-result-casino.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-casino.svg rename to data/styles/walking/light/symbols/search-result-casino.svg diff --git a/data/styles/default/light/symbols/search-result-chalet.svg b/data/styles/walking/light/symbols/search-result-chalet.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-chalet.svg rename to data/styles/walking/light/symbols/search-result-chalet.svg diff --git a/data/styles/default/light/symbols/search-result-charging_station.svg b/data/styles/walking/light/symbols/search-result-charging_station.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-charging_station.svg rename to data/styles/walking/light/symbols/search-result-charging_station.svg diff --git a/data/styles/default/light/symbols/search-result-cinema.svg b/data/styles/walking/light/symbols/search-result-cinema.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-cinema.svg rename to data/styles/walking/light/symbols/search-result-cinema.svg diff --git a/data/styles/default/light/symbols/search-result-clinic.svg b/data/styles/walking/light/symbols/search-result-clinic.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-clinic.svg rename to data/styles/walking/light/symbols/search-result-clinic.svg diff --git a/data/styles/default/light/symbols/search-result-drinking-water-no.svg b/data/styles/walking/light/symbols/search-result-drinking-water-no.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-drinking-water-no.svg rename to data/styles/walking/light/symbols/search-result-drinking-water-no.svg diff --git a/data/styles/default/light/symbols/search-result-drinking-water.svg b/data/styles/walking/light/symbols/search-result-drinking-water.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-drinking-water.svg rename to data/styles/walking/light/symbols/search-result-drinking-water.svg diff --git a/data/styles/default/light/symbols/search-result-fastfood.svg b/data/styles/walking/light/symbols/search-result-fastfood.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-fastfood.svg rename to data/styles/walking/light/symbols/search-result-fastfood.svg diff --git a/data/styles/default/light/symbols/search-result-fuel.svg b/data/styles/walking/light/symbols/search-result-fuel.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-fuel.svg rename to data/styles/walking/light/symbols/search-result-fuel.svg diff --git a/data/styles/default/light/symbols/search-result-hospital.svg b/data/styles/walking/light/symbols/search-result-hospital.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-hospital.svg rename to data/styles/walking/light/symbols/search-result-hospital.svg diff --git a/data/styles/default/light/symbols/search-result-hostel.svg b/data/styles/walking/light/symbols/search-result-hostel.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-hostel.svg rename to data/styles/walking/light/symbols/search-result-hostel.svg diff --git a/data/styles/default/light/symbols/search-result-hotel.svg b/data/styles/walking/light/symbols/search-result-hotel.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-hotel.svg rename to data/styles/walking/light/symbols/search-result-hotel.svg diff --git a/data/styles/default/light/symbols/search-result-information.svg b/data/styles/walking/light/symbols/search-result-information.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-information.svg rename to data/styles/walking/light/symbols/search-result-information.svg diff --git a/data/styles/default/light/symbols/search-result-lottery.svg b/data/styles/walking/light/symbols/search-result-lottery.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-lottery.svg rename to data/styles/walking/light/symbols/search-result-lottery.svg diff --git a/data/styles/default/light/symbols/search-result-marketplace.svg b/data/styles/walking/light/symbols/search-result-marketplace.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-marketplace.svg rename to data/styles/walking/light/symbols/search-result-marketplace.svg diff --git a/data/styles/default/light/symbols/search-result-museum.svg b/data/styles/walking/light/symbols/search-result-museum.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-museum.svg rename to data/styles/walking/light/symbols/search-result-museum.svg diff --git a/data/styles/default/light/symbols/search-result-nightclub.svg b/data/styles/walking/light/symbols/search-result-nightclub.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-nightclub.svg rename to data/styles/walking/light/symbols/search-result-nightclub.svg diff --git a/data/styles/default/light/symbols/search-result-non-found.svg b/data/styles/walking/light/symbols/search-result-non-found.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-non-found.svg rename to data/styles/walking/light/symbols/search-result-non-found.svg diff --git a/data/styles/default/light/symbols/search-result-pharmacy.svg b/data/styles/walking/light/symbols/search-result-pharmacy.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-pharmacy.svg rename to data/styles/walking/light/symbols/search-result-pharmacy.svg diff --git a/data/styles/default/light/symbols/search-result-pitch.svg b/data/styles/walking/light/symbols/search-result-pitch.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-pitch.svg rename to data/styles/walking/light/symbols/search-result-pitch.svg diff --git a/data/styles/default/light/symbols/search-result-playground.svg b/data/styles/walking/light/symbols/search-result-playground.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-playground.svg rename to data/styles/walking/light/symbols/search-result-playground.svg diff --git a/data/styles/default/light/symbols/search-result-pub.svg b/data/styles/walking/light/symbols/search-result-pub.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-pub.svg rename to data/styles/walking/light/symbols/search-result-pub.svg diff --git a/data/styles/default/light/symbols/search-result-remains.svg b/data/styles/walking/light/symbols/search-result-remains.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-remains.svg rename to data/styles/walking/light/symbols/search-result-remains.svg diff --git a/data/styles/default/light/symbols/search-result-restaurant.svg b/data/styles/walking/light/symbols/search-result-restaurant.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-restaurant.svg rename to data/styles/walking/light/symbols/search-result-restaurant.svg diff --git a/data/styles/default/light/symbols/search-result-shop-alcohol.svg b/data/styles/walking/light/symbols/search-result-shop-alcohol.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-alcohol.svg rename to data/styles/walking/light/symbols/search-result-shop-alcohol.svg diff --git a/data/styles/default/light/symbols/search-result-shop-beauty.svg b/data/styles/walking/light/symbols/search-result-shop-beauty.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-beauty.svg rename to data/styles/walking/light/symbols/search-result-shop-beauty.svg diff --git a/data/styles/default/light/symbols/search-result-shop-butcher.svg b/data/styles/walking/light/symbols/search-result-shop-butcher.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-butcher.svg rename to data/styles/walking/light/symbols/search-result-shop-butcher.svg diff --git a/data/styles/default/light/symbols/search-result-shop-clothes.svg b/data/styles/walking/light/symbols/search-result-shop-clothes.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-clothes.svg rename to data/styles/walking/light/symbols/search-result-shop-clothes.svg diff --git a/data/styles/default/light/symbols/search-result-shop-confectionery.svg b/data/styles/walking/light/symbols/search-result-shop-confectionery.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-confectionery.svg rename to data/styles/walking/light/symbols/search-result-shop-confectionery.svg diff --git a/data/styles/default/light/symbols/search-result-shop-convenience.svg b/data/styles/walking/light/symbols/search-result-shop-convenience.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-convenience.svg rename to data/styles/walking/light/symbols/search-result-shop-convenience.svg diff --git a/data/styles/default/light/symbols/search-result-shop-department_store.svg b/data/styles/walking/light/symbols/search-result-shop-department_store.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-department_store.svg rename to data/styles/walking/light/symbols/search-result-shop-department_store.svg diff --git a/data/styles/default/light/symbols/search-result-shop-gift.svg b/data/styles/walking/light/symbols/search-result-shop-gift.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-gift.svg rename to data/styles/walking/light/symbols/search-result-shop-gift.svg diff --git a/data/styles/default/light/symbols/search-result-shop-greengrocer.svg b/data/styles/walking/light/symbols/search-result-shop-greengrocer.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-greengrocer.svg rename to data/styles/walking/light/symbols/search-result-shop-greengrocer.svg diff --git a/data/styles/default/light/symbols/search-result-shop-jewelry.svg b/data/styles/walking/light/symbols/search-result-shop-jewelry.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-jewelry.svg rename to data/styles/walking/light/symbols/search-result-shop-jewelry.svg diff --git a/data/styles/default/light/symbols/search-result-shop-seafood.svg b/data/styles/walking/light/symbols/search-result-shop-seafood.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-seafood.svg rename to data/styles/walking/light/symbols/search-result-shop-seafood.svg diff --git a/data/styles/default/light/symbols/search-result-shop-shoes.svg b/data/styles/walking/light/symbols/search-result-shop-shoes.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-shoes.svg rename to data/styles/walking/light/symbols/search-result-shop-shoes.svg diff --git a/data/styles/default/light/symbols/search-result-shop-sports.svg b/data/styles/walking/light/symbols/search-result-shop-sports.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-sports.svg rename to data/styles/walking/light/symbols/search-result-shop-sports.svg diff --git a/data/styles/default/light/symbols/search-result-shop-supermarket.svg b/data/styles/walking/light/symbols/search-result-shop-supermarket.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-supermarket.svg rename to data/styles/walking/light/symbols/search-result-shop-supermarket.svg diff --git a/data/styles/default/light/symbols/search-result-shop-toys.svg b/data/styles/walking/light/symbols/search-result-shop-toys.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-shop-toys.svg rename to data/styles/walking/light/symbols/search-result-shop-toys.svg diff --git a/data/styles/default/light/symbols/search-result-stadium.svg b/data/styles/walking/light/symbols/search-result-stadium.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-stadium.svg rename to data/styles/walking/light/symbols/search-result-stadium.svg diff --git a/data/styles/default/light/symbols/search-result-swimming.svg b/data/styles/walking/light/symbols/search-result-swimming.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-swimming.svg rename to data/styles/walking/light/symbols/search-result-swimming.svg diff --git a/data/styles/default/light/symbols/search-result-theatre.svg b/data/styles/walking/light/symbols/search-result-theatre.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-theatre.svg rename to data/styles/walking/light/symbols/search-result-theatre.svg diff --git a/data/styles/default/light/symbols/search-result-theme-park.svg b/data/styles/walking/light/symbols/search-result-theme-park.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-theme-park.svg rename to data/styles/walking/light/symbols/search-result-theme-park.svg diff --git a/data/styles/default/light/symbols/search-result-viewpoint.svg b/data/styles/walking/light/symbols/search-result-viewpoint.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-viewpoint.svg rename to data/styles/walking/light/symbols/search-result-viewpoint.svg diff --git a/data/styles/default/light/symbols/search-result-zoo.svg b/data/styles/walking/light/symbols/search-result-zoo.svg similarity index 100% rename from data/styles/default/light/symbols/search-result-zoo.svg rename to data/styles/walking/light/symbols/search-result-zoo.svg diff --git a/data/styles/default/light/symbols/search-result.svg b/data/styles/walking/light/symbols/search-result.svg similarity index 100% rename from data/styles/default/light/symbols/search-result.svg rename to data/styles/walking/light/symbols/search-result.svg diff --git a/data/styles/default/light/symbols/second_hand_shop-m.svg b/data/styles/walking/light/symbols/second_hand_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/second_hand_shop-m.svg rename to data/styles/walking/light/symbols/second_hand_shop-m.svg diff --git a/data/styles/default/light/symbols/security-m.svg b/data/styles/walking/light/symbols/security-m.svg similarity index 100% rename from data/styles/default/light/symbols/security-m.svg rename to data/styles/walking/light/symbols/security-m.svg diff --git a/data/styles/default/light/symbols/shelter-m.svg b/data/styles/walking/light/symbols/shelter-m.svg similarity index 100% rename from data/styles/default/light/symbols/shelter-m.svg rename to data/styles/walking/light/symbols/shelter-m.svg diff --git a/data/styles/default/light/symbols/shelter-public_transport-m.svg b/data/styles/walking/light/symbols/shelter-public_transport-m.svg similarity index 100% rename from data/styles/default/light/symbols/shelter-public_transport-m.svg rename to data/styles/walking/light/symbols/shelter-public_transport-m.svg diff --git a/data/styles/default/light/symbols/shelter-s.svg b/data/styles/walking/light/symbols/shelter-s.svg similarity index 100% rename from data/styles/default/light/symbols/shelter-s.svg rename to data/styles/walking/light/symbols/shelter-s.svg diff --git a/data/styles/default/light/symbols/shield-argentina-rn-scaled.svg b/data/styles/walking/light/symbols/shield-argentina-rn-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-argentina-rn-scaled.svg rename to data/styles/walking/light/symbols/shield-argentina-rn-scaled.svg diff --git a/data/styles/default/light/symbols/shield-argentina-rn-wide-scaled.svg b/data/styles/walking/light/symbols/shield-argentina-rn-wide-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-argentina-rn-wide-scaled.svg rename to data/styles/walking/light/symbols/shield-argentina-rn-wide-scaled.svg diff --git a/data/styles/default/light/symbols/shield-argentina-rn-wide.svg b/data/styles/walking/light/symbols/shield-argentina-rn-wide.svg similarity index 100% rename from data/styles/default/light/symbols/shield-argentina-rn-wide.svg rename to data/styles/walking/light/symbols/shield-argentina-rn-wide.svg diff --git a/data/styles/default/light/symbols/shield-argentina-rn.svg b/data/styles/walking/light/symbols/shield-argentina-rn.svg similarity index 100% rename from data/styles/default/light/symbols/shield-argentina-rn.svg rename to data/styles/walking/light/symbols/shield-argentina-rn.svg diff --git a/data/styles/default/light/symbols/shield-bolivia-fundamental-scaled.svg b/data/styles/walking/light/symbols/shield-bolivia-fundamental-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-bolivia-fundamental-scaled.svg rename to data/styles/walking/light/symbols/shield-bolivia-fundamental-scaled.svg diff --git a/data/styles/default/light/symbols/shield-bolivia-fundamental.svg b/data/styles/walking/light/symbols/shield-bolivia-fundamental.svg similarity index 100% rename from data/styles/default/light/symbols/shield-bolivia-fundamental.svg rename to data/styles/walking/light/symbols/shield-bolivia-fundamental.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_blue-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_blue-scaled.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_blue-scaled.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_blue.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_blue.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_blue.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_blue.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_green-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_green-scaled.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_green-scaled.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_green.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_green.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_green.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_green.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_red-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_red-scaled.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_red-scaled.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_red.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_red.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_red.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_red.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_turkey-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_turkey-scaled.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_turkey-scaled.svg diff --git a/data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg b/data/styles/walking/light/symbols/shield-highway_hexagon_turkey.svg similarity index 100% rename from data/styles/default/light/symbols/shield-highway_hexagon_turkey.svg rename to data/styles/walking/light/symbols/shield-highway_hexagon_turkey.svg diff --git a/data/styles/default/light/symbols/shield-hungary-blue-scaled.svg b/data/styles/walking/light/symbols/shield-hungary-blue-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-hungary-blue-scaled.svg rename to data/styles/walking/light/symbols/shield-hungary-blue-scaled.svg diff --git a/data/styles/default/light/symbols/shield-hungary-blue.svg b/data/styles/walking/light/symbols/shield-hungary-blue.svg similarity index 100% rename from data/styles/default/light/symbols/shield-hungary-blue.svg rename to data/styles/walking/light/symbols/shield-hungary-blue.svg diff --git a/data/styles/default/light/symbols/shield-hungary-green-scaled.svg b/data/styles/walking/light/symbols/shield-hungary-green-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-hungary-green-scaled.svg rename to data/styles/walking/light/symbols/shield-hungary-green-scaled.svg diff --git a/data/styles/default/light/symbols/shield-hungary-green.svg b/data/styles/walking/light/symbols/shield-hungary-green.svg similarity index 100% rename from data/styles/default/light/symbols/shield-hungary-green.svg rename to data/styles/walking/light/symbols/shield-hungary-green.svg diff --git a/data/styles/default/light/symbols/shield-it-a-scaled.svg b/data/styles/walking/light/symbols/shield-it-a-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-it-a-scaled.svg rename to data/styles/walking/light/symbols/shield-it-a-scaled.svg diff --git a/data/styles/default/light/symbols/shield-it-a.svg b/data/styles/walking/light/symbols/shield-it-a.svg similarity index 100% rename from data/styles/default/light/symbols/shield-it-a.svg rename to data/styles/walking/light/symbols/shield-it-a.svg diff --git a/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg b/data/styles/walking/light/symbols/shield-us-hw-thin-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg rename to data/styles/walking/light/symbols/shield-us-hw-thin-scaled.svg diff --git a/data/styles/default/light/symbols/shield-us-hw-thin.svg b/data/styles/walking/light/symbols/shield-us-hw-thin.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-hw-thin.svg rename to data/styles/walking/light/symbols/shield-us-hw-thin.svg diff --git a/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg b/data/styles/walking/light/symbols/shield-us-hw-wide-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg rename to data/styles/walking/light/symbols/shield-us-hw-wide-scaled.svg diff --git a/data/styles/default/light/symbols/shield-us-hw-wide.svg b/data/styles/walking/light/symbols/shield-us-hw-wide.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-hw-wide.svg rename to data/styles/walking/light/symbols/shield-us-hw-wide.svg diff --git a/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg b/data/styles/walking/light/symbols/shield-us-i-thin-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-i-thin-scaled.svg rename to data/styles/walking/light/symbols/shield-us-i-thin-scaled.svg diff --git a/data/styles/default/light/symbols/shield-us-i-thin.svg b/data/styles/walking/light/symbols/shield-us-i-thin.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-i-thin.svg rename to data/styles/walking/light/symbols/shield-us-i-thin.svg diff --git a/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg b/data/styles/walking/light/symbols/shield-us-i-wide-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-i-wide-scaled.svg rename to data/styles/walking/light/symbols/shield-us-i-wide-scaled.svg diff --git a/data/styles/default/light/symbols/shield-us-i-wide.svg b/data/styles/walking/light/symbols/shield-us-i-wide.svg similarity index 100% rename from data/styles/default/light/symbols/shield-us-i-wide.svg rename to data/styles/walking/light/symbols/shield-us-i-wide.svg diff --git a/data/styles/default/light/symbols/shield-uy-scaled.svg b/data/styles/walking/light/symbols/shield-uy-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-uy-scaled.svg rename to data/styles/walking/light/symbols/shield-uy-scaled.svg diff --git a/data/styles/default/light/symbols/shield-uy-wide-scaled.svg b/data/styles/walking/light/symbols/shield-uy-wide-scaled.svg similarity index 100% rename from data/styles/default/light/symbols/shield-uy-wide-scaled.svg rename to data/styles/walking/light/symbols/shield-uy-wide-scaled.svg diff --git a/data/styles/default/light/symbols/shield-uy-wide.svg b/data/styles/walking/light/symbols/shield-uy-wide.svg similarity index 100% rename from data/styles/default/light/symbols/shield-uy-wide.svg rename to data/styles/walking/light/symbols/shield-uy-wide.svg diff --git a/data/styles/default/light/symbols/shield-uy.svg b/data/styles/walking/light/symbols/shield-uy.svg similarity index 100% rename from data/styles/default/light/symbols/shield-uy.svg rename to data/styles/walking/light/symbols/shield-uy.svg diff --git a/data/styles/default/light/symbols/shinto-m.svg b/data/styles/walking/light/symbols/shinto-m.svg similarity index 100% rename from data/styles/default/light/symbols/shinto-m.svg rename to data/styles/walking/light/symbols/shinto-m.svg diff --git a/data/styles/default/light/symbols/shinto-s.svg b/data/styles/walking/light/symbols/shinto-s.svg similarity index 100% rename from data/styles/default/light/symbols/shinto-s.svg rename to data/styles/walking/light/symbols/shinto-s.svg diff --git a/data/styles/default/light/symbols/ship-m.svg b/data/styles/walking/light/symbols/ship-m.svg similarity index 100% rename from data/styles/default/light/symbols/ship-m.svg rename to data/styles/walking/light/symbols/ship-m.svg diff --git a/data/styles/default/light/symbols/ship-s.svg b/data/styles/walking/light/symbols/ship-s.svg similarity index 100% rename from data/styles/default/light/symbols/ship-s.svg rename to data/styles/walking/light/symbols/ship-s.svg diff --git a/data/styles/default/light/symbols/shoes-m.svg b/data/styles/walking/light/symbols/shoes-m.svg similarity index 100% rename from data/styles/default/light/symbols/shoes-m.svg rename to data/styles/walking/light/symbols/shoes-m.svg diff --git a/data/styles/default/light/symbols/shop-bicycle-m.svg b/data/styles/walking/light/symbols/shop-bicycle-m.svg similarity index 100% rename from data/styles/default/light/symbols/shop-bicycle-m.svg rename to data/styles/walking/light/symbols/shop-bicycle-m.svg diff --git a/data/styles/default/light/symbols/shop-industry-m.svg b/data/styles/walking/light/symbols/shop-industry-m.svg similarity index 100% rename from data/styles/default/light/symbols/shop-industry-m.svg rename to data/styles/walking/light/symbols/shop-industry-m.svg diff --git a/data/styles/default/light/symbols/shop-m.svg b/data/styles/walking/light/symbols/shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/shop-m.svg rename to data/styles/walking/light/symbols/shop-m.svg diff --git a/data/styles/default/light/symbols/shop-rental-bicycle-m.svg b/data/styles/walking/light/symbols/shop-rental-bicycle-m.svg similarity index 100% rename from data/styles/default/light/symbols/shop-rental-bicycle-m.svg rename to data/styles/walking/light/symbols/shop-rental-bicycle-m.svg diff --git a/data/styles/default/light/symbols/shop-s.svg b/data/styles/walking/light/symbols/shop-s.svg similarity index 100% rename from data/styles/default/light/symbols/shop-s.svg rename to data/styles/walking/light/symbols/shop-s.svg diff --git a/data/styles/default/light/symbols/shop-water-m.svg b/data/styles/walking/light/symbols/shop-water-m.svg similarity index 100% rename from data/styles/default/light/symbols/shop-water-m.svg rename to data/styles/walking/light/symbols/shop-water-m.svg diff --git a/data/styles/default/light/symbols/shower-m.svg b/data/styles/walking/light/symbols/shower-m.svg similarity index 100% rename from data/styles/default/light/symbols/shower-m.svg rename to data/styles/walking/light/symbols/shower-m.svg diff --git a/data/styles/default/light/symbols/skateboard-centre-m.svg b/data/styles/walking/light/symbols/skateboard-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/skateboard-centre-m.svg rename to data/styles/walking/light/symbols/skateboard-centre-m.svg diff --git a/data/styles/default/light/symbols/skateboard-m.svg b/data/styles/walking/light/symbols/skateboard-m.svg similarity index 100% rename from data/styles/default/light/symbols/skateboard-m.svg rename to data/styles/walking/light/symbols/skateboard-m.svg diff --git a/data/styles/default/light/symbols/skiing-centre-m.svg b/data/styles/walking/light/symbols/skiing-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/skiing-centre-m.svg rename to data/styles/walking/light/symbols/skiing-centre-m.svg diff --git a/data/styles/default/light/symbols/skiing-m.svg b/data/styles/walking/light/symbols/skiing-m.svg similarity index 100% rename from data/styles/default/light/symbols/skiing-m.svg rename to data/styles/walking/light/symbols/skiing-m.svg diff --git a/data/styles/default/light/symbols/slipway-m.svg b/data/styles/walking/light/symbols/slipway-m.svg similarity index 100% rename from data/styles/default/light/symbols/slipway-m.svg rename to data/styles/walking/light/symbols/slipway-m.svg diff --git a/data/styles/default/light/symbols/slots-m.svg b/data/styles/walking/light/symbols/slots-m.svg similarity index 100% rename from data/styles/default/light/symbols/slots-m.svg rename to data/styles/walking/light/symbols/slots-m.svg diff --git a/data/styles/default/light/symbols/soccer-centre-m.svg b/data/styles/walking/light/symbols/soccer-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/soccer-centre-m.svg rename to data/styles/walking/light/symbols/soccer-centre-m.svg diff --git a/data/styles/default/light/symbols/soccer-m.svg b/data/styles/walking/light/symbols/soccer-m.svg similarity index 100% rename from data/styles/default/light/symbols/soccer-m.svg rename to data/styles/walking/light/symbols/soccer-m.svg diff --git a/data/styles/default/light/symbols/social_facility-m.svg b/data/styles/walking/light/symbols/social_facility-m.svg similarity index 100% rename from data/styles/default/light/symbols/social_facility-m.svg rename to data/styles/walking/light/symbols/social_facility-m.svg diff --git a/data/styles/default/light/symbols/soup_kitchen-m.svg b/data/styles/walking/light/symbols/soup_kitchen-m.svg similarity index 100% rename from data/styles/default/light/symbols/soup_kitchen-m.svg rename to data/styles/walking/light/symbols/soup_kitchen-m.svg diff --git a/data/styles/default/light/symbols/speech_therapist-m.svg b/data/styles/walking/light/symbols/speech_therapist-m.svg similarity index 100% rename from data/styles/default/light/symbols/speech_therapist-m.svg rename to data/styles/walking/light/symbols/speech_therapist-m.svg diff --git a/data/styles/default/light/symbols/speedcam-alert-l.svg b/data/styles/walking/light/symbols/speedcam-alert-l.svg similarity index 100% rename from data/styles/default/light/symbols/speedcam-alert-l.svg rename to data/styles/walking/light/symbols/speedcam-alert-l.svg diff --git a/data/styles/default/light/symbols/speedcam-m.svg b/data/styles/walking/light/symbols/speedcam-m.svg similarity index 100% rename from data/styles/default/light/symbols/speedcam-m.svg rename to data/styles/walking/light/symbols/speedcam-m.svg diff --git a/data/styles/default/light/symbols/speedcam-s.svg b/data/styles/walking/light/symbols/speedcam-s.svg similarity index 100% rename from data/styles/default/light/symbols/speedcam-s.svg rename to data/styles/walking/light/symbols/speedcam-s.svg diff --git a/data/styles/default/light/symbols/sports-m.svg b/data/styles/walking/light/symbols/sports-m.svg similarity index 100% rename from data/styles/default/light/symbols/sports-m.svg rename to data/styles/walking/light/symbols/sports-m.svg diff --git a/data/styles/default/light/symbols/sports_centre-m.svg b/data/styles/walking/light/symbols/sports_centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/sports_centre-m.svg rename to data/styles/walking/light/symbols/sports_centre-m.svg diff --git a/data/styles/default/light/symbols/stadium-m.svg b/data/styles/walking/light/symbols/stadium-m.svg similarity index 100% rename from data/styles/default/light/symbols/stadium-m.svg rename to data/styles/walking/light/symbols/stadium-m.svg diff --git a/data/styles/default/light/symbols/stadium-s.svg b/data/styles/walking/light/symbols/stadium-s.svg similarity index 100% rename from data/styles/default/light/symbols/stadium-s.svg rename to data/styles/walking/light/symbols/stadium-s.svg diff --git a/data/styles/default/light/symbols/star-l.svg b/data/styles/walking/light/symbols/star-l.svg similarity index 100% rename from data/styles/default/light/symbols/star-l.svg rename to data/styles/walking/light/symbols/star-l.svg diff --git a/data/styles/default/light/symbols/star-m.svg b/data/styles/walking/light/symbols/star-m.svg similarity index 100% rename from data/styles/default/light/symbols/star-m.svg rename to data/styles/walking/light/symbols/star-m.svg diff --git a/data/styles/default/light/symbols/star-s.svg b/data/styles/walking/light/symbols/star-s.svg similarity index 100% rename from data/styles/default/light/symbols/star-s.svg rename to data/styles/walking/light/symbols/star-s.svg diff --git a/data/styles/default/light/symbols/stationery_shop-m.svg b/data/styles/walking/light/symbols/stationery_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/stationery_shop-m.svg rename to data/styles/walking/light/symbols/stationery_shop-m.svg diff --git a/data/styles/default/light/symbols/statue-m.svg b/data/styles/walking/light/symbols/statue-m.svg similarity index 100% rename from data/styles/default/light/symbols/statue-m.svg rename to data/styles/walking/light/symbols/statue-m.svg diff --git a/data/styles/default/light/symbols/stone-m.svg b/data/styles/walking/light/symbols/stone-m.svg similarity index 100% rename from data/styles/default/light/symbols/stone-m.svg rename to data/styles/walking/light/symbols/stone-m.svg diff --git a/data/styles/default/light/symbols/storage-tank.svg b/data/styles/walking/light/symbols/storage-tank.svg similarity index 100% rename from data/styles/default/light/symbols/storage-tank.svg rename to data/styles/walking/light/symbols/storage-tank.svg diff --git a/data/styles/default/light/symbols/stripclub-m.svg b/data/styles/walking/light/symbols/stripclub-m.svg similarity index 100% rename from data/styles/default/light/symbols/stripclub-m.svg rename to data/styles/walking/light/symbols/stripclub-m.svg diff --git a/data/styles/default/light/symbols/studio-m.svg b/data/styles/walking/light/symbols/studio-m.svg similarity index 100% rename from data/styles/default/light/symbols/studio-m.svg rename to data/styles/walking/light/symbols/studio-m.svg diff --git a/data/styles/default/light/symbols/subway-adana-m.svg b/data/styles/walking/light/symbols/subway-adana-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-adana-m.svg rename to data/styles/walking/light/symbols/subway-adana-m.svg diff --git a/data/styles/default/light/symbols/subway-adana-s.svg b/data/styles/walking/light/symbols/subway-adana-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-adana-s.svg rename to data/styles/walking/light/symbols/subway-adana-s.svg diff --git a/data/styles/default/light/symbols/subway-algeria-m.svg b/data/styles/walking/light/symbols/subway-algeria-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-algeria-m.svg rename to data/styles/walking/light/symbols/subway-algeria-m.svg diff --git a/data/styles/default/light/symbols/subway-algeria-s.svg b/data/styles/walking/light/symbols/subway-algeria-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-algeria-s.svg rename to data/styles/walking/light/symbols/subway-algeria-s.svg diff --git a/data/styles/default/light/symbols/subway-alicante-m.svg b/data/styles/walking/light/symbols/subway-alicante-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-alicante-m.svg rename to data/styles/walking/light/symbols/subway-alicante-m.svg diff --git a/data/styles/default/light/symbols/subway-alicante-s.svg b/data/styles/walking/light/symbols/subway-alicante-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-alicante-s.svg rename to data/styles/walking/light/symbols/subway-alicante-s.svg diff --git a/data/styles/default/light/symbols/subway-almaty-m.svg b/data/styles/walking/light/symbols/subway-almaty-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-almaty-m.svg rename to data/styles/walking/light/symbols/subway-almaty-m.svg diff --git a/data/styles/default/light/symbols/subway-almaty-s.svg b/data/styles/walking/light/symbols/subway-almaty-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-almaty-s.svg rename to data/styles/walking/light/symbols/subway-almaty-s.svg diff --git a/data/styles/default/light/symbols/subway-amsterdam-m.svg b/data/styles/walking/light/symbols/subway-amsterdam-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-amsterdam-m.svg rename to data/styles/walking/light/symbols/subway-amsterdam-m.svg diff --git a/data/styles/default/light/symbols/subway-amsterdam-s.svg b/data/styles/walking/light/symbols/subway-amsterdam-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-amsterdam-s.svg rename to data/styles/walking/light/symbols/subway-amsterdam-s.svg diff --git a/data/styles/default/light/symbols/subway-ankara-m.svg b/data/styles/walking/light/symbols/subway-ankara-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ankara-m.svg rename to data/styles/walking/light/symbols/subway-ankara-m.svg diff --git a/data/styles/default/light/symbols/subway-ankara-s.svg b/data/styles/walking/light/symbols/subway-ankara-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ankara-s.svg rename to data/styles/walking/light/symbols/subway-ankara-s.svg diff --git a/data/styles/default/light/symbols/subway-athens-m.svg b/data/styles/walking/light/symbols/subway-athens-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-athens-m.svg rename to data/styles/walking/light/symbols/subway-athens-m.svg diff --git a/data/styles/default/light/symbols/subway-athens-s.svg b/data/styles/walking/light/symbols/subway-athens-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-athens-s.svg rename to data/styles/walking/light/symbols/subway-athens-s.svg diff --git a/data/styles/default/light/symbols/subway-baku-m.svg b/data/styles/walking/light/symbols/subway-baku-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-baku-m.svg rename to data/styles/walking/light/symbols/subway-baku-m.svg diff --git a/data/styles/default/light/symbols/subway-baku-s.svg b/data/styles/walking/light/symbols/subway-baku-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-baku-s.svg rename to data/styles/walking/light/symbols/subway-baku-s.svg diff --git a/data/styles/default/light/symbols/subway-bangkok-m.svg b/data/styles/walking/light/symbols/subway-bangkok-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bangkok-m.svg rename to data/styles/walking/light/symbols/subway-bangkok-m.svg diff --git a/data/styles/default/light/symbols/subway-bangkok-s.svg b/data/styles/walking/light/symbols/subway-bangkok-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bangkok-s.svg rename to data/styles/walking/light/symbols/subway-bangkok-s.svg diff --git a/data/styles/default/light/symbols/subway-barcelona-m.svg b/data/styles/walking/light/symbols/subway-barcelona-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-barcelona-m.svg rename to data/styles/walking/light/symbols/subway-barcelona-m.svg diff --git a/data/styles/default/light/symbols/subway-barcelona-s.svg b/data/styles/walking/light/symbols/subway-barcelona-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-barcelona-s.svg rename to data/styles/walking/light/symbols/subway-barcelona-s.svg diff --git a/data/styles/default/light/symbols/subway-beijing-m.svg b/data/styles/walking/light/symbols/subway-beijing-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-beijing-m.svg rename to data/styles/walking/light/symbols/subway-beijing-m.svg diff --git a/data/styles/default/light/symbols/subway-beijing-s.svg b/data/styles/walking/light/symbols/subway-beijing-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-beijing-s.svg rename to data/styles/walking/light/symbols/subway-beijing-s.svg diff --git a/data/styles/default/light/symbols/subway-bengaluru-m.svg b/data/styles/walking/light/symbols/subway-bengaluru-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bengaluru-m.svg rename to data/styles/walking/light/symbols/subway-bengaluru-m.svg diff --git a/data/styles/default/light/symbols/subway-bengaluru-s.svg b/data/styles/walking/light/symbols/subway-bengaluru-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bengaluru-s.svg rename to data/styles/walking/light/symbols/subway-bengaluru-s.svg diff --git a/data/styles/default/light/symbols/subway-bilbao-m.svg b/data/styles/walking/light/symbols/subway-bilbao-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bilbao-m.svg rename to data/styles/walking/light/symbols/subway-bilbao-m.svg diff --git a/data/styles/default/light/symbols/subway-bilbao-s.svg b/data/styles/walking/light/symbols/subway-bilbao-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bilbao-s.svg rename to data/styles/walking/light/symbols/subway-bilbao-s.svg diff --git a/data/styles/default/light/symbols/subway-brasilia-m.svg b/data/styles/walking/light/symbols/subway-brasilia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brasilia-m.svg rename to data/styles/walking/light/symbols/subway-brasilia-m.svg diff --git a/data/styles/default/light/symbols/subway-brasilia-s.svg b/data/styles/walking/light/symbols/subway-brasilia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brasilia-s.svg rename to data/styles/walking/light/symbols/subway-brasilia-s.svg diff --git a/data/styles/default/light/symbols/subway-brescia-m.svg b/data/styles/walking/light/symbols/subway-brescia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brescia-m.svg rename to data/styles/walking/light/symbols/subway-brescia-m.svg diff --git a/data/styles/default/light/symbols/subway-brescia-s.svg b/data/styles/walking/light/symbols/subway-brescia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brescia-s.svg rename to data/styles/walking/light/symbols/subway-brescia-s.svg diff --git a/data/styles/default/light/symbols/subway-brussel-m.svg b/data/styles/walking/light/symbols/subway-brussel-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brussel-m.svg rename to data/styles/walking/light/symbols/subway-brussel-m.svg diff --git a/data/styles/default/light/symbols/subway-brussel-s.svg b/data/styles/walking/light/symbols/subway-brussel-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-brussel-s.svg rename to data/styles/walking/light/symbols/subway-brussel-s.svg diff --git a/data/styles/default/light/symbols/subway-bucharest-m.svg b/data/styles/walking/light/symbols/subway-bucharest-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bucharest-m.svg rename to data/styles/walking/light/symbols/subway-bucharest-m.svg diff --git a/data/styles/default/light/symbols/subway-bucharest-s.svg b/data/styles/walking/light/symbols/subway-bucharest-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bucharest-s.svg rename to data/styles/walking/light/symbols/subway-bucharest-s.svg diff --git a/data/styles/default/light/symbols/subway-budapest-m.svg b/data/styles/walking/light/symbols/subway-budapest-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-budapest-m.svg rename to data/styles/walking/light/symbols/subway-budapest-m.svg diff --git a/data/styles/default/light/symbols/subway-budapest-s.svg b/data/styles/walking/light/symbols/subway-budapest-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-budapest-s.svg rename to data/styles/walking/light/symbols/subway-budapest-s.svg diff --git a/data/styles/default/light/symbols/subway-buenosaires-m.svg b/data/styles/walking/light/symbols/subway-buenosaires-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-buenosaires-m.svg rename to data/styles/walking/light/symbols/subway-buenosaires-m.svg diff --git a/data/styles/default/light/symbols/subway-buenosaires-s.svg b/data/styles/walking/light/symbols/subway-buenosaires-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-buenosaires-s.svg rename to data/styles/walking/light/symbols/subway-buenosaires-s.svg diff --git a/data/styles/default/light/symbols/subway-bursaray-m.svg b/data/styles/walking/light/symbols/subway-bursaray-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bursaray-m.svg rename to data/styles/walking/light/symbols/subway-bursaray-m.svg diff --git a/data/styles/default/light/symbols/subway-bursaray-s.svg b/data/styles/walking/light/symbols/subway-bursaray-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-bursaray-s.svg rename to data/styles/walking/light/symbols/subway-bursaray-s.svg diff --git a/data/styles/default/light/symbols/subway-cairo-m.svg b/data/styles/walking/light/symbols/subway-cairo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-cairo-m.svg rename to data/styles/walking/light/symbols/subway-cairo-m.svg diff --git a/data/styles/default/light/symbols/subway-cairo-s.svg b/data/styles/walking/light/symbols/subway-cairo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-cairo-s.svg rename to data/styles/walking/light/symbols/subway-cairo-s.svg diff --git a/data/styles/default/light/symbols/subway-caracas-m.svg b/data/styles/walking/light/symbols/subway-caracas-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-caracas-m.svg rename to data/styles/walking/light/symbols/subway-caracas-m.svg diff --git a/data/styles/default/light/symbols/subway-caracas-s.svg b/data/styles/walking/light/symbols/subway-caracas-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-caracas-s.svg rename to data/styles/walking/light/symbols/subway-caracas-s.svg diff --git a/data/styles/default/light/symbols/subway-catania-m.svg b/data/styles/walking/light/symbols/subway-catania-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-catania-m.svg rename to data/styles/walking/light/symbols/subway-catania-m.svg diff --git a/data/styles/default/light/symbols/subway-catania-s.svg b/data/styles/walking/light/symbols/subway-catania-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-catania-s.svg rename to data/styles/walking/light/symbols/subway-catania-s.svg diff --git a/data/styles/default/light/symbols/subway-changchun-m.svg b/data/styles/walking/light/symbols/subway-changchun-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-changchun-m.svg rename to data/styles/walking/light/symbols/subway-changchun-m.svg diff --git a/data/styles/default/light/symbols/subway-changchun-s.svg b/data/styles/walking/light/symbols/subway-changchun-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-changchun-s.svg rename to data/styles/walking/light/symbols/subway-changchun-s.svg diff --git a/data/styles/default/light/symbols/subway-chengdu-m.svg b/data/styles/walking/light/symbols/subway-chengdu-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chengdu-m.svg rename to data/styles/walking/light/symbols/subway-chengdu-m.svg diff --git a/data/styles/default/light/symbols/subway-chengdu-s.svg b/data/styles/walking/light/symbols/subway-chengdu-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chengdu-s.svg rename to data/styles/walking/light/symbols/subway-chengdu-s.svg diff --git a/data/styles/default/light/symbols/subway-chicago-m.svg b/data/styles/walking/light/symbols/subway-chicago-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chicago-m.svg rename to data/styles/walking/light/symbols/subway-chicago-m.svg diff --git a/data/styles/default/light/symbols/subway-chicago-s.svg b/data/styles/walking/light/symbols/subway-chicago-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chicago-s.svg rename to data/styles/walking/light/symbols/subway-chicago-s.svg diff --git a/data/styles/default/light/symbols/subway-chongqing-m.svg b/data/styles/walking/light/symbols/subway-chongqing-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chongqing-m.svg rename to data/styles/walking/light/symbols/subway-chongqing-m.svg diff --git a/data/styles/default/light/symbols/subway-chongqing-s.svg b/data/styles/walking/light/symbols/subway-chongqing-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-chongqing-s.svg rename to data/styles/walking/light/symbols/subway-chongqing-s.svg diff --git a/data/styles/default/light/symbols/subway-dalian-m.svg b/data/styles/walking/light/symbols/subway-dalian-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dalian-m.svg rename to data/styles/walking/light/symbols/subway-dalian-m.svg diff --git a/data/styles/default/light/symbols/subway-dalian-s.svg b/data/styles/walking/light/symbols/subway-dalian-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dalian-s.svg rename to data/styles/walking/light/symbols/subway-dalian-s.svg diff --git a/data/styles/default/light/symbols/subway-delhi-m.svg b/data/styles/walking/light/symbols/subway-delhi-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-delhi-m.svg rename to data/styles/walking/light/symbols/subway-delhi-m.svg diff --git a/data/styles/default/light/symbols/subway-delhi-s.svg b/data/styles/walking/light/symbols/subway-delhi-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-delhi-s.svg rename to data/styles/walking/light/symbols/subway-delhi-s.svg diff --git a/data/styles/default/light/symbols/subway-dnepro-m.svg b/data/styles/walking/light/symbols/subway-dnepro-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dnepro-m.svg rename to data/styles/walking/light/symbols/subway-dnepro-m.svg diff --git a/data/styles/default/light/symbols/subway-dnepro-s.svg b/data/styles/walking/light/symbols/subway-dnepro-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dnepro-s.svg rename to data/styles/walking/light/symbols/subway-dnepro-s.svg diff --git a/data/styles/default/light/symbols/subway-dubai-m.svg b/data/styles/walking/light/symbols/subway-dubai-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dubai-m.svg rename to data/styles/walking/light/symbols/subway-dubai-m.svg diff --git a/data/styles/default/light/symbols/subway-dubai-s.svg b/data/styles/walking/light/symbols/subway-dubai-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-dubai-s.svg rename to data/styles/walking/light/symbols/subway-dubai-s.svg diff --git a/data/styles/default/light/symbols/subway-edmonton-m.svg b/data/styles/walking/light/symbols/subway-edmonton-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-edmonton-m.svg rename to data/styles/walking/light/symbols/subway-edmonton-m.svg diff --git a/data/styles/default/light/symbols/subway-edmonton-s.svg b/data/styles/walking/light/symbols/subway-edmonton-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-edmonton-s.svg rename to data/styles/walking/light/symbols/subway-edmonton-s.svg diff --git a/data/styles/default/light/symbols/subway-ekb-m.svg b/data/styles/walking/light/symbols/subway-ekb-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ekb-m.svg rename to data/styles/walking/light/symbols/subway-ekb-m.svg diff --git a/data/styles/default/light/symbols/subway-ekb-s.svg b/data/styles/walking/light/symbols/subway-ekb-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ekb-s.svg rename to data/styles/walking/light/symbols/subway-ekb-s.svg diff --git a/data/styles/default/light/symbols/subway-entrance-m.svg b/data/styles/walking/light/symbols/subway-entrance-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-entrance-m.svg rename to data/styles/walking/light/symbols/subway-entrance-m.svg diff --git a/data/styles/default/light/symbols/subway-entrance-s.svg b/data/styles/walking/light/symbols/subway-entrance-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-entrance-s.svg rename to data/styles/walking/light/symbols/subway-entrance-s.svg diff --git a/data/styles/default/light/symbols/subway-foshan-m.svg b/data/styles/walking/light/symbols/subway-foshan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-foshan-m.svg rename to data/styles/walking/light/symbols/subway-foshan-m.svg diff --git a/data/styles/default/light/symbols/subway-foshan-s.svg b/data/styles/walking/light/symbols/subway-foshan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-foshan-s.svg rename to data/styles/walking/light/symbols/subway-foshan-s.svg diff --git a/data/styles/default/light/symbols/subway-fukuoka-m.svg b/data/styles/walking/light/symbols/subway-fukuoka-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-fukuoka-m.svg rename to data/styles/walking/light/symbols/subway-fukuoka-m.svg diff --git a/data/styles/default/light/symbols/subway-fukuoka-s.svg b/data/styles/walking/light/symbols/subway-fukuoka-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-fukuoka-s.svg rename to data/styles/walking/light/symbols/subway-fukuoka-s.svg diff --git a/data/styles/default/light/symbols/subway-glasgow-m.svg b/data/styles/walking/light/symbols/subway-glasgow-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-glasgow-m.svg rename to data/styles/walking/light/symbols/subway-glasgow-m.svg diff --git a/data/styles/default/light/symbols/subway-glasgow-s.svg b/data/styles/walking/light/symbols/subway-glasgow-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-glasgow-s.svg rename to data/styles/walking/light/symbols/subway-glasgow-s.svg diff --git a/data/styles/default/light/symbols/subway-guadalajara-m.svg b/data/styles/walking/light/symbols/subway-guadalajara-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-guadalajara-m.svg rename to data/styles/walking/light/symbols/subway-guadalajara-m.svg diff --git a/data/styles/default/light/symbols/subway-guadalajara-s.svg b/data/styles/walking/light/symbols/subway-guadalajara-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-guadalajara-s.svg rename to data/styles/walking/light/symbols/subway-guadalajara-s.svg diff --git a/data/styles/default/light/symbols/subway-guangzhou-m.svg b/data/styles/walking/light/symbols/subway-guangzhou-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-guangzhou-m.svg rename to data/styles/walking/light/symbols/subway-guangzhou-m.svg diff --git a/data/styles/default/light/symbols/subway-guangzhou-s.svg b/data/styles/walking/light/symbols/subway-guangzhou-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-guangzhou-s.svg rename to data/styles/walking/light/symbols/subway-guangzhou-s.svg diff --git a/data/styles/default/light/symbols/subway-haagse-m.svg b/data/styles/walking/light/symbols/subway-haagse-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-haagse-m.svg rename to data/styles/walking/light/symbols/subway-haagse-m.svg diff --git a/data/styles/default/light/symbols/subway-haagse-s.svg b/data/styles/walking/light/symbols/subway-haagse-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-haagse-s.svg rename to data/styles/walking/light/symbols/subway-haagse-s.svg diff --git a/data/styles/default/light/symbols/subway-helsinki-m.svg b/data/styles/walking/light/symbols/subway-helsinki-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-helsinki-m.svg rename to data/styles/walking/light/symbols/subway-helsinki-m.svg diff --git a/data/styles/default/light/symbols/subway-helsinki-s.svg b/data/styles/walking/light/symbols/subway-helsinki-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-helsinki-s.svg rename to data/styles/walking/light/symbols/subway-helsinki-s.svg diff --git a/data/styles/default/light/symbols/subway-hirosima-m.svg b/data/styles/walking/light/symbols/subway-hirosima-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-hirosima-m.svg rename to data/styles/walking/light/symbols/subway-hirosima-m.svg diff --git a/data/styles/default/light/symbols/subway-hirosima-s.svg b/data/styles/walking/light/symbols/subway-hirosima-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-hirosima-s.svg rename to data/styles/walking/light/symbols/subway-hirosima-s.svg diff --git a/data/styles/default/light/symbols/subway-hongkong-m.svg b/data/styles/walking/light/symbols/subway-hongkong-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-hongkong-m.svg rename to data/styles/walking/light/symbols/subway-hongkong-m.svg diff --git a/data/styles/default/light/symbols/subway-hongkong-s.svg b/data/styles/walking/light/symbols/subway-hongkong-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-hongkong-s.svg rename to data/styles/walking/light/symbols/subway-hongkong-s.svg diff --git a/data/styles/default/light/symbols/subway-isfahan-m.svg b/data/styles/walking/light/symbols/subway-isfahan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-isfahan-m.svg rename to data/styles/walking/light/symbols/subway-isfahan-m.svg diff --git a/data/styles/default/light/symbols/subway-isfahan-s.svg b/data/styles/walking/light/symbols/subway-isfahan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-isfahan-s.svg rename to data/styles/walking/light/symbols/subway-isfahan-s.svg diff --git a/data/styles/default/light/symbols/subway-istanbul-m.svg b/data/styles/walking/light/symbols/subway-istanbul-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-istanbul-m.svg rename to data/styles/walking/light/symbols/subway-istanbul-m.svg diff --git a/data/styles/default/light/symbols/subway-istanbul-s.svg b/data/styles/walking/light/symbols/subway-istanbul-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-istanbul-s.svg rename to data/styles/walking/light/symbols/subway-istanbul-s.svg diff --git a/data/styles/default/light/symbols/subway-izmir-m.svg b/data/styles/walking/light/symbols/subway-izmir-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-izmir-m.svg rename to data/styles/walking/light/symbols/subway-izmir-m.svg diff --git a/data/styles/default/light/symbols/subway-izmir-s.svg b/data/styles/walking/light/symbols/subway-izmir-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-izmir-s.svg rename to data/styles/walking/light/symbols/subway-izmir-s.svg diff --git a/data/styles/default/light/symbols/subway-kazan-m.svg b/data/styles/walking/light/symbols/subway-kazan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kazan-m.svg rename to data/styles/walking/light/symbols/subway-kazan-m.svg diff --git a/data/styles/default/light/symbols/subway-kazan-s.svg b/data/styles/walking/light/symbols/subway-kazan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kazan-s.svg rename to data/styles/walking/light/symbols/subway-kazan-s.svg diff --git a/data/styles/default/light/symbols/subway-kharkiv-m.svg b/data/styles/walking/light/symbols/subway-kharkiv-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kharkiv-m.svg rename to data/styles/walking/light/symbols/subway-kharkiv-m.svg diff --git a/data/styles/default/light/symbols/subway-kharkiv-s.svg b/data/styles/walking/light/symbols/subway-kharkiv-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kharkiv-s.svg rename to data/styles/walking/light/symbols/subway-kharkiv-s.svg diff --git a/data/styles/default/light/symbols/subway-kiev-m.svg b/data/styles/walking/light/symbols/subway-kiev-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kiev-m.svg rename to data/styles/walking/light/symbols/subway-kiev-m.svg diff --git a/data/styles/default/light/symbols/subway-kiev-s.svg b/data/styles/walking/light/symbols/subway-kiev-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kiev-s.svg rename to data/styles/walking/light/symbols/subway-kiev-s.svg diff --git a/data/styles/default/light/symbols/subway-kobe-m.svg b/data/styles/walking/light/symbols/subway-kobe-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kobe-m.svg rename to data/styles/walking/light/symbols/subway-kobe-m.svg diff --git a/data/styles/default/light/symbols/subway-kobe-s.svg b/data/styles/walking/light/symbols/subway-kobe-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kobe-s.svg rename to data/styles/walking/light/symbols/subway-kobe-s.svg diff --git a/data/styles/default/light/symbols/subway-kolkata-m.svg b/data/styles/walking/light/symbols/subway-kolkata-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kolkata-m.svg rename to data/styles/walking/light/symbols/subway-kolkata-m.svg diff --git a/data/styles/default/light/symbols/subway-kolkata-s.svg b/data/styles/walking/light/symbols/subway-kolkata-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kolkata-s.svg rename to data/styles/walking/light/symbols/subway-kolkata-s.svg diff --git a/data/styles/default/light/symbols/subway-kryvyirih-m.svg b/data/styles/walking/light/symbols/subway-kryvyirih-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kryvyirih-m.svg rename to data/styles/walking/light/symbols/subway-kryvyirih-m.svg diff --git a/data/styles/default/light/symbols/subway-kryvyirih-s.svg b/data/styles/walking/light/symbols/subway-kryvyirih-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kryvyirih-s.svg rename to data/styles/walking/light/symbols/subway-kryvyirih-s.svg diff --git a/data/styles/default/light/symbols/subway-kunming-m.svg b/data/styles/walking/light/symbols/subway-kunming-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kunming-m.svg rename to data/styles/walking/light/symbols/subway-kunming-m.svg diff --git a/data/styles/default/light/symbols/subway-kunming-s.svg b/data/styles/walking/light/symbols/subway-kunming-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kunming-s.svg rename to data/styles/walking/light/symbols/subway-kunming-s.svg diff --git a/data/styles/default/light/symbols/subway-kyoto-m.svg b/data/styles/walking/light/symbols/subway-kyoto-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kyoto-m.svg rename to data/styles/walking/light/symbols/subway-kyoto-m.svg diff --git a/data/styles/default/light/symbols/subway-kyoto-s.svg b/data/styles/walking/light/symbols/subway-kyoto-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-kyoto-s.svg rename to data/styles/walking/light/symbols/subway-kyoto-s.svg diff --git a/data/styles/default/light/symbols/subway-lausanne-m.svg b/data/styles/walking/light/symbols/subway-lausanne-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lausanne-m.svg rename to data/styles/walking/light/symbols/subway-lausanne-m.svg diff --git a/data/styles/default/light/symbols/subway-lausanne-s.svg b/data/styles/walking/light/symbols/subway-lausanne-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lausanne-s.svg rename to data/styles/walking/light/symbols/subway-lausanne-s.svg diff --git a/data/styles/default/light/symbols/subway-lille-m.svg b/data/styles/walking/light/symbols/subway-lille-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lille-m.svg rename to data/styles/walking/light/symbols/subway-lille-m.svg diff --git a/data/styles/default/light/symbols/subway-lille-s.svg b/data/styles/walking/light/symbols/subway-lille-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lille-s.svg rename to data/styles/walking/light/symbols/subway-lille-s.svg diff --git a/data/styles/default/light/symbols/subway-lima-m.svg b/data/styles/walking/light/symbols/subway-lima-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lima-m.svg rename to data/styles/walking/light/symbols/subway-lima-m.svg diff --git a/data/styles/default/light/symbols/subway-lima-s.svg b/data/styles/walking/light/symbols/subway-lima-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lima-s.svg rename to data/styles/walking/light/symbols/subway-lima-s.svg diff --git a/data/styles/default/light/symbols/subway-lisboa-m.svg b/data/styles/walking/light/symbols/subway-lisboa-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lisboa-m.svg rename to data/styles/walking/light/symbols/subway-lisboa-m.svg diff --git a/data/styles/default/light/symbols/subway-lisboa-s.svg b/data/styles/walking/light/symbols/subway-lisboa-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lisboa-s.svg rename to data/styles/walking/light/symbols/subway-lisboa-s.svg diff --git a/data/styles/default/light/symbols/subway-london-m.svg b/data/styles/walking/light/symbols/subway-london-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-london-m.svg rename to data/styles/walking/light/symbols/subway-london-m.svg diff --git a/data/styles/default/light/symbols/subway-london-s.svg b/data/styles/walking/light/symbols/subway-london-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-london-s.svg rename to data/styles/walking/light/symbols/subway-london-s.svg diff --git a/data/styles/default/light/symbols/subway-losangeles-m.svg b/data/styles/walking/light/symbols/subway-losangeles-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-losangeles-m.svg rename to data/styles/walking/light/symbols/subway-losangeles-m.svg diff --git a/data/styles/default/light/symbols/subway-losangeles-s.svg b/data/styles/walking/light/symbols/subway-losangeles-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-losangeles-s.svg rename to data/styles/walking/light/symbols/subway-losangeles-s.svg diff --git a/data/styles/default/light/symbols/subway-lucknow-m.svg b/data/styles/walking/light/symbols/subway-lucknow-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lucknow-m.svg rename to data/styles/walking/light/symbols/subway-lucknow-m.svg diff --git a/data/styles/default/light/symbols/subway-lucknow-s.svg b/data/styles/walking/light/symbols/subway-lucknow-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lucknow-s.svg rename to data/styles/walking/light/symbols/subway-lucknow-s.svg diff --git a/data/styles/default/light/symbols/subway-lyon-m.svg b/data/styles/walking/light/symbols/subway-lyon-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lyon-m.svg rename to data/styles/walking/light/symbols/subway-lyon-m.svg diff --git a/data/styles/default/light/symbols/subway-lyon-s.svg b/data/styles/walking/light/symbols/subway-lyon-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-lyon-s.svg rename to data/styles/walking/light/symbols/subway-lyon-s.svg diff --git a/data/styles/default/light/symbols/subway-m.svg b/data/styles/walking/light/symbols/subway-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-m.svg rename to data/styles/walking/light/symbols/subway-m.svg diff --git a/data/styles/default/light/symbols/subway-madrid-m.svg b/data/styles/walking/light/symbols/subway-madrid-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-madrid-m.svg rename to data/styles/walking/light/symbols/subway-madrid-m.svg diff --git a/data/styles/default/light/symbols/subway-madrid-s.svg b/data/styles/walking/light/symbols/subway-madrid-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-madrid-s.svg rename to data/styles/walking/light/symbols/subway-madrid-s.svg diff --git a/data/styles/default/light/symbols/subway-malaga-m.svg b/data/styles/walking/light/symbols/subway-malaga-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-malaga-m.svg rename to data/styles/walking/light/symbols/subway-malaga-m.svg diff --git a/data/styles/default/light/symbols/subway-malaga-s.svg b/data/styles/walking/light/symbols/subway-malaga-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-malaga-s.svg rename to data/styles/walking/light/symbols/subway-malaga-s.svg diff --git a/data/styles/default/light/symbols/subway-manila-m.svg b/data/styles/walking/light/symbols/subway-manila-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-manila-m.svg rename to data/styles/walking/light/symbols/subway-manila-m.svg diff --git a/data/styles/default/light/symbols/subway-manila-s.svg b/data/styles/walking/light/symbols/subway-manila-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-manila-s.svg rename to data/styles/walking/light/symbols/subway-manila-s.svg diff --git a/data/styles/default/light/symbols/subway-maracaibo-m.svg b/data/styles/walking/light/symbols/subway-maracaibo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-maracaibo-m.svg rename to data/styles/walking/light/symbols/subway-maracaibo-m.svg diff --git a/data/styles/default/light/symbols/subway-maracaibo-s.svg b/data/styles/walking/light/symbols/subway-maracaibo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-maracaibo-s.svg rename to data/styles/walking/light/symbols/subway-maracaibo-s.svg diff --git a/data/styles/default/light/symbols/subway-marseille-m.svg b/data/styles/walking/light/symbols/subway-marseille-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-marseille-m.svg rename to data/styles/walking/light/symbols/subway-marseille-m.svg diff --git a/data/styles/default/light/symbols/subway-marseille-s.svg b/data/styles/walking/light/symbols/subway-marseille-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-marseille-s.svg rename to data/styles/walking/light/symbols/subway-marseille-s.svg diff --git a/data/styles/default/light/symbols/subway-mashhad-m.svg b/data/styles/walking/light/symbols/subway-mashhad-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mashhad-m.svg rename to data/styles/walking/light/symbols/subway-mashhad-m.svg diff --git a/data/styles/default/light/symbols/subway-mashhad-s.svg b/data/styles/walking/light/symbols/subway-mashhad-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mashhad-s.svg rename to data/styles/walking/light/symbols/subway-mashhad-s.svg diff --git a/data/styles/default/light/symbols/subway-massachusetts-m.svg b/data/styles/walking/light/symbols/subway-massachusetts-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-massachusetts-m.svg rename to data/styles/walking/light/symbols/subway-massachusetts-m.svg diff --git a/data/styles/default/light/symbols/subway-massachusetts-s.svg b/data/styles/walking/light/symbols/subway-massachusetts-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-massachusetts-s.svg rename to data/styles/walking/light/symbols/subway-massachusetts-s.svg diff --git a/data/styles/default/light/symbols/subway-mecca-m.svg b/data/styles/walking/light/symbols/subway-mecca-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mecca-m.svg rename to data/styles/walking/light/symbols/subway-mecca-m.svg diff --git a/data/styles/default/light/symbols/subway-mecca-s.svg b/data/styles/walking/light/symbols/subway-mecca-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mecca-s.svg rename to data/styles/walking/light/symbols/subway-mecca-s.svg diff --git a/data/styles/default/light/symbols/subway-medellin-m.svg b/data/styles/walking/light/symbols/subway-medellin-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-medellin-m.svg rename to data/styles/walking/light/symbols/subway-medellin-m.svg diff --git a/data/styles/default/light/symbols/subway-medellin-s.svg b/data/styles/walking/light/symbols/subway-medellin-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-medellin-s.svg rename to data/styles/walking/light/symbols/subway-medellin-s.svg diff --git a/data/styles/default/light/symbols/subway-mexico-m.svg b/data/styles/walking/light/symbols/subway-mexico-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mexico-m.svg rename to data/styles/walking/light/symbols/subway-mexico-m.svg diff --git a/data/styles/default/light/symbols/subway-mexico-s.svg b/data/styles/walking/light/symbols/subway-mexico-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-mexico-s.svg rename to data/styles/walking/light/symbols/subway-mexico-s.svg diff --git a/data/styles/default/light/symbols/subway-milan-m.svg b/data/styles/walking/light/symbols/subway-milan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-milan-m.svg rename to data/styles/walking/light/symbols/subway-milan-m.svg diff --git a/data/styles/default/light/symbols/subway-milan-s.svg b/data/styles/walking/light/symbols/subway-milan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-milan-s.svg rename to data/styles/walking/light/symbols/subway-milan-s.svg diff --git a/data/styles/default/light/symbols/subway-minatomirai-m.svg b/data/styles/walking/light/symbols/subway-minatomirai-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-minatomirai-m.svg rename to data/styles/walking/light/symbols/subway-minatomirai-m.svg diff --git a/data/styles/default/light/symbols/subway-minatomirai-s.svg b/data/styles/walking/light/symbols/subway-minatomirai-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-minatomirai-s.svg rename to data/styles/walking/light/symbols/subway-minatomirai-s.svg diff --git a/data/styles/default/light/symbols/subway-minsk-m.svg b/data/styles/walking/light/symbols/subway-minsk-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-minsk-m.svg rename to data/styles/walking/light/symbols/subway-minsk-m.svg diff --git a/data/styles/default/light/symbols/subway-minsk-s.svg b/data/styles/walking/light/symbols/subway-minsk-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-minsk-s.svg rename to data/styles/walking/light/symbols/subway-minsk-s.svg diff --git a/data/styles/default/light/symbols/subway-montreal-m.svg b/data/styles/walking/light/symbols/subway-montreal-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-montreal-m.svg rename to data/styles/walking/light/symbols/subway-montreal-m.svg diff --git a/data/styles/default/light/symbols/subway-montreal-s.svg b/data/styles/walking/light/symbols/subway-montreal-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-montreal-s.svg rename to data/styles/walking/light/symbols/subway-montreal-s.svg diff --git a/data/styles/default/light/symbols/subway-moscow-m.svg b/data/styles/walking/light/symbols/subway-moscow-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-moscow-m.svg rename to data/styles/walking/light/symbols/subway-moscow-m.svg diff --git a/data/styles/default/light/symbols/subway-moscow-s.svg b/data/styles/walking/light/symbols/subway-moscow-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-moscow-s.svg rename to data/styles/walking/light/symbols/subway-moscow-s.svg diff --git a/data/styles/default/light/symbols/subway-nagoya-m.svg b/data/styles/walking/light/symbols/subway-nagoya-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-nagoya-m.svg rename to data/styles/walking/light/symbols/subway-nagoya-m.svg diff --git a/data/styles/default/light/symbols/subway-nagoya-s.svg b/data/styles/walking/light/symbols/subway-nagoya-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-nagoya-s.svg rename to data/styles/walking/light/symbols/subway-nagoya-s.svg diff --git a/data/styles/default/light/symbols/subway-newyork-m.svg b/data/styles/walking/light/symbols/subway-newyork-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-newyork-m.svg rename to data/styles/walking/light/symbols/subway-newyork-m.svg diff --git a/data/styles/default/light/symbols/subway-newyork-s.svg b/data/styles/walking/light/symbols/subway-newyork-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-newyork-s.svg rename to data/styles/walking/light/symbols/subway-newyork-s.svg diff --git a/data/styles/default/light/symbols/subway-newyork-xs.svg b/data/styles/walking/light/symbols/subway-newyork-xs.svg similarity index 100% rename from data/styles/default/light/symbols/subway-newyork-xs.svg rename to data/styles/walking/light/symbols/subway-newyork-xs.svg diff --git a/data/styles/default/light/symbols/subway-nnov-m.svg b/data/styles/walking/light/symbols/subway-nnov-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-nnov-m.svg rename to data/styles/walking/light/symbols/subway-nnov-m.svg diff --git a/data/styles/default/light/symbols/subway-nnov-s.svg b/data/styles/walking/light/symbols/subway-nnov-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-nnov-s.svg rename to data/styles/walking/light/symbols/subway-nnov-s.svg diff --git a/data/styles/default/light/symbols/subway-novosibirsk-m.svg b/data/styles/walking/light/symbols/subway-novosibirsk-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-novosibirsk-m.svg rename to data/styles/walking/light/symbols/subway-novosibirsk-m.svg diff --git a/data/styles/default/light/symbols/subway-novosibirsk-s.svg b/data/styles/walking/light/symbols/subway-novosibirsk-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-novosibirsk-s.svg rename to data/styles/walking/light/symbols/subway-novosibirsk-s.svg diff --git a/data/styles/default/light/symbols/subway-omsk-m.svg b/data/styles/walking/light/symbols/subway-omsk-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-omsk-m.svg rename to data/styles/walking/light/symbols/subway-omsk-m.svg diff --git a/data/styles/default/light/symbols/subway-omsk-s.svg b/data/styles/walking/light/symbols/subway-omsk-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-omsk-s.svg rename to data/styles/walking/light/symbols/subway-omsk-s.svg diff --git a/data/styles/default/light/symbols/subway-osaka-m.svg b/data/styles/walking/light/symbols/subway-osaka-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-osaka-m.svg rename to data/styles/walking/light/symbols/subway-osaka-m.svg diff --git a/data/styles/default/light/symbols/subway-osaka-s.svg b/data/styles/walking/light/symbols/subway-osaka-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-osaka-s.svg rename to data/styles/walking/light/symbols/subway-osaka-s.svg diff --git a/data/styles/default/light/symbols/subway-oslo-m.svg b/data/styles/walking/light/symbols/subway-oslo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-oslo-m.svg rename to data/styles/walking/light/symbols/subway-oslo-m.svg diff --git a/data/styles/default/light/symbols/subway-oslo-s.svg b/data/styles/walking/light/symbols/subway-oslo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-oslo-s.svg rename to data/styles/walking/light/symbols/subway-oslo-s.svg diff --git a/data/styles/default/light/symbols/subway-palma-m.svg b/data/styles/walking/light/symbols/subway-palma-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-palma-m.svg rename to data/styles/walking/light/symbols/subway-palma-m.svg diff --git a/data/styles/default/light/symbols/subway-palma-s.svg b/data/styles/walking/light/symbols/subway-palma-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-palma-s.svg rename to data/styles/walking/light/symbols/subway-palma-s.svg diff --git a/data/styles/default/light/symbols/subway-panama-m.svg b/data/styles/walking/light/symbols/subway-panama-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-panama-m.svg rename to data/styles/walking/light/symbols/subway-panama-m.svg diff --git a/data/styles/default/light/symbols/subway-panama-s.svg b/data/styles/walking/light/symbols/subway-panama-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-panama-s.svg rename to data/styles/walking/light/symbols/subway-panama-s.svg diff --git a/data/styles/default/light/symbols/subway-paris-m.svg b/data/styles/walking/light/symbols/subway-paris-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-paris-m.svg rename to data/styles/walking/light/symbols/subway-paris-m.svg diff --git a/data/styles/default/light/symbols/subway-paris-s.svg b/data/styles/walking/light/symbols/subway-paris-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-paris-s.svg rename to data/styles/walking/light/symbols/subway-paris-s.svg diff --git a/data/styles/default/light/symbols/subway-perugia-m.svg b/data/styles/walking/light/symbols/subway-perugia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-perugia-m.svg rename to data/styles/walking/light/symbols/subway-perugia-m.svg diff --git a/data/styles/default/light/symbols/subway-perugia-s.svg b/data/styles/walking/light/symbols/subway-perugia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-perugia-s.svg rename to data/styles/walking/light/symbols/subway-perugia-s.svg diff --git a/data/styles/default/light/symbols/subway-philadelphia-m.svg b/data/styles/walking/light/symbols/subway-philadelphia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-philadelphia-m.svg rename to data/styles/walking/light/symbols/subway-philadelphia-m.svg diff --git a/data/styles/default/light/symbols/subway-philadelphia-s.svg b/data/styles/walking/light/symbols/subway-philadelphia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-philadelphia-s.svg rename to data/styles/walking/light/symbols/subway-philadelphia-s.svg diff --git a/data/styles/default/light/symbols/subway-pittsburgh-m.svg b/data/styles/walking/light/symbols/subway-pittsburgh-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-pittsburgh-m.svg rename to data/styles/walking/light/symbols/subway-pittsburgh-m.svg diff --git a/data/styles/default/light/symbols/subway-pittsburgh-s.svg b/data/styles/walking/light/symbols/subway-pittsburgh-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-pittsburgh-s.svg rename to data/styles/walking/light/symbols/subway-pittsburgh-s.svg diff --git a/data/styles/default/light/symbols/subway-pyongyang-m.svg b/data/styles/walking/light/symbols/subway-pyongyang-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-pyongyang-m.svg rename to data/styles/walking/light/symbols/subway-pyongyang-m.svg diff --git a/data/styles/default/light/symbols/subway-pyongyang-s.svg b/data/styles/walking/light/symbols/subway-pyongyang-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-pyongyang-s.svg rename to data/styles/walking/light/symbols/subway-pyongyang-s.svg diff --git a/data/styles/default/light/symbols/subway-qingdao-m.svg b/data/styles/walking/light/symbols/subway-qingdao-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-qingdao-m.svg rename to data/styles/walking/light/symbols/subway-qingdao-m.svg diff --git a/data/styles/default/light/symbols/subway-qingdao-s.svg b/data/styles/walking/light/symbols/subway-qingdao-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-qingdao-s.svg rename to data/styles/walking/light/symbols/subway-qingdao-s.svg diff --git a/data/styles/default/light/symbols/subway-rennes-m.svg b/data/styles/walking/light/symbols/subway-rennes-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rennes-m.svg rename to data/styles/walking/light/symbols/subway-rennes-m.svg diff --git a/data/styles/default/light/symbols/subway-rennes-s.svg b/data/styles/walking/light/symbols/subway-rennes-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rennes-s.svg rename to data/styles/walking/light/symbols/subway-rennes-s.svg diff --git a/data/styles/default/light/symbols/subway-reseau-paris-m.svg b/data/styles/walking/light/symbols/subway-reseau-paris-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-reseau-paris-m.svg rename to data/styles/walking/light/symbols/subway-reseau-paris-m.svg diff --git a/data/styles/default/light/symbols/subway-reseau-paris-s.svg b/data/styles/walking/light/symbols/subway-reseau-paris-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-reseau-paris-s.svg rename to data/styles/walking/light/symbols/subway-reseau-paris-s.svg diff --git a/data/styles/default/light/symbols/subway-riodejaneiro-m.svg b/data/styles/walking/light/symbols/subway-riodejaneiro-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-riodejaneiro-m.svg rename to data/styles/walking/light/symbols/subway-riodejaneiro-m.svg diff --git a/data/styles/default/light/symbols/subway-riodejaneiro-s.svg b/data/styles/walking/light/symbols/subway-riodejaneiro-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-riodejaneiro-s.svg rename to data/styles/walking/light/symbols/subway-riodejaneiro-s.svg diff --git a/data/styles/default/light/symbols/subway-rome-m.svg b/data/styles/walking/light/symbols/subway-rome-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rome-m.svg rename to data/styles/walking/light/symbols/subway-rome-m.svg diff --git a/data/styles/default/light/symbols/subway-rome-s.svg b/data/styles/walking/light/symbols/subway-rome-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rome-s.svg rename to data/styles/walking/light/symbols/subway-rome-s.svg diff --git a/data/styles/default/light/symbols/subway-rotterdam-m.svg b/data/styles/walking/light/symbols/subway-rotterdam-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rotterdam-m.svg rename to data/styles/walking/light/symbols/subway-rotterdam-m.svg diff --git a/data/styles/default/light/symbols/subway-rotterdam-s.svg b/data/styles/walking/light/symbols/subway-rotterdam-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-rotterdam-s.svg rename to data/styles/walking/light/symbols/subway-rotterdam-s.svg diff --git a/data/styles/default/light/symbols/subway-s.svg b/data/styles/walking/light/symbols/subway-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-s.svg rename to data/styles/walking/light/symbols/subway-s.svg diff --git a/data/styles/default/light/symbols/subway-samara-m.svg b/data/styles/walking/light/symbols/subway-samara-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-samara-m.svg rename to data/styles/walking/light/symbols/subway-samara-m.svg diff --git a/data/styles/default/light/symbols/subway-samara-s.svg b/data/styles/walking/light/symbols/subway-samara-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-samara-s.svg rename to data/styles/walking/light/symbols/subway-samara-s.svg diff --git a/data/styles/default/light/symbols/subway-sanfrancisco-m.svg b/data/styles/walking/light/symbols/subway-sanfrancisco-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sanfrancisco-m.svg rename to data/styles/walking/light/symbols/subway-sanfrancisco-m.svg diff --git a/data/styles/default/light/symbols/subway-sanfrancisco-s.svg b/data/styles/walking/light/symbols/subway-sanfrancisco-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sanfrancisco-s.svg rename to data/styles/walking/light/symbols/subway-sanfrancisco-s.svg diff --git a/data/styles/default/light/symbols/subway-santiago-m.svg b/data/styles/walking/light/symbols/subway-santiago-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-santiago-m.svg rename to data/styles/walking/light/symbols/subway-santiago-m.svg diff --git a/data/styles/default/light/symbols/subway-santiago-s.svg b/data/styles/walking/light/symbols/subway-santiago-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-santiago-s.svg rename to data/styles/walking/light/symbols/subway-santiago-s.svg diff --git a/data/styles/default/light/symbols/subway-santodomingo-m.svg b/data/styles/walking/light/symbols/subway-santodomingo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-santodomingo-m.svg rename to data/styles/walking/light/symbols/subway-santodomingo-m.svg diff --git a/data/styles/default/light/symbols/subway-santodomingo-s.svg b/data/styles/walking/light/symbols/subway-santodomingo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-santodomingo-s.svg rename to data/styles/walking/light/symbols/subway-santodomingo-s.svg diff --git a/data/styles/default/light/symbols/subway-saopaulo-m.svg b/data/styles/walking/light/symbols/subway-saopaulo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-saopaulo-m.svg rename to data/styles/walking/light/symbols/subway-saopaulo-m.svg diff --git a/data/styles/default/light/symbols/subway-saopaulo-s.svg b/data/styles/walking/light/symbols/subway-saopaulo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-saopaulo-s.svg rename to data/styles/walking/light/symbols/subway-saopaulo-s.svg diff --git a/data/styles/default/light/symbols/subway-sapporo-m.svg b/data/styles/walking/light/symbols/subway-sapporo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sapporo-m.svg rename to data/styles/walking/light/symbols/subway-sapporo-m.svg diff --git a/data/styles/default/light/symbols/subway-sapporo-s.svg b/data/styles/walking/light/symbols/subway-sapporo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sapporo-s.svg rename to data/styles/walking/light/symbols/subway-sapporo-s.svg diff --git a/data/styles/default/light/symbols/subway-seattle-m.svg b/data/styles/walking/light/symbols/subway-seattle-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-seattle-m.svg rename to data/styles/walking/light/symbols/subway-seattle-m.svg diff --git a/data/styles/default/light/symbols/subway-seattle-s.svg b/data/styles/walking/light/symbols/subway-seattle-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-seattle-s.svg rename to data/styles/walking/light/symbols/subway-seattle-s.svg diff --git a/data/styles/default/light/symbols/subway-sendai-m.svg b/data/styles/walking/light/symbols/subway-sendai-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sendai-m.svg rename to data/styles/walking/light/symbols/subway-sendai-m.svg diff --git a/data/styles/default/light/symbols/subway-sendai-s.svg b/data/styles/walking/light/symbols/subway-sendai-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sendai-s.svg rename to data/styles/walking/light/symbols/subway-sendai-s.svg diff --git a/data/styles/default/light/symbols/subway-shanghai-m.svg b/data/styles/walking/light/symbols/subway-shanghai-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shanghai-m.svg rename to data/styles/walking/light/symbols/subway-shanghai-m.svg diff --git a/data/styles/default/light/symbols/subway-shanghai-s.svg b/data/styles/walking/light/symbols/subway-shanghai-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shanghai-s.svg rename to data/styles/walking/light/symbols/subway-shanghai-s.svg diff --git a/data/styles/default/light/symbols/subway-shenzhen-m.svg b/data/styles/walking/light/symbols/subway-shenzhen-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shenzhen-m.svg rename to data/styles/walking/light/symbols/subway-shenzhen-m.svg diff --git a/data/styles/default/light/symbols/subway-shenzhen-s.svg b/data/styles/walking/light/symbols/subway-shenzhen-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shenzhen-s.svg rename to data/styles/walking/light/symbols/subway-shenzhen-s.svg diff --git a/data/styles/default/light/symbols/subway-shiraz-m.svg b/data/styles/walking/light/symbols/subway-shiraz-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shiraz-m.svg rename to data/styles/walking/light/symbols/subway-shiraz-m.svg diff --git a/data/styles/default/light/symbols/subway-shiraz-s.svg b/data/styles/walking/light/symbols/subway-shiraz-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-shiraz-s.svg rename to data/styles/walking/light/symbols/subway-shiraz-s.svg diff --git a/data/styles/default/light/symbols/subway-singapore-m.svg b/data/styles/walking/light/symbols/subway-singapore-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-singapore-m.svg rename to data/styles/walking/light/symbols/subway-singapore-m.svg diff --git a/data/styles/default/light/symbols/subway-singapore-s.svg b/data/styles/walking/light/symbols/subway-singapore-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-singapore-s.svg rename to data/styles/walking/light/symbols/subway-singapore-s.svg diff --git a/data/styles/default/light/symbols/subway-sofia-m.svg b/data/styles/walking/light/symbols/subway-sofia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sofia-m.svg rename to data/styles/walking/light/symbols/subway-sofia-m.svg diff --git a/data/styles/default/light/symbols/subway-sofia-s.svg b/data/styles/walking/light/symbols/subway-sofia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-sofia-s.svg rename to data/styles/walking/light/symbols/subway-sofia-s.svg diff --git a/data/styles/default/light/symbols/subway-southkorea-m.svg b/data/styles/walking/light/symbols/subway-southkorea-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-southkorea-m.svg rename to data/styles/walking/light/symbols/subway-southkorea-m.svg diff --git a/data/styles/default/light/symbols/subway-southkorea-s.svg b/data/styles/walking/light/symbols/subway-southkorea-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-southkorea-s.svg rename to data/styles/walking/light/symbols/subway-southkorea-s.svg diff --git a/data/styles/default/light/symbols/subway-spb-m.svg b/data/styles/walking/light/symbols/subway-spb-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-spb-m.svg rename to data/styles/walking/light/symbols/subway-spb-m.svg diff --git a/data/styles/default/light/symbols/subway-spb-s.svg b/data/styles/walking/light/symbols/subway-spb-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-spb-s.svg rename to data/styles/walking/light/symbols/subway-spb-s.svg diff --git a/data/styles/default/light/symbols/subway-stlouis-m.svg b/data/styles/walking/light/symbols/subway-stlouis-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-stlouis-m.svg rename to data/styles/walking/light/symbols/subway-stlouis-m.svg diff --git a/data/styles/default/light/symbols/subway-stlouis-s.svg b/data/styles/walking/light/symbols/subway-stlouis-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-stlouis-s.svg rename to data/styles/walking/light/symbols/subway-stlouis-s.svg diff --git a/data/styles/default/light/symbols/subway-stockholm-m.svg b/data/styles/walking/light/symbols/subway-stockholm-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-stockholm-m.svg rename to data/styles/walking/light/symbols/subway-stockholm-m.svg diff --git a/data/styles/default/light/symbols/subway-stockholm-s.svg b/data/styles/walking/light/symbols/subway-stockholm-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-stockholm-s.svg rename to data/styles/walking/light/symbols/subway-stockholm-s.svg diff --git a/data/styles/default/light/symbols/subway-tabriz-m.svg b/data/styles/walking/light/symbols/subway-tabriz-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tabriz-m.svg rename to data/styles/walking/light/symbols/subway-tabriz-m.svg diff --git a/data/styles/default/light/symbols/subway-tabriz-s.svg b/data/styles/walking/light/symbols/subway-tabriz-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tabriz-s.svg rename to data/styles/walking/light/symbols/subway-tabriz-s.svg diff --git a/data/styles/default/light/symbols/subway-taipei-m.svg b/data/styles/walking/light/symbols/subway-taipei-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-taipei-m.svg rename to data/styles/walking/light/symbols/subway-taipei-m.svg diff --git a/data/styles/default/light/symbols/subway-taipei-s.svg b/data/styles/walking/light/symbols/subway-taipei-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-taipei-s.svg rename to data/styles/walking/light/symbols/subway-taipei-s.svg diff --git a/data/styles/default/light/symbols/subway-taoyuan-m.svg b/data/styles/walking/light/symbols/subway-taoyuan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-taoyuan-m.svg rename to data/styles/walking/light/symbols/subway-taoyuan-m.svg diff --git a/data/styles/default/light/symbols/subway-taoyuan-s.svg b/data/styles/walking/light/symbols/subway-taoyuan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-taoyuan-s.svg rename to data/styles/walking/light/symbols/subway-taoyuan-s.svg diff --git a/data/styles/default/light/symbols/subway-tashkent-m.svg b/data/styles/walking/light/symbols/subway-tashkent-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tashkent-m.svg rename to data/styles/walking/light/symbols/subway-tashkent-m.svg diff --git a/data/styles/default/light/symbols/subway-tashkent-s.svg b/data/styles/walking/light/symbols/subway-tashkent-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tashkent-s.svg rename to data/styles/walking/light/symbols/subway-tashkent-s.svg diff --git a/data/styles/default/light/symbols/subway-tbilisi-m.svg b/data/styles/walking/light/symbols/subway-tbilisi-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tbilisi-m.svg rename to data/styles/walking/light/symbols/subway-tbilisi-m.svg diff --git a/data/styles/default/light/symbols/subway-tbilisi-s.svg b/data/styles/walking/light/symbols/subway-tbilisi-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tbilisi-s.svg rename to data/styles/walking/light/symbols/subway-tbilisi-s.svg diff --git a/data/styles/default/light/symbols/subway-tehran-m.svg b/data/styles/walking/light/symbols/subway-tehran-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tehran-m.svg rename to data/styles/walking/light/symbols/subway-tehran-m.svg diff --git a/data/styles/default/light/symbols/subway-tehran-s.svg b/data/styles/walking/light/symbols/subway-tehran-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tehran-s.svg rename to data/styles/walking/light/symbols/subway-tehran-s.svg diff --git a/data/styles/default/light/symbols/subway-tianjin-m.svg b/data/styles/walking/light/symbols/subway-tianjin-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tianjin-m.svg rename to data/styles/walking/light/symbols/subway-tianjin-m.svg diff --git a/data/styles/default/light/symbols/subway-tianjin-s.svg b/data/styles/walking/light/symbols/subway-tianjin-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tianjin-s.svg rename to data/styles/walking/light/symbols/subway-tianjin-s.svg diff --git a/data/styles/default/light/symbols/subway-tokyo-m.svg b/data/styles/walking/light/symbols/subway-tokyo-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tokyo-m.svg rename to data/styles/walking/light/symbols/subway-tokyo-m.svg diff --git a/data/styles/default/light/symbols/subway-tokyo-s.svg b/data/styles/walking/light/symbols/subway-tokyo-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tokyo-s.svg rename to data/styles/walking/light/symbols/subway-tokyo-s.svg diff --git a/data/styles/default/light/symbols/subway-tyneandwear-m.svg b/data/styles/walking/light/symbols/subway-tyneandwear-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tyneandwear-m.svg rename to data/styles/walking/light/symbols/subway-tyneandwear-m.svg diff --git a/data/styles/default/light/symbols/subway-tyneandwear-s.svg b/data/styles/walking/light/symbols/subway-tyneandwear-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-tyneandwear-s.svg rename to data/styles/walking/light/symbols/subway-tyneandwear-s.svg diff --git a/data/styles/default/light/symbols/subway-ubahn-m.svg b/data/styles/walking/light/symbols/subway-ubahn-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ubahn-m.svg rename to data/styles/walking/light/symbols/subway-ubahn-m.svg diff --git a/data/styles/default/light/symbols/subway-ubahn-s.svg b/data/styles/walking/light/symbols/subway-ubahn-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-ubahn-s.svg rename to data/styles/walking/light/symbols/subway-ubahn-s.svg diff --git a/data/styles/default/light/symbols/subway-valencia-m.svg b/data/styles/walking/light/symbols/subway-valencia-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-valencia-m.svg rename to data/styles/walking/light/symbols/subway-valencia-m.svg diff --git a/data/styles/default/light/symbols/subway-valencia-s.svg b/data/styles/walking/light/symbols/subway-valencia-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-valencia-s.svg rename to data/styles/walking/light/symbols/subway-valencia-s.svg diff --git a/data/styles/default/light/symbols/subway-vienna-m.svg b/data/styles/walking/light/symbols/subway-vienna-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-vienna-m.svg rename to data/styles/walking/light/symbols/subway-vienna-m.svg diff --git a/data/styles/default/light/symbols/subway-vienna-s.svg b/data/styles/walking/light/symbols/subway-vienna-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-vienna-s.svg rename to data/styles/walking/light/symbols/subway-vienna-s.svg diff --git a/data/styles/default/light/symbols/subway-volgograd-m.svg b/data/styles/walking/light/symbols/subway-volgograd-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-volgograd-m.svg rename to data/styles/walking/light/symbols/subway-volgograd-m.svg diff --git a/data/styles/default/light/symbols/subway-volgograd-s.svg b/data/styles/walking/light/symbols/subway-volgograd-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-volgograd-s.svg rename to data/styles/walking/light/symbols/subway-volgograd-s.svg diff --git a/data/styles/default/light/symbols/subway-warsaw-m.svg b/data/styles/walking/light/symbols/subway-warsaw-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-warsaw-m.svg rename to data/styles/walking/light/symbols/subway-warsaw-m.svg diff --git a/data/styles/default/light/symbols/subway-warsaw-s.svg b/data/styles/walking/light/symbols/subway-warsaw-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-warsaw-s.svg rename to data/styles/walking/light/symbols/subway-warsaw-s.svg diff --git a/data/styles/default/light/symbols/subway-warszawa-m.svg b/data/styles/walking/light/symbols/subway-warszawa-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-warszawa-m.svg rename to data/styles/walking/light/symbols/subway-warszawa-m.svg diff --git a/data/styles/default/light/symbols/subway-warszawa-s.svg b/data/styles/walking/light/symbols/subway-warszawa-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-warszawa-s.svg rename to data/styles/walking/light/symbols/subway-warszawa-s.svg diff --git a/data/styles/default/light/symbols/subway-washington-m.svg b/data/styles/walking/light/symbols/subway-washington-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-washington-m.svg rename to data/styles/walking/light/symbols/subway-washington-m.svg diff --git a/data/styles/default/light/symbols/subway-washington-s.svg b/data/styles/walking/light/symbols/subway-washington-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-washington-s.svg rename to data/styles/walking/light/symbols/subway-washington-s.svg diff --git a/data/styles/default/light/symbols/subway-wuhan-m.svg b/data/styles/walking/light/symbols/subway-wuhan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-wuhan-m.svg rename to data/styles/walking/light/symbols/subway-wuhan-m.svg diff --git a/data/styles/default/light/symbols/subway-wuhan-s.svg b/data/styles/walking/light/symbols/subway-wuhan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-wuhan-s.svg rename to data/styles/walking/light/symbols/subway-wuhan-s.svg diff --git a/data/styles/default/light/symbols/subway-xs.svg b/data/styles/walking/light/symbols/subway-xs.svg similarity index 100% rename from data/styles/default/light/symbols/subway-xs.svg rename to data/styles/walking/light/symbols/subway-xs.svg diff --git a/data/styles/default/light/symbols/subway-yerevan-m.svg b/data/styles/walking/light/symbols/subway-yerevan-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-yerevan-m.svg rename to data/styles/walking/light/symbols/subway-yerevan-m.svg diff --git a/data/styles/default/light/symbols/subway-yerevan-s.svg b/data/styles/walking/light/symbols/subway-yerevan-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-yerevan-s.svg rename to data/styles/walking/light/symbols/subway-yerevan-s.svg diff --git a/data/styles/default/light/symbols/subway-yokohama-m.svg b/data/styles/walking/light/symbols/subway-yokohama-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway-yokohama-m.svg rename to data/styles/walking/light/symbols/subway-yokohama-m.svg diff --git a/data/styles/default/light/symbols/subway-yokohama-s.svg b/data/styles/walking/light/symbols/subway-yokohama-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway-yokohama-s.svg rename to data/styles/walking/light/symbols/subway-yokohama-s.svg diff --git a/data/styles/default/light/symbols/subway_entrance-london-m.svg b/data/styles/walking/light/symbols/subway_entrance-london-m.svg similarity index 100% rename from data/styles/default/light/symbols/subway_entrance-london-m.svg rename to data/styles/walking/light/symbols/subway_entrance-london-m.svg diff --git a/data/styles/default/light/symbols/subway_entrance-london-s.svg b/data/styles/walking/light/symbols/subway_entrance-london-s.svg similarity index 100% rename from data/styles/default/light/symbols/subway_entrance-london-s.svg rename to data/styles/walking/light/symbols/subway_entrance-london-s.svg diff --git a/data/styles/default/light/symbols/supermarket-m.svg b/data/styles/walking/light/symbols/supermarket-m.svg similarity index 100% rename from data/styles/default/light/symbols/supermarket-m.svg rename to data/styles/walking/light/symbols/supermarket-m.svg diff --git a/data/styles/default/light/symbols/survey_point-m.svg b/data/styles/walking/light/symbols/survey_point-m.svg similarity index 100% rename from data/styles/default/light/symbols/survey_point-m.svg rename to data/styles/walking/light/symbols/survey_point-m.svg diff --git a/data/styles/default/light/symbols/swimming-centre-m.svg b/data/styles/walking/light/symbols/swimming-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/swimming-centre-m.svg rename to data/styles/walking/light/symbols/swimming-centre-m.svg diff --git a/data/styles/default/light/symbols/swimming-m.svg b/data/styles/walking/light/symbols/swimming-m.svg similarity index 100% rename from data/styles/default/light/symbols/swimming-m.svg rename to data/styles/walking/light/symbols/swimming-m.svg diff --git a/data/styles/default/light/symbols/table-tennis-centre-m.svg b/data/styles/walking/light/symbols/table-tennis-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/table-tennis-centre-m.svg rename to data/styles/walking/light/symbols/table-tennis-centre-m.svg diff --git a/data/styles/default/light/symbols/table-tennis-m.svg b/data/styles/walking/light/symbols/table-tennis-m.svg similarity index 100% rename from data/styles/default/light/symbols/table-tennis-m.svg rename to data/styles/walking/light/symbols/table-tennis-m.svg diff --git a/data/styles/default/light/symbols/tank-m.svg b/data/styles/walking/light/symbols/tank-m.svg similarity index 100% rename from data/styles/default/light/symbols/tank-m.svg rename to data/styles/walking/light/symbols/tank-m.svg diff --git a/data/styles/default/light/symbols/taoist-m.svg b/data/styles/walking/light/symbols/taoist-m.svg similarity index 100% rename from data/styles/default/light/symbols/taoist-m.svg rename to data/styles/walking/light/symbols/taoist-m.svg diff --git a/data/styles/default/light/symbols/taoist-s.svg b/data/styles/walking/light/symbols/taoist-s.svg similarity index 100% rename from data/styles/default/light/symbols/taoist-s.svg rename to data/styles/walking/light/symbols/taoist-s.svg diff --git a/data/styles/default/light/symbols/taxi-xm.svg b/data/styles/walking/light/symbols/taxi-xm.svg similarity index 100% rename from data/styles/default/light/symbols/taxi-xm.svg rename to data/styles/walking/light/symbols/taxi-xm.svg diff --git a/data/styles/default/light/symbols/telescope-gamma-m.svg b/data/styles/walking/light/symbols/telescope-gamma-m.svg similarity index 100% rename from data/styles/default/light/symbols/telescope-gamma-m.svg rename to data/styles/walking/light/symbols/telescope-gamma-m.svg diff --git a/data/styles/default/light/symbols/telescope-m.svg b/data/styles/walking/light/symbols/telescope-m.svg similarity index 100% rename from data/styles/default/light/symbols/telescope-m.svg rename to data/styles/walking/light/symbols/telescope-m.svg diff --git a/data/styles/default/light/symbols/telescope-optical-m.svg b/data/styles/walking/light/symbols/telescope-optical-m.svg similarity index 100% rename from data/styles/default/light/symbols/telescope-optical-m.svg rename to data/styles/walking/light/symbols/telescope-optical-m.svg diff --git a/data/styles/default/light/symbols/telescope-radio-m.svg b/data/styles/walking/light/symbols/telescope-radio-m.svg similarity index 100% rename from data/styles/default/light/symbols/telescope-radio-m.svg rename to data/styles/walking/light/symbols/telescope-radio-m.svg diff --git a/data/styles/default/light/symbols/tennis-centre-m.svg b/data/styles/walking/light/symbols/tennis-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/tennis-centre-m.svg rename to data/styles/walking/light/symbols/tennis-centre-m.svg diff --git a/data/styles/default/light/symbols/tennis-m.svg b/data/styles/walking/light/symbols/tennis-m.svg similarity index 100% rename from data/styles/default/light/symbols/tennis-m.svg rename to data/styles/walking/light/symbols/tennis-m.svg diff --git a/data/styles/default/light/symbols/theatre-m.svg b/data/styles/walking/light/symbols/theatre-m.svg similarity index 100% rename from data/styles/default/light/symbols/theatre-m.svg rename to data/styles/walking/light/symbols/theatre-m.svg diff --git a/data/styles/default/light/symbols/theatre-s.svg b/data/styles/walking/light/symbols/theatre-s.svg similarity index 100% rename from data/styles/default/light/symbols/theatre-s.svg rename to data/styles/walking/light/symbols/theatre-s.svg diff --git a/data/styles/default/light/symbols/theme_park-m.svg b/data/styles/walking/light/symbols/theme_park-m.svg similarity index 100% rename from data/styles/default/light/symbols/theme_park-m.svg rename to data/styles/walking/light/symbols/theme_park-m.svg diff --git a/data/styles/default/light/symbols/theme_park-s.svg b/data/styles/walking/light/symbols/theme_park-s.svg similarity index 100% rename from data/styles/default/light/symbols/theme_park-s.svg rename to data/styles/walking/light/symbols/theme_park-s.svg diff --git a/data/styles/default/light/symbols/ticket-shop-m.svg b/data/styles/walking/light/symbols/ticket-shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/ticket-shop-m.svg rename to data/styles/walking/light/symbols/ticket-shop-m.svg diff --git a/data/styles/default/light/symbols/tire-repair-m.svg b/data/styles/walking/light/symbols/tire-repair-m.svg similarity index 100% rename from data/styles/default/light/symbols/tire-repair-m.svg rename to data/styles/walking/light/symbols/tire-repair-m.svg diff --git a/data/styles/default/light/symbols/tobacco-m.svg b/data/styles/walking/light/symbols/tobacco-m.svg similarity index 100% rename from data/styles/default/light/symbols/tobacco-m.svg rename to data/styles/walking/light/symbols/tobacco-m.svg diff --git a/data/styles/default/light/symbols/toilets-m.svg b/data/styles/walking/light/symbols/toilets-m.svg similarity index 100% rename from data/styles/default/light/symbols/toilets-m.svg rename to data/styles/walking/light/symbols/toilets-m.svg diff --git a/data/styles/default/light/symbols/toll_booth-m.svg b/data/styles/walking/light/symbols/toll_booth-m.svg similarity index 100% rename from data/styles/default/light/symbols/toll_booth-m.svg rename to data/styles/walking/light/symbols/toll_booth-m.svg diff --git a/data/styles/default/light/symbols/toll_booth-s.svg b/data/styles/walking/light/symbols/toll_booth-s.svg similarity index 100% rename from data/styles/default/light/symbols/toll_booth-s.svg rename to data/styles/walking/light/symbols/toll_booth-s.svg diff --git a/data/styles/default/light/symbols/tomb-m.svg b/data/styles/walking/light/symbols/tomb-m.svg similarity index 100% rename from data/styles/default/light/symbols/tomb-m.svg rename to data/styles/walking/light/symbols/tomb-m.svg diff --git a/data/styles/default/light/symbols/tourism-m.svg b/data/styles/walking/light/symbols/tourism-m.svg similarity index 100% rename from data/styles/default/light/symbols/tourism-m.svg rename to data/styles/walking/light/symbols/tourism-m.svg diff --git a/data/styles/default/light/symbols/tourism-s.svg b/data/styles/walking/light/symbols/tourism-s.svg similarity index 100% rename from data/styles/default/light/symbols/tourism-s.svg rename to data/styles/walking/light/symbols/tourism-s.svg diff --git a/data/styles/default/light/symbols/tower-m.svg b/data/styles/walking/light/symbols/tower-m.svg similarity index 100% rename from data/styles/default/light/symbols/tower-m.svg rename to data/styles/walking/light/symbols/tower-m.svg diff --git a/data/styles/default/light/symbols/toys-m.svg b/data/styles/walking/light/symbols/toys-m.svg similarity index 100% rename from data/styles/default/light/symbols/toys-m.svg rename to data/styles/walking/light/symbols/toys-m.svg diff --git a/data/styles/default/light/symbols/track_marker_deselected.svg b/data/styles/walking/light/symbols/track_marker_deselected.svg similarity index 100% rename from data/styles/default/light/symbols/track_marker_deselected.svg rename to data/styles/walking/light/symbols/track_marker_deselected.svg diff --git a/data/styles/default/light/symbols/track_marker_selected.svg b/data/styles/walking/light/symbols/track_marker_selected.svg similarity index 100% rename from data/styles/default/light/symbols/track_marker_selected.svg rename to data/styles/walking/light/symbols/track_marker_selected.svg diff --git a/data/styles/default/light/symbols/traffic_signals-l.svg b/data/styles/walking/light/symbols/traffic_signals-l.svg similarity index 100% rename from data/styles/default/light/symbols/traffic_signals-l.svg rename to data/styles/walking/light/symbols/traffic_signals-l.svg diff --git a/data/styles/default/light/symbols/traffic_signals.svg b/data/styles/walking/light/symbols/traffic_signals.svg similarity index 100% rename from data/styles/default/light/symbols/traffic_signals.svg rename to data/styles/walking/light/symbols/traffic_signals.svg diff --git a/data/styles/default/light/symbols/train-m.svg b/data/styles/walking/light/symbols/train-m.svg similarity index 100% rename from data/styles/default/light/symbols/train-m.svg rename to data/styles/walking/light/symbols/train-m.svg diff --git a/data/styles/default/light/symbols/train-s.svg b/data/styles/walking/light/symbols/train-s.svg similarity index 100% rename from data/styles/default/light/symbols/train-s.svg rename to data/styles/walking/light/symbols/train-s.svg diff --git a/data/styles/default/light/symbols/train_building-m.svg b/data/styles/walking/light/symbols/train_building-m.svg similarity index 100% rename from data/styles/default/light/symbols/train_building-m.svg rename to data/styles/walking/light/symbols/train_building-m.svg diff --git a/data/styles/default/light/symbols/train_light-m.svg b/data/styles/walking/light/symbols/train_light-m.svg similarity index 100% rename from data/styles/default/light/symbols/train_light-m.svg rename to data/styles/walking/light/symbols/train_light-m.svg diff --git a/data/styles/default/light/symbols/train_light-s.svg b/data/styles/walking/light/symbols/train_light-s.svg similarity index 100% rename from data/styles/default/light/symbols/train_light-s.svg rename to data/styles/walking/light/symbols/train_light-s.svg diff --git a/data/styles/default/light/symbols/tram-m.svg b/data/styles/walking/light/symbols/tram-m.svg similarity index 100% rename from data/styles/default/light/symbols/tram-m.svg rename to data/styles/walking/light/symbols/tram-m.svg diff --git a/data/styles/default/light/symbols/tram-s.svg b/data/styles/walking/light/symbols/tram-s.svg similarity index 100% rename from data/styles/default/light/symbols/tram-s.svg rename to data/styles/walking/light/symbols/tram-s.svg diff --git a/data/styles/default/light/symbols/transfer_arrow.svg b/data/styles/walking/light/symbols/transfer_arrow.svg similarity index 100% rename from data/styles/default/light/symbols/transfer_arrow.svg rename to data/styles/walking/light/symbols/transfer_arrow.svg diff --git a/data/styles/default/light/symbols/transit_light_rail-m.svg b/data/styles/walking/light/symbols/transit_light_rail-m.svg similarity index 100% rename from data/styles/default/light/symbols/transit_light_rail-m.svg rename to data/styles/walking/light/symbols/transit_light_rail-m.svg diff --git a/data/styles/default/light/symbols/transit_light_rail-s.svg b/data/styles/walking/light/symbols/transit_light_rail-s.svg similarity index 100% rename from data/styles/default/light/symbols/transit_light_rail-s.svg rename to data/styles/walking/light/symbols/transit_light_rail-s.svg diff --git a/data/styles/default/light/symbols/transit_monorail-m.svg b/data/styles/walking/light/symbols/transit_monorail-m.svg similarity index 100% rename from data/styles/default/light/symbols/transit_monorail-m.svg rename to data/styles/walking/light/symbols/transit_monorail-m.svg diff --git a/data/styles/default/light/symbols/transit_monorail-s.svg b/data/styles/walking/light/symbols/transit_monorail-s.svg similarity index 100% rename from data/styles/default/light/symbols/transit_monorail-s.svg rename to data/styles/walking/light/symbols/transit_monorail-s.svg diff --git a/data/styles/default/light/symbols/transit_subway-m.svg b/data/styles/walking/light/symbols/transit_subway-m.svg similarity index 100% rename from data/styles/default/light/symbols/transit_subway-m.svg rename to data/styles/walking/light/symbols/transit_subway-m.svg diff --git a/data/styles/default/light/symbols/transit_subway-s.svg b/data/styles/walking/light/symbols/transit_subway-s.svg similarity index 100% rename from data/styles/default/light/symbols/transit_subway-s.svg rename to data/styles/walking/light/symbols/transit_subway-s.svg diff --git a/data/styles/default/light/symbols/transit_train-m.svg b/data/styles/walking/light/symbols/transit_train-m.svg similarity index 100% rename from data/styles/default/light/symbols/transit_train-m.svg rename to data/styles/walking/light/symbols/transit_train-m.svg diff --git a/data/styles/default/light/symbols/transit_train-s.svg b/data/styles/walking/light/symbols/transit_train-s.svg similarity index 100% rename from data/styles/default/light/symbols/transit_train-s.svg rename to data/styles/walking/light/symbols/transit_train-s.svg diff --git a/data/styles/default/light/symbols/travel_agency_shop-m.svg b/data/styles/walking/light/symbols/travel_agency_shop-m.svg similarity index 100% rename from data/styles/default/light/symbols/travel_agency_shop-m.svg rename to data/styles/walking/light/symbols/travel_agency_shop-m.svg diff --git a/data/styles/default/light/symbols/tree-m.svg b/data/styles/walking/light/symbols/tree-m.svg similarity index 100% rename from data/styles/default/light/symbols/tree-m.svg rename to data/styles/walking/light/symbols/tree-m.svg diff --git a/data/styles/default/light/symbols/tree-special-m.svg b/data/styles/walking/light/symbols/tree-special-m.svg similarity index 100% rename from data/styles/default/light/symbols/tree-special-m.svg rename to data/styles/walking/light/symbols/tree-special-m.svg diff --git a/data/styles/default/light/symbols/vehicle_inspection-m.svg b/data/styles/walking/light/symbols/vehicle_inspection-m.svg similarity index 100% rename from data/styles/default/light/symbols/vehicle_inspection-m.svg rename to data/styles/walking/light/symbols/vehicle_inspection-m.svg diff --git a/data/styles/default/light/symbols/vending-m.svg b/data/styles/walking/light/symbols/vending-m.svg similarity index 100% rename from data/styles/default/light/symbols/vending-m.svg rename to data/styles/walking/light/symbols/vending-m.svg diff --git a/data/styles/default/light/symbols/veterinary-m.svg b/data/styles/walking/light/symbols/veterinary-m.svg similarity index 100% rename from data/styles/default/light/symbols/veterinary-m.svg rename to data/styles/walking/light/symbols/veterinary-m.svg diff --git a/data/styles/default/light/symbols/video-games-m.svg b/data/styles/walking/light/symbols/video-games-m.svg similarity index 100% rename from data/styles/default/light/symbols/video-games-m.svg rename to data/styles/walking/light/symbols/video-games-m.svg diff --git a/data/styles/default/light/symbols/viewpoint-m.svg b/data/styles/walking/light/symbols/viewpoint-m.svg similarity index 100% rename from data/styles/default/light/symbols/viewpoint-m.svg rename to data/styles/walking/light/symbols/viewpoint-m.svg diff --git a/data/styles/default/light/symbols/viewpoint-s.svg b/data/styles/walking/light/symbols/viewpoint-s.svg similarity index 100% rename from data/styles/default/light/symbols/viewpoint-s.svg rename to data/styles/walking/light/symbols/viewpoint-s.svg diff --git a/data/styles/default/light/symbols/volcano-m.svg b/data/styles/walking/light/symbols/volcano-m.svg similarity index 100% rename from data/styles/default/light/symbols/volcano-m.svg rename to data/styles/walking/light/symbols/volcano-m.svg diff --git a/data/styles/default/light/symbols/volcano-s.svg b/data/styles/walking/light/symbols/volcano-s.svg similarity index 100% rename from data/styles/default/light/symbols/volcano-s.svg rename to data/styles/walking/light/symbols/volcano-s.svg diff --git a/data/styles/default/light/symbols/volleyball-centre-m.svg b/data/styles/walking/light/symbols/volleyball-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/volleyball-centre-m.svg rename to data/styles/walking/light/symbols/volleyball-centre-m.svg diff --git a/data/styles/default/light/symbols/volleyball-m.svg b/data/styles/walking/light/symbols/volleyball-m.svg similarity index 100% rename from data/styles/default/light/symbols/volleyball-m.svg rename to data/styles/walking/light/symbols/volleyball-m.svg diff --git a/data/styles/default/light/symbols/warning-ferry.svg b/data/styles/walking/light/symbols/warning-ferry.svg similarity index 100% rename from data/styles/default/light/symbols/warning-ferry.svg rename to data/styles/walking/light/symbols/warning-ferry.svg diff --git a/data/styles/default/light/symbols/warning-general.svg b/data/styles/walking/light/symbols/warning-general.svg similarity index 100% rename from data/styles/default/light/symbols/warning-general.svg rename to data/styles/walking/light/symbols/warning-general.svg diff --git a/data/styles/default/light/symbols/warning-paid_road.svg b/data/styles/walking/light/symbols/warning-paid_road.svg similarity index 100% rename from data/styles/default/light/symbols/warning-paid_road.svg rename to data/styles/walking/light/symbols/warning-paid_road.svg diff --git a/data/styles/default/light/symbols/warning-unpaved_road.svg b/data/styles/walking/light/symbols/warning-unpaved_road.svg similarity index 100% rename from data/styles/default/light/symbols/warning-unpaved_road.svg rename to data/styles/walking/light/symbols/warning-unpaved_road.svg diff --git a/data/styles/default/light/symbols/waste-basket-m.svg b/data/styles/walking/light/symbols/waste-basket-m.svg similarity index 100% rename from data/styles/default/light/symbols/waste-basket-m.svg rename to data/styles/walking/light/symbols/waste-basket-m.svg diff --git a/data/styles/default/light/symbols/waste-basket-s.svg b/data/styles/walking/light/symbols/waste-basket-s.svg similarity index 100% rename from data/styles/default/light/symbols/waste-basket-s.svg rename to data/styles/walking/light/symbols/waste-basket-s.svg diff --git a/data/styles/default/light/symbols/water_slide-m.svg b/data/styles/walking/light/symbols/water_slide-m.svg similarity index 100% rename from data/styles/default/light/symbols/water_slide-m.svg rename to data/styles/walking/light/symbols/water_slide-m.svg diff --git a/data/styles/default/light/symbols/waterfall-m.svg b/data/styles/walking/light/symbols/waterfall-m.svg similarity index 100% rename from data/styles/default/light/symbols/waterfall-m.svg rename to data/styles/walking/light/symbols/waterfall-m.svg diff --git a/data/styles/default/light/symbols/waterfall-s.svg b/data/styles/walking/light/symbols/waterfall-s.svg similarity index 100% rename from data/styles/default/light/symbols/waterfall-s.svg rename to data/styles/walking/light/symbols/waterfall-s.svg diff --git a/data/styles/default/light/symbols/wayside_cross-m.svg b/data/styles/walking/light/symbols/wayside_cross-m.svg similarity index 100% rename from data/styles/default/light/symbols/wayside_cross-m.svg rename to data/styles/walking/light/symbols/wayside_cross-m.svg diff --git a/data/styles/default/light/symbols/wayside_shrine-m.svg b/data/styles/walking/light/symbols/wayside_shrine-m.svg similarity index 100% rename from data/styles/default/light/symbols/wayside_shrine-m.svg rename to data/styles/walking/light/symbols/wayside_shrine-m.svg diff --git a/data/styles/default/light/symbols/wholesale-m.svg b/data/styles/walking/light/symbols/wholesale-m.svg similarity index 100% rename from data/styles/default/light/symbols/wholesale-m.svg rename to data/styles/walking/light/symbols/wholesale-m.svg diff --git a/data/styles/default/light/symbols/wind_turbine-m.svg b/data/styles/walking/light/symbols/wind_turbine-m.svg similarity index 100% rename from data/styles/default/light/symbols/wind_turbine-m.svg rename to data/styles/walking/light/symbols/wind_turbine-m.svg diff --git a/data/styles/default/light/symbols/windmill-m.svg b/data/styles/walking/light/symbols/windmill-m.svg similarity index 100% rename from data/styles/default/light/symbols/windmill-m.svg rename to data/styles/walking/light/symbols/windmill-m.svg diff --git a/data/styles/default/light/symbols/winery-m.svg b/data/styles/walking/light/symbols/winery-m.svg similarity index 100% rename from data/styles/default/light/symbols/winery-m.svg rename to data/styles/walking/light/symbols/winery-m.svg diff --git a/data/styles/default/light/symbols/wreck-m.svg b/data/styles/walking/light/symbols/wreck-m.svg similarity index 100% rename from data/styles/default/light/symbols/wreck-m.svg rename to data/styles/walking/light/symbols/wreck-m.svg diff --git a/data/styles/default/light/symbols/yoga-centre-m.svg b/data/styles/walking/light/symbols/yoga-centre-m.svg similarity index 100% rename from data/styles/default/light/symbols/yoga-centre-m.svg rename to data/styles/walking/light/symbols/yoga-centre-m.svg diff --git a/data/styles/default/light/symbols/yoga-m.svg b/data/styles/walking/light/symbols/yoga-m.svg similarity index 100% rename from data/styles/default/light/symbols/yoga-m.svg rename to data/styles/walking/light/symbols/yoga-m.svg diff --git a/data/styles/default/light/symbols/zero-icon.svg b/data/styles/walking/light/symbols/zero-icon.svg similarity index 100% rename from data/styles/default/light/symbols/zero-icon.svg rename to data/styles/walking/light/symbols/zero-icon.svg diff --git a/data/styles/default/light/symbols/zoo-m.svg b/data/styles/walking/light/symbols/zoo-m.svg similarity index 100% rename from data/styles/default/light/symbols/zoo-m.svg rename to data/styles/walking/light/symbols/zoo-m.svg diff --git a/data/styles/default/light/symbols/zoo-s.svg b/data/styles/walking/light/symbols/zoo-s.svg similarity index 100% rename from data/styles/default/light/symbols/zoo-s.svg rename to data/styles/walking/light/symbols/zoo-s.svg diff --git a/data/styles/walking_outdoor/dark/colors.mapcss b/data/styles/walking_outdoor/dark/colors.mapcss new file mode 100644 index 000000000..b50440123 --- /dev/null +++ b/data/styles/walking_outdoor/dark/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/dark/colors.mapcss"); +@import("../../outdoor/dark/colors.mapcss"); diff --git a/data/styles/walking_outdoor/dark/style.mapcss b/data/styles/walking_outdoor/dark/style.mapcss new file mode 100644 index 000000000..b01d326b3 --- /dev/null +++ b/data/styles/walking_outdoor/dark/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/dark/dynamic_colors.mapcss"); diff --git a/data/styles/walking_outdoor/include/basemap.mapcss b/data/styles/walking_outdoor/include/basemap.mapcss new file mode 100644 index 000000000..b3433b91d --- /dev/null +++ b/data/styles/walking_outdoor/include/basemap.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap.mapcss"); +@import("../../outdoor/include/basemap.mapcss"); diff --git a/data/styles/walking_outdoor/include/basemap_label.mapcss b/data/styles/walking_outdoor/include/basemap_label.mapcss new file mode 100644 index 000000000..977a5ee63 --- /dev/null +++ b/data/styles/walking_outdoor/include/basemap_label.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/basemap_label.mapcss"); +@import("../../outdoor/include/basemap_label.mapcss"); diff --git a/data/styles/walking_outdoor/include/icons.mapcss b/data/styles/walking_outdoor/include/icons.mapcss new file mode 100644 index 000000000..e5e144869 --- /dev/null +++ b/data/styles/walking_outdoor/include/icons.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons.mapcss"); +@import("../../outdoor/include/icons.mapcss"); diff --git a/data/styles/walking_outdoor/include/icons_label_colors.mapcss b/data/styles/walking_outdoor/include/icons_label_colors.mapcss new file mode 100644 index 000000000..ff0cb93a5 --- /dev/null +++ b/data/styles/walking_outdoor/include/icons_label_colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/icons_label_colors.mapcss"); +@import("../../outdoor/include/icons_label_colors.mapcss"); diff --git a/data/styles/walking_outdoor/include/priorities_1_BG-by-size.prio.txt b/data/styles/walking_outdoor/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..e1d4d7bd1 --- /dev/null +++ b/data/styles/walking_outdoor/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,266 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-by-size geometry: background areas rendered below BG-top and everything else. +# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). +# So effectively priority values of BG-by-size areas are not used at the moment. +# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. +# Keep them in a logical importance order please. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_1_BG-by-size.prio.txt") +@import("../../outdoor/include/priorities_1_BG-by-size.prio.txt") + +# leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) +# === 250 + +# amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) +# amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) +# landuse-religious # area z13- +# === 240 + +# amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) +# leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) +# === 230 + +# landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) +# === 220 + +# leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) +# === 200 + +# amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) +# leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) +# leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-boules # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-four_square # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-pickleball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) +# leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) +# === 190 + +# amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +# amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +# landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +# landuse-cemetery-christian # area z10- (also has icon z14-, caption(optional) z15-) +# === 180 + +# amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-charging_station # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-bicycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-carless # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-motorcar # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-charging_station-motorcycle # area z16- (also has icon z18-, caption(optional) z18-) +# amenity-charging_station-small # area z15- (also has icon z17-, caption(optional) z18-) +# amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-fuel # area z15- (also has icon z15-, caption(optional) z15-) +# amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-police # area z15- (also has icon z16-, caption(optional) z17-) +# amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) +# amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) +# amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) +# emergency-mountain_rescue # area z13- (also has icon 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-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-) +# leisure-dog_park # area z15- (also has icon z16-, caption(optional) z16-) +# leisure-resort # area z13- (also has icon z16-, caption(optional) z16-) +# leisure-water_park # area z13- (also has icon z16-, caption(optional) z16-) +# office-diplomatic # area z15- (also has icon z17-, caption(optional) z17-) +# tourism-camp_site # area z13- (also has icon z13-, caption(optional) z13-) +# tourism-information-office # area z15- (also has icon z13-, caption(optional) z14-) +# 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 z16-, pathtext z13-) +# leisure-track-area # area z15- (also has caption z16-) +# === 160 + +# aeroway-terminal # area z14- (also has caption z15-) +# === 150 + +# leisure-golf_course # area z12- (also has icon z15-, caption(optional) z17-) +# leisure-miniature_golf # area z14- (also has icon z16-, caption(optional) z17-) +# === 140 + +# landuse-flowerbed # area z16- +# natural-scrub # area z11- +# === 130 + +# landuse-grass # area z11- +# natural-grassland # area z11- +# natural-heath # area z11- +# === 120 + +# area:highway-footway # area z14- (also has caption z15-) +# area:highway-living_street # area z14- +# area:highway-pedestrian # area z14- (also has caption z15-) +# public_transport-platform # area z16- (also has caption z17-) +# railway-platform # area z16- (also has caption z16-) +# === 110 + +# amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-) +# amenity-parking # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) +# amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-no-access # area z15- (also has icon z18-, caption(optional) z18-) +# amenity-parking-park_and_ride # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-permissive # area z15- (also has icon z16-, caption(optional) z18-) +# amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-) +# amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-) +# === 100 + +# natural-wetland # area z11- (also has caption z16-) +# natural-wetland-bog # area z11- (also has caption z16-) +# natural-wetland-fen # area z11- (also has caption z16-) +# natural-wetland-mangrove # area z11- (also has caption z16-) +# natural-wetland-marsh # area z11- (also has caption z16-) +# natural-wetland-reedbed # area z11- (also has caption z16-) +# natural-wetland-saltmarsh # area z11- (also has caption z16-) +# natural-wetland-saltmarsh-tidal # area z11- (also has caption z16-) +# natural-wetland-swamp # area z11- (also has caption z16-) +# natural-wetland-tidalflat # area z11- (also has caption z16-) +# === 90 + +# landuse-farmyard # area z10- (also has caption z15-) +# === 81 + +# landuse-allotments # area z12- (also has caption z15-) +# landuse-farmland # area z10- (also has caption z15-) +# landuse-meadow # area z11- +# landuse-orchard # area z12- (also has caption z15-) +# landuse-recreation_ground # area z12- (also has caption z15-) +# landuse-village_green # area z12- +# landuse-vineyard # area z12- (also has caption z15-) +# leisure-fitness_station # area z15- (also has icon z17-, caption(optional) z17-) +# leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) +# natural-bare_rock # area z11- (also has caption z13-) +# natural-scree # area z11- +# natural-shingle # area z12- +# === 80 + +# landuse-plant_nursery # area z12- (also has icon z17-, caption(optional) z17-) +# leisure-garden # area z12- (also has icon z16-, caption(optional) z16-, caption z17-) +# leisure-garden-residential # area z12- +# leisure-park # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-no-access # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-permissive # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# leisure-park-private # area z10- (also has icon z14-, caption(optional) z14-, caption z17-) +# === 70 + +# landuse-forest # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-coniferous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-deciduous # area z10- (also has icon z12-, caption(optional) z13-) +# landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) +# === 60 + +# amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) +# landuse-construction # area z13- (also has caption z15-) +# landuse-industrial # area z13- (also has caption z15-) +# landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-quarry # area z13- (also has icon z15-, caption(optional) z15-) +# landuse-railway # area z13- (also has caption z15-) +# man_made-wastewater_plant # area z13- (also has caption z15-) +# man_made-works # area z13- (also has icon z16-, caption(optional) z17-) +# power-generator # area z13- (also has icon z17-) +# power-generator-gas # area z13- (also has icon z17-) +# power-generator-hydro # area z13- (also has icon z17-) +# power-generator-solar # area z13- +# power-generator-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-plant # area z13- (also has icon z17-) +# power-plant-coal # area z13- (also has icon z17-) +# power-plant-gas # area z13- (also has icon z17-) +# power-plant-hydro # area z13- (also has icon z17-) +# power-plant-solar # area z13- (also has icon z17-) +# power-plant-wind # area z13- (also has icon z13-, caption(optional) z16-) +# power-substation # area z13- (also has icon z17-, caption(optional) z18-) +# === 50 + +# amenity-childcare # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-clinic # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-college # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-hospital # area z13- (also has icon z14-, caption(optional) z15-) +# amenity-kindergarten # area z13- (also has icon z17-, caption(optional) z17-) +# amenity-school # area z13- (also has icon z16-, caption(optional) z16-) +# amenity-university # area z13- (also has icon z14-, caption(optional) z14-, caption z14-) +# === 40 + +# aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) +# aeroway-aerodrome-international # area z10- (also has icon z7-, caption(optional) z10-) +# landuse-education # area z13- +# landuse-retail # area z13- (also has caption z16-) +# leisure-beach_resort # area z10- (also has icon z16-, caption(optional) z16-) +# natural-beach # area z10- (also has caption z14-) +# natural-beach-gravel # area z10- (also has caption z14-) +# natural-beach-sand # area z10- (also has caption z14-) +# natural-desert # area z1- (also has caption z14-) +# natural-glacier # area z1- +# natural-sand # area z1- (also has caption z15-) +# === 30 + +# natural-land # area z1- +# place-islet # area z10- (also has caption z14-) +# === 20 + +# natural-coastline # area z1- +# === 10 diff --git a/data/styles/walking_outdoor/include/priorities_2_BG-top.prio.txt b/data/styles/walking_outdoor/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..95f12b8da --- /dev/null +++ b/data/styles/walking_outdoor/include/priorities_2_BG-top.prio.txt @@ -0,0 +1,51 @@ +# Only have changes of the base priority file here! + +# This file is automatically re-formatted and re-sorted in priorities descending order +# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) +# are generated automatically for information only. Custom formatting and comments are not preserved. +# +# BG-top geometry: background lines and areas that should be always below foreground ones +# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size), +# because ordering by size doesn't always work with e.g. water mapped over a forest, +# so water should be on top of other landcover always, but linear waterways should be hidden beneath it. +# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature +# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas +# are displayed above layer=0 BG-top. +# +# Priorities ranges' rendering order overview: +# - overlays (icons, captions...) +# - FG: foreground areas and lines +# - BG-top: water (linear and areal) +# - BG-by-size: landcover areas sorted by their size + +@import("../../walking/include/priorities_2_BG-top.prio.txt") +@import("../../outdoor/include/priorities_2_BG-top.prio.txt") + +# landuse-basin # area z12- +# landuse-reservoir # area z12- (also has caption z10-) +# landuse-salt_pond # area z1- +# natural-water # area z1- (also has caption z10-) +# natural-water-basin # area z1- (also has caption z10-) +# natural-water-ditch # area z13- (also has caption z17-) +# natural-water-drain # area z13- (also has caption z17-) +# natural-water-lake # area z1- (also has caption z10-) +# natural-water-lock # area z1- (also has caption z10-) +# natural-water-moat # area z1- (also has caption z17-) +# natural-water-pond # area z1- (also has caption z10-) +# natural-water-reservoir # area z1- (also has caption z10-) +# natural-water-river # area z1- (also has caption z10-) +# natural-water-tunnel # area z15- +# natural-water-wastewater # area z12- (also has caption z17-) +# waterway-dock # area z1- +# === 20 + +# natural-strait # line z11- (also has caption z13-) +# waterway-canal # line z12- (also has pathtext z13-) +# waterway-ditch # line z13- +# waterway-drain # line z13- +# waterway-fish_pass # line z13- (also has pathtext z13-) +# waterway-river # line z10- (also has pathtext z11-) +# waterway-stream # line z12- (also has pathtext z13-) +# waterway-stream-ephemeral # line z13- (also has pathtext z13-) +# waterway-stream-intermittent # line z13- (also has pathtext z13-) +# === 10 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/walking_outdoor/include/priorities_3_FG.prio.txt similarity index 65% rename from data/styles/outdoors/include/priorities_3_FG.prio.txt rename to data/styles/walking_outdoor/include/priorities_3_FG.prio.txt index c9dd78f72..1f611abca 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/walking_outdoor/include/priorities_3_FG.prio.txt @@ -1,3 +1,5 @@ +# Only have changes of the base priority file here! + # This file is automatically re-formatted and re-sorted in priorities descending order # when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) # are generated automatically for information only. Custom formatting and comments are not preserved. @@ -12,40 +14,43 @@ # - BG-top: water (linear and areal) # - BG-by-size: landcover areas sorted by their size -aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) -=== 380 - -aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) -=== 370 - -historic-citywalls # line z14- (also has pathtext z16-) -=== 360 - -power-line # line z13- (also has line::dash z13-, pathtext z15-) -power-minor_line # line z15- (also has line::dash z15-) -=== 350 - -power-line::dash # line::dash z13- (also has line z13-, pathtext z15-) -power-minor_line::dash # line::dash z15- (also has line z15-) -=== 340 +@import("../../walking/include/priorities_3_FG.prio.txt") +@import("../../outdoor/include/priorities_3_FG.prio.txt") + +# aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) +# aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) +# aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) +# === 380 + +# aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) +# aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) +# aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) +# === 370 + +# historic-citywalls # line z14- (also has pathtext z16-) +# === 360 + +# power-line # line z13- (also has line::dash z13-, pathtext z15-) +# power-minor_line # line z15- (also has line::dash z15-) +# === 350 + +# power-line::dash # line::dash z13- (also has line z13-, pathtext z15-) +# power-minor_line::dash # line::dash z15- (also has line z15-) +# === 340 highway-ladder # line z12- (also has line::border z16-, icon z16-, pathtext z17-) highway-steps # line z12- (also has line::border z16-, pathtext z13-) @@ -55,73 +60,73 @@ hwtag-oneway::arrows # line::arrows z15- waterway-weir # line z14- (also has pathtext z15-) === 330 -barrier-city_wall # line z14- (also has pathtext z16-) -barrier-fence # line z15- -barrier-guard_rail # line z16- -barrier-hedge # line z16- -barrier-wall # line z15- -barrier-yes # line z15- (also has icon z16-, caption(optional) z16-) -railway-funicular # line z12- -railway-funicular-bridge # line z12- -railway-funicular-tunnel # line z12- -railway-monorail # line z14- -railway-monorail-bridge # line z14- -railway-monorail-tunnel # line z14- -railway-narrow_gauge # line z15- -railway-narrow_gauge-bridge # line z15- -railway-narrow_gauge-tunnel # line z15- -railway-tram # line z13- -railway-tram-bridge # line z13- -railway-tram-tunnel # line z13- -=== 320 - -highway-motorway # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-world_level # line z4-9 -highway-world_towns_level # line z6-9 -=== 310 +# barrier-city_wall # line z14- (also has pathtext z16-) +# barrier-fence # line z15- +# barrier-guard_rail # line z16- +# barrier-hedge # line z16- +# barrier-wall # line z15- +# barrier-yes # line z15- (also has icon z16-, caption(optional) z16-) +# railway-funicular # line z12- +# railway-funicular-bridge # line z12- +# railway-funicular-tunnel # line z12- +# railway-monorail # line z14- +# railway-monorail-bridge # line z14- +# railway-monorail-tunnel # line z14- +# railway-narrow_gauge # line z15- +# railway-narrow_gauge-bridge # line z15- +# railway-narrow_gauge-tunnel # line z15- +# railway-tram # line z13- +# railway-tram-bridge # line z13- +# railway-tram-tunnel # line z13- +# === 320 + +# highway-motorway # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line z6- (also has line::border z10-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk # line z6- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line z6- (also has line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line z6- (also has line::border z10-, 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 z10-, pathtext z10-, shield::shield z10-) # highway-trunk-tunnel # line(casing) z12- (also has line z6-, line::border z10-, 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-) -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-) -railway-rail-highspeed::dash # line::dash z15- (also has line z10-) -railway-rail-highspeed-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) -railway-rail-highspeed-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) -railway-rail-main::dash # line::dash z15- (also has line z10-) -railway-rail-main-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) -railway-rail-main-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) -railway-rail-tourism::dash # line::dash z15- (also has line z10-, pathtext z14-) -railway-rail-tourism-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) -railway-rail-tourism-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-) -=== 290 +# 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-) +# 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-) +# railway-rail-highspeed::dash # line::dash z15- (also has line z10-) +# railway-rail-highspeed-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-highspeed-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-main::dash # line::dash z15- (also has line z10-) +# railway-rail-main-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-main-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-tourism::dash # line::dash z15- (also has line z10-, pathtext z14-) +# railway-rail-tourism-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-) +# 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-) # === 289 -railway-rail-branch # line z10- (also has line::dash z15-) -railway-rail-branch-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) -railway-rail-branch-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) -railway-rail-highspeed # line z10- (also has line::dash z15-) -railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) -railway-rail-highspeed-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) -railway-rail-main # line z10- (also has line::dash z15-) -railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) -railway-rail-main-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) -railway-rail-tourism # line z10- (also has line::dash z15-, pathtext z14-) -railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) -railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) -=== 280 +# railway-rail-branch # line z10- (also has line::dash z15-) +# railway-rail-branch-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-branch-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-highspeed # line z10- (also has line::dash z15-) +# railway-rail-highspeed-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-highspeed-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-main # line z10- (also has line::dash z15-) +# railway-rail-main-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-main-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-tourism # line z10- (also has line::dash z15-, pathtext z14-) +# railway-rail-tourism-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-, pathtext z14-) +# railway-rail-tourism-tunnel # line z10- (also has line::dash z15-, line(casing) z14-, pathtext z14-) +# === 280 # railway-rail-branch-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) # railway-rail-highspeed-tunnel # line(casing) z14- (also has line z10-, line::dash z15-) @@ -129,105 +134,105 @@ 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-) -=== 270 +# 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-) +# === 270 # highway-secondary-tunnel # line(casing) z16- (also has line z10-, line::border 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 z11-, pathtext z13-) -highway-unclassified-area # line z11- (also has line::border z11-, pathtext z13-) -highway-unclassified-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) -highway-unclassified-tunnel # line z11- (also has line::border z11-, line(casing) z16-, pathtext z13-) -=== 250 +# 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 z11-, pathtext z13-) +# highway-unclassified-area # line z11- (also has line::border z11-, pathtext z13-) +# highway-unclassified-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# highway-unclassified-tunnel # line z11- (also has line::border z11-, 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 z11-, pathtext z13-) # === 249 -highway-living_street # line z12- (also has line::border z12-, pathtext z14-) -highway-living_street-bridge # line z12- (also has line::border z12-, pathtext z14-) -highway-living_street-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z14-) -highway-residential # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) -highway-residential-area # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) -highway-residential-bridge # line z12- (also has line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-residential-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) -highway-road # line z12- (also has line::border z12-, pathtext z14-) -highway-road-bridge # line z12- (also has line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) -highway-road-tunnel # line z12- (also has line::border z12-, pathtext z14-) -=== 230 +# highway-living_street # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-bridge # line z12- (also has line::border z12-, pathtext z14-) +# highway-living_street-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z14-) +# highway-residential # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area # line z12- (also has line::border z12-, pathtext z13-, shield::shield z15-) +# highway-residential-bridge # line z12- (also has line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-residential-tunnel # line z12- (also has line::border z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road # line z12- (also has line::border z12-, pathtext z14-) +# highway-road-bridge # line z12- (also has line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-road-tunnel # line z12- (also has line::border z12-, pathtext z14-) +# === 230 # highway-living_street-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z14-) # highway-residential-tunnel # line(casing) z16- (also has line z12-, line::border z12-, pathtext z13-, shield::shield z15-) # === 229 -highway-motorway_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-motorway_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -=== 228 +# highway-motorway_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-motorway_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link # line z10- (also has line::border z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge # line z10- (also has line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel # line z10- (also has line::border z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 228 # highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) # highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, line::border z10-, pathtext z10-, shield::shield z10-) # === 227 -highway-primary_link # line z11- (also has line::border z11-, pathtext z11-, shield::shield z11-) -highway-primary_link-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-primary_link-tunnel # line z11- (also has line::border z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) -=== 226 +# highway-primary_link # line z11- (also has line::border z11-, pathtext z11-, shield::shield z11-) +# highway-primary_link-bridge # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) +# highway-primary_link-tunnel # line z11- (also has line::border z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) +# === 226 # highway-primary_link-tunnel # line(casing) z14- (also has line z11-, line::border 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-) -=== 224 +# 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-) +# === 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-) -=== 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 z13-, pathtext z16-) -highway-service-area # line z13- (also has line::border z13-, pathtext z16-) -highway-service-bridge # line z13- (also has line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-service-driveway # line z15- (also has line::border z15-, pathtext z16-) -highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) -highway-service-tunnel # line z13- (also has line::border z13-, line(casing) z15-, pathtext z16-) +# highway-tertiary_link # line z14- (also has line::border z14-, pathtext z18-) +# highway-tertiary_link-bridge # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) +# highway-tertiary_link-tunnel # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-) +# === 223 + +# highway-busway # line z15- (also has 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 z13-, pathtext z16-) +# highway-service-area # line z13- (also has line::border z13-, pathtext z16-) +# highway-service-bridge # line z13- (also has line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) +# highway-service-driveway # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-parking_aisle # line z15- (also has line::border z15-, pathtext z16-) +# highway-service-tunnel # line z13- (also has line::border z13-, line(casing) z15-, pathtext z16-) # highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-) -=== 222 +# === 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 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-) -railway-rail-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) -railway-rail-service::dash # line::dash z16- (also has line z15-) -railway-rail-service-bridge::dash # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) -railway-rail-service-tunnel::dash # line::dash z16- (also has line(casing) z15-, line z15-) -railway-rail-spur::dash # line::dash z16- (also has line z14-) -railway-rail-spur-bridge::dash # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-) -railway-rail-spur-tunnel::dash # line::dash z16- (also has line(casing) z14-, line z14-) -railway-rail-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) -railway-rail-utility::dash # line::dash z16- (also has line z12-) -railway-rail-utility-bridge::dash # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-) -railway-rail-utility-tunnel::dash # line::dash z16- (also has line z12-, line(casing) z14-) -railway-subway::dash # line::dash z16- (also has line z13-) -railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) -=== 221 +# 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-) +# railway-rail-bridge::dash # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-service::dash # line::dash z16- (also has line z15-) +# railway-rail-service-bridge::dash # line::dash z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-) +# railway-rail-service-tunnel::dash # line::dash z16- (also has line(casing) z15-, line z15-) +# railway-rail-spur::dash # line::dash z16- (also has line z14-) +# railway-rail-spur-bridge::dash # line::dash z16- (also has line z14-, line::bridgeblack z16-, line::bridgewhite z14-) +# railway-rail-spur-tunnel::dash # line::dash z16- (also has line(casing) z14-, line z14-) +# railway-rail-tunnel::dash # line::dash z15- (also has line z10-, line(casing) z14-) +# railway-rail-utility::dash # line::dash z16- (also has line z12-) +# railway-rail-utility-bridge::dash # line::dash z16- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z13-) +# railway-rail-utility-tunnel::dash # line::dash z16- (also has line z12-, line(casing) z14-) +# railway-subway::dash # line::dash z16- (also has line z13-) +# railway-subway-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) +# === 221 highway-footway-bicycle # line z11- (also has line::border z12-, line::cycleline z13-, pathtext z13-) highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) @@ -237,28 +242,28 @@ highway-footway-bicycle::cycleline # line::cycleline z13- (also highway-path-bicycle::cycleline # line::cycleline z12- (also has line z11-, pathtext z13-) === 219 -highway-cycleway # line z11- (also has pathtext z13-) -highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -=== 218 - -railway-light_rail # line z13- (also has line::dash z16-) -railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) -railway-rail # line z10- (also has line::dash z15-) -railway-rail-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) -railway-rail-service # line z15- (also has line::dash z16-) -railway-rail-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-) -railway-rail-service-tunnel # line z15- (also has line(casing) z15-, line::dash z16-) -railway-rail-spur # line z14- (also has line::dash z16-) -railway-rail-spur-bridge # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) -railway-rail-spur-tunnel # line z14- (also has line(casing) z14-, line::dash z16-) -railway-rail-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) -railway-rail-utility # line z12- (also has line::dash z16-) -railway-rail-utility-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) -railway-rail-utility-tunnel # line z12- (also has line::dash z16-, line(casing) z14-) -railway-subway # line z13- (also has line::dash z16-) -railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) -=== 210 +# highway-cycleway # line z11- (also has pathtext z13-) +# highway-cycleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) +# highway-cycleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) +# === 218 + +# railway-light_rail # line z13- (also has line::dash z16-) +# railway-light_rail-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail # line z10- (also has line::dash z15-) +# railway-rail-bridge # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-service # line z15- (also has line::dash z16-) +# railway-rail-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z16-) +# railway-rail-service-tunnel # line z15- (also has line(casing) z15-, line::dash z16-) +# railway-rail-spur # line z14- (also has line::dash z16-) +# railway-rail-spur-bridge # line z14- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) +# railway-rail-spur-tunnel # line z14- (also has line(casing) z14-, line::dash z16-) +# railway-rail-tunnel # line z10- (also has line::dash z15-, line(casing) z14-) +# railway-rail-utility # line z12- (also has line::dash z16-) +# railway-rail-utility-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# railway-rail-utility-tunnel # line z12- (also has line::dash z16-, line(casing) z14-) +# railway-subway # line z13- (also has line::dash z16-) +# railway-subway-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) +# === 210 # railway-rail-service-tunnel # line(casing) z15- (also has line z15-, line::dash z16-) # railway-rail-spur-tunnel # line(casing) z14- (also has line z14-, line::dash z16-) @@ -266,13 +271,13 @@ 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-) -=== 200 +# highway-ford # line z13- (also has line::border z14-, icon z14-, pathtext z16-) +# highway-pedestrian # line z13- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-area # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-bridge # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) +# highway-pedestrian-square # line z13- and area z14- (also has line::border z14-, pathtext z14-) +# highway-pedestrian-tunnel # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-) +# === 200 # highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-) # === 199 @@ -294,21 +299,21 @@ highway-track-no-access # line z11- (also has pathte highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 190 -highway-construction # line z11- (also has pathtext z15-) -leisure-track # line z15- (also has caption z16-) -railway-abandoned # line z13- -railway-construction # line z13- -railway-disused # line z13- -railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) -railway-disused-tunnel # line z13- -railway-miniature # line z13- -railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) -railway-miniature-tunnel # line z13- -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 +# highway-construction # line z11- (also has pathtext z15-) +# leisure-track # line z15- (also has caption z16-) +# railway-abandoned # line z13- +# railway-construction # line z13- +# railway-disused # line z13- +# railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-disused-tunnel # line z13- +# railway-miniature # line z13- +# railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +# railway-miniature-tunnel # line z13- +# 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 highway-footway-bridge # line z11- (also has line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-footway-sidewalk # line z13- (also has line::border z16-) @@ -334,81 +339,81 @@ highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (a highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) === 168 -highway-motorway::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) -highway-trunk::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) -=== 163 +# highway-motorway::border # line::border z10- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk::border # line::border z10- (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-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-secondary::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z12-) +# === 161 -highway-motorway_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) -highway-trunk_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) -=== 160 +# highway-motorway_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# highway-trunk_link::border # line::border z10- (also has line z10-, pathtext z10-, shield::shield z10-) +# === 160 -highway-primary_link::border # line::border z11- (also has line z11-, pathtext z11-, shield::shield z11-) -=== 159 +# highway-primary_link::border # line::border z11- (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-secondary_link::border # line::border z13- (also has line z13-, pathtext z16-) +# === 158 -highway-motorway-bridge::border # line::border z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge::border # line::border z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -=== 157 +# highway-motorway-bridge::border # line::border z10- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge::border # line::border z10- (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-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-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 z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -=== 154 +# highway-motorway_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-bridge::border # line::border z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) +# === 154 -highway-primary_link-bridge::border # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -=== 153 +# highway-primary_link-bridge::border # line::border z11- (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-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 z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel::border # line::border z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) -=== 151 +# highway-motorway-tunnel::border # line::border z10- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel::border # line::border z10- (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-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-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 z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) -=== 148 +# highway-motorway_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# highway-trunk_link-tunnel::border # line::border z10- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-) +# === 148 -highway-primary_link-tunnel::border # line::border z11- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-) -=== 147 +# highway-primary_link-tunnel::border # line::border z11- (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-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 z12- (also has line z12-, pathtext z14-) -highway-residential::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) -highway-residential-area::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) -highway-road::border # line::border z12- (also has line z12-, pathtext z14-) -highway-service::border # line::border z13- (also has line z13-, pathtext z16-) -highway-service-area::border # line::border z13- (also has line z13-, pathtext z16-) -highway-service-driveway::border # line::border z15- (also has line z15-, 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 z11- (also has line z11-, pathtext z13-) -highway-unclassified-area::border # line::border z11- (also has line z11-, pathtext z13-) -=== 145 +# highway-busway::border # line::border z15- (also has line z15-, pathtext z16-) +# highway-living_street::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-residential::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-residential-area::border # line::border z12- (also has line z12-, pathtext z13-, shield::shield z15-) +# highway-road::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-area::border # line::border z13- (also has line z13-, pathtext z16-) +# highway-service-driveway::border # line::border z15- (also has line z15-, 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 z11- (also has line z11-, pathtext z13-) +# highway-unclassified-area::border # line::border z11- (also has line z11-, pathtext z13-) +# === 145 highway-footway::border # line::border z16- (also has line z11-, pathtext z13-) highway-footway-area::border # line::border z16- (also has line z11-, area z14-, pathtext z13-) @@ -423,29 +428,29 @@ highway-pedestrian-square::border # line::border z14- (also ha highway-steps::border # line::border z16- (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 z12- (also has line z12-, pathtext z14-) -highway-residential-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) -highway-service-bridge::border # line::border z13- (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 z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) -=== 143 +# 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 z12- (also has line z12-, pathtext z14-) +# highway-residential-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) +# highway-road-bridge::border # line::border z12- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) +# highway-service-bridge::border # line::border z13- (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 z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) +# === 143 highway-footway-bridge::border # line::border z16- (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 z16- (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 z12- (also has line z12-, line(casing) z16-, pathtext z14-) -highway-residential-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) -highway-road-tunnel::border # line::border z12- (also has line z12-, pathtext z14-) -highway-service-tunnel::border # line::border z13- (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 z11- (also has line z11-, line(casing) z16-, pathtext z13-) -=== 141 +# highway-busway-tunnel::border # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-) +# highway-living_street-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z14-) +# highway-residential-tunnel::border # line::border z12- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-) +# highway-road-tunnel::border # line::border z12- (also has line z12-, pathtext z14-) +# highway-service-tunnel::border # line::border z13- (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 z11- (also has line z11-, line(casing) z16-, pathtext z13-) +# === 141 highway-footway-tunnel::border # line::border z16- (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-) @@ -526,84 +531,86 @@ railway-rail-utility-bridge::bridgeblack # line::bridgeblack z16- (al railway-subway-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) === 130 -building # area z14- (also has caption z17-) -building-garage # area z14- (also has caption z17-) -building-guardhouse # area z14- (also has icon z16-, caption(optional) z18-) -building-has_parts # area z14- (also has caption z17-) -building-train_station # area z14- (also has icon z17-, caption(optional) z17-) -=== 120 - -piste:type-connection # line z15- -piste:type-downhill # line z12- (also has pathtext z15-) -piste:type-downhill-advanced # line z12- (also has pathtext z15-) -piste:type-downhill-easy # line z12- (also has pathtext z15-) -piste:type-downhill-expert # line z12- (also has pathtext z15-) -piste:type-downhill-freeride # line z12- (also has pathtext z15-) -piste:type-downhill-intermediate # line z12- (also has pathtext z15-) -piste:type-downhill-novice # line z12- (also has pathtext z15-) -piste:type-hike # line z12- (also has pathtext z13-) -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 - -building:part # area z16- -=== 100 - -barrier-retaining_wall # line z16- -man_made-embankment # line z16- (also has pathtext z18-) -natural-cliff # line z12- (also has pathtext z14-) -natural-earth_bank # line z12- -=== 90 - -boundary-administrative-2 # line z2- -boundary-administrative-3 # line z4 -boundary-administrative-4 # line z5- -=== 80 - -man_made-cutline # line z13- -route-ferry # line z7- (also has pathtext z10-) -=== 70 - -aeroway-runway # line z12- -aeroway-taxiway # line z14- -barrier-ditch # line z15- -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 - -man_made-breakwater # line z14- and area z12- (also has caption z17-) -man_made-pier # line z14- and area z12- (also has caption z17-) -waterway-dam # line z14- and area z14- (also has pathtext z15-) -=== 30 - -landuse-military # area z12- (also has icon z16-, caption(optional) z17-) -landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) -=== 25 - -amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) -boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) -boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) -boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) -leisure-nature_reserve # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) -=== 20 - -piste:type-downhill-advanced-area # area z13- -piste:type-downhill-area # area z13- -piste:type-downhill-easy-area # area z13- -piste:type-downhill-expert-area # area z13- -piste:type-downhill-intermediate-area # area z13- -piste:type-downhill-novice-area # area z13- -piste:type-sled-area # area z13- -piste:type-snow_park # area z13- (also has caption z15-) -=== 15 - -man_made-bridge # area z14- -=== 10 - -natural-tree_row # line z15- -=== 5 +# 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 + +# piste:type-connection # line z15- +# piste:type-downhill # line z12- (also has pathtext z15-) +# piste:type-downhill-advanced # line z12- (also has pathtext z15-) +# piste:type-downhill-easy # line z12- (also has pathtext z15-) +# piste:type-downhill-expert # line z12- (also has pathtext z15-) +# piste:type-downhill-freeride # line z12- (also has pathtext z15-) +# piste:type-downhill-intermediate # line z12- (also has pathtext z15-) +# piste:type-downhill-novice # line z12- (also has pathtext z15-) +# piste:type-hike # line z12- (also has pathtext z13-) +# 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 + +# building:part # area z16- +# === 100 + +# barrier-retaining_wall # line z16- +# man_made-embankment # line z16- (also has pathtext z18-) +# natural-cliff # line z12- (also has pathtext z14-) +# natural-earth_bank # line z12- +# === 90 + +# boundary-administrative-2 # line z2- +# boundary-administrative-3 # line z4 +# boundary-administrative-4 # line z5- +# === 80 + +# man_made-cutline # line z13- +# route-ferry # line z7- (also has pathtext z10-) +# === 70 + +# aeroway-runway # line z12- +# aeroway-taxiway # line z14- +# barrier-ditch # line z15- +# === 60 + +# 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 + +# man_made-breakwater # line z14- and area z12- (also has caption z17-) +# man_made-pier # line z14- and area z12- (also has caption z17-) +# waterway-dam # line z14- and area z14- (also has pathtext z15-) +# === 30 + +# landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +# landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +# === 25 + +# amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) +# boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +# boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +# leisure-nature_reserve # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) +# === 20 + +# piste:type-downhill-advanced-area # area z13- +# piste:type-downhill-area # area z13- +# piste:type-downhill-easy-area # area z13- +# piste:type-downhill-expert-area # area z13- +# piste:type-downhill-intermediate-area # area z13- +# piste:type-downhill-novice-area # area z13- +# piste:type-sled-area # area z13- +# piste:type-snow_park # area z13- (also has caption z15-) +# === 15 + +# man_made-bridge # area z14- +# === 10 + +# natural-tree_row # line z15- +# === 5 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/walking_outdoor/include/priorities_4_overlays.prio.txt similarity index 62% rename from data/styles/outdoors/include/priorities_4_overlays.prio.txt rename to data/styles/walking_outdoor/include/priorities_4_overlays.prio.txt index 1785479cc..01ebc7229 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/walking_outdoor/include/priorities_4_overlays.prio.txt @@ -1,3 +1,5 @@ +# Only have changes of the base priority file here! + # This file is automatically re-formatted and re-sorted in priorities descending order # when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) # are generated automatically for information only. Custom formatting and comments are not preserved. @@ -13,1410 +15,1413 @@ # - BG-top: water (linear and areal) # - BG-by-size: landcover areas sorted by their size -place-continent # caption z1-2 -=== 7700 +@import("../../walking/include/priorities_4_overlays.prio.txt") +@import("../../outdoor/include/priorities_4_overlays.prio.txt") + +# place-continent # caption z1-2 +# === 7700 -place-ocean # caption z1- -=== 7650 +# place-ocean # caption z1- +# === 7650 -place-country # caption z3- -=== 7600 +# place-country # caption z3- +# === 7600 -place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) +# place-city-capital-2 # icon z4- (also has caption(mandatory) z4-) # place-city-capital-2 # caption(mandatory) z4- (also has icon z4-) -=== 7550 - -place-city-capital-3 # caption z4- -place-city-capital-4 # caption z4- -=== 7500 - -place-sea # caption z4- -=== 7450 - -place-city-capital # caption z4- -place-city-capital-10 # caption z4- -place-city-capital-11 # caption z4- -place-city-capital-5 # caption z4- -place-city-capital-6 # caption z4- -place-city-capital-7 # caption z4- -place-city-capital-8 # caption z4- -place-city-capital-9 # caption z4- -=== 7400 - -place-city # caption z4- -=== 7350 - -place-state-USA # caption z5-10 -=== 7300 - -place-state # caption z6-10 -=== 7250 - -aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) -=== 7200 - -place-island # caption z9- -=== 7150 - -place-town # caption z8- -=== 7100 - -place-suburb # caption z10-14 -=== 7050 - -railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) -railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) -=== 7000 - -aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) -=== 6950 - -place-village # caption z11- -=== 6900 - -amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) -railway-station # icon z12- (also has caption(optional) z12-) -=== 6800 - -highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) -=== 6750 - -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) -=== 6740 - -boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) -boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) -boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) -boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-5 # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-6 # icon z10-17 (also has caption(optional) z11-17) -leisure-nature_reserve # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17) -=== 6700 - -landuse-reservoir # caption z10- (also has area z12-) -natural-water-lake # caption z10- (also has area z1-) -natural-water-reservoir # caption z10- (also has area z1-) -=== 6650 - -barrier-toll_booth # icon z16- (also has caption(optional) z16-) -=== 6600 - -historic-ruins # icon z17- (also has caption(optional) z17-) -=== 6551 - -historic-castle # icon z12- (also has caption(optional) z12-) -historic-castle-castrum # icon z12- (also has caption(optional) z12-) -historic-castle-defensive # icon z12- (also has caption(optional) z12-) -historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) -historic-castle-fortress # icon z12- (also has caption(optional) z12-) -historic-castle-hillfort # icon z12- (also has caption(optional) z12-) -historic-castle-kremlin # icon z12- (also has caption(optional) z12-) -historic-castle-manor # icon z12- (also has caption(optional) z12-) -historic-castle-palace # icon z12- (also has caption(optional) z12-) -historic-castle-shiro # icon z12- (also has caption(optional) z12-) -historic-castle-stately # icon z12- (also has caption(optional) z12-) -historic-fort # icon z12- (also has caption(optional) z12-) -=== 6550 - -aerialway-station # icon z12- (also has caption(optional) z15-) -=== 6500 - -amenity-bus_station # icon z13- (also has caption(optional) z14-) -=== 6350 - -railway-station-funicular # icon z12- (also has caption(optional) z12-) -railway-station-light_rail # icon z13- (also has caption(optional) z14-) -railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) -railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) -railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) -railway-station-monorail # icon z13- (also has caption(optional) z14-) -railway-station-subway # icon z13- (also has caption(optional) z14-) -railway-station-subway-adana # icon z12- (also has caption(optional) z14-) -railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) -railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) -railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) -railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) -railway-station-subway-athens # icon z13- (also has caption(optional) z14-) -railway-station-subway-baku # icon z13- (also has caption(optional) z14-) -railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) -railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) -railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) -railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) -railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) -railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) -railway-station-subway-boston # icon z12- (also has caption(optional) z14-) -railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) -railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) -railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) -railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) -railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) -railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) -railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) -railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) -railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) -railway-station-subway-catania # icon z13- (also has caption(optional) z14-) -railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) -railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) -railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) -railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) -railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) -railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) -railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) -railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) -railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) -railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) -railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) -railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) -railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) -railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) -railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) -railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) -railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) -railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) -railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) -railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) -railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) -railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) -railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) -railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) -railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) -railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) -railway-station-subway-la # icon z12- (also has caption(optional) z14-) -railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) -railway-station-subway-lille # icon z13- (also has caption(optional) z14-) -railway-station-subway-lima # icon z13- (also has caption(optional) z14-) -railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) -railway-station-subway-london # icon z12- (also has caption(optional) z14-) -railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) -railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) -railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) -railway-station-subway-manila # icon z13- (also has caption(optional) z14-) -railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) -railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) -railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) -railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) -railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) -railway-station-subway-milan # icon z13- (also has caption(optional) z14-) -railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) -railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) -railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) -railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) -railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) -railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) -railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) -railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) -railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) -railway-station-subway-palma # icon z13- (also has caption(optional) z14-) -railway-station-subway-panama # icon z13- (also has caption(optional) z14-) -railway-station-subway-paris # icon z12- (also has caption(optional) z14-) -railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) -railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) -railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) -railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) -railway-station-subway-rio # icon z13- (also has caption(optional) z14-) -railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) -railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) -railway-station-subway-samara # icon z13- (also has caption(optional) z14-) -railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) -railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) -railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) -railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) -railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) -railway-station-subway-sf # icon z12- (also has caption(optional) z14-) -railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) -railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) -railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) -railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) -railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) -railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) -railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) -railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) -railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) -railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) -railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) -railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) -railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) -railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) -railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) -railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) -railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) -railway-station-subway-washington # icon z13- (also has caption(optional) z14-) -railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) -railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) -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-) -route-ferry # pathtext z10- (also has line z7-) -=== 6200 - -highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) -highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) -highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) -highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) -=== 6150 - -highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) -highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) -highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) -highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) -=== 6140 - -highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-) -highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line(casing) z14-) -=== 6100 - -barrier-border_control # icon z12- (also has caption(optional) z14-) -railway-halt # icon z13- (also has caption(optional) z13-) -tourism-alpine_hut # icon z11- (also has caption(optional) z11-) -waterway-waterfall # icon z10- (also has caption(optional) z11-) -=== 5800 - -place-hamlet # caption z13- -place-quarter # caption z13- -=== 5750 - -place-farm # caption z14- -place-isolated_dwelling # caption z14- -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-) -=== 5600 - -man_made-communications_tower # icon z12- (also has caption(optional) z13-) -man_made-lighthouse # icon z11- (also has caption(optional) z14-) -natural-peak # icon z10- (also has caption(optional) z11-) -natural-volcano # icon z10- (also has caption(optional) z13-) -=== 5400 - -amenity-theatre # icon z14- (also has caption(optional) z14-) -historic-battlefield # icon z15- (also has caption(optional) z15-) -historic-city_gate # icon z13- (also has caption(optional) z13-) -historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) -leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) -shop-mall # icon z14- (also has caption(optional) z14-) -tourism-aquarium # icon z16- (also has caption(optional) z16-) -tourism-museum # icon z13- (also has caption(optional) z13-) -tourism-theme_park # icon z14- (also has caption(optional) z14-) -tourism-zoo # icon z13- (also has caption(optional) z13-) -=== 5200 - -amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) -amenity-university # icon z14- (also has caption(optional) z14-, area z13-) -leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) -=== 5100 - -leisure-marina # icon z16- (also has caption(optional) z16-) -leisure-park # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-permissive # icon z14- (also has caption(optional) z14-, area z10-) -mountain_pass # icon z11- (also has caption(optional) z12-) -place-square # caption z16- -=== 5050 - -tourism-viewpoint # icon z11- (also has caption(optional) z13-) -=== 4950 - -landuse-forest # icon z12- (also has caption(optional) z13-, area z10-) -landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-) -landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-) -landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-) -=== 4800 - -natural-cave_entrance # icon z10- (also has caption(optional) z11-) -natural-geyser # icon z10- (also has caption(optional) z12-) -natural-hot_spring # icon z12- (also has caption(optional) z15-) -natural-spring # icon z12- (also has caption(optional) z14-) -=== 4650 - -natural-saddle # icon z13- (also has caption(optional) z15-) -place-islet # caption z14- (also has area z10-) -=== 4500 - -railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) -railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) -=== 4450 - -amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) -historic-monument # icon z13- (also has caption(optional) z13-) -tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) -tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) -=== 4400 - -amenity-community_centre # icon z15- (also has caption(optional) z15-) -amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) -amenity-conference_centre # icon z16- (also has caption(optional) z16-) -amenity-events_venue # icon z16- (also has caption(optional) z16-) -amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) -tourism-attraction # icon z14- (also has caption(optional) z14-) -tourism-gallery # icon z15- (also has caption(optional) z15-) -=== 4300 - -amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-) -=== 4280 - -amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-) -amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-) -waterway-fuel # icon z16- (also has caption(optional) z16-) -=== 4270 - -highway-services # icon z14- (also has caption(optional) z14-, area z13-) -=== 4250 - -amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) -amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) -=== 4200 - -amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) -historic-memorial # icon z15- (also has caption(optional) z15-) -=== 4150 - -amenity-cafe # icon z15- (also has caption(optional) z15-) -amenity-restaurant # icon z15- (also has caption(optional) z15-) -=== 4100 - -amenity-fast_food # icon z15- (also has caption(optional) z15-) -amenity-food_court # icon z15- (also has caption(optional) z15-) -=== 4050 - -amenity-bar # icon z15- (also has caption(optional) z15-) -=== 4000 - -amenity-biergarten # icon z15- (also has caption(optional) z15-) -amenity-pub # icon z15- (also has caption(optional) z15-) -=== 3950 - -amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) -amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) -emergency-mountain_rescue # icon z12- (also has caption(optional) z12-, area z13-) -tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) -=== 3900 - -highway-rest_area # icon z14- (also has caption(optional) z15-, area z13-) -tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) -tourism-caravan_site # icon z13- (also has caption(optional) z13-) -tourism-chalet # icon z14- (also has caption(optional) z14-) -=== 3850 - -shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) -=== 3800 - -amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-) -=== 3752 - -amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-) -=== 3751 - -amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-) -=== 3750 - -amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-) -=== 3749 - -railway-subway_entrance # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) -railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) -=== 3700 - -railway-tram_stop # icon z14- (also has caption(optional) z17-) -=== 3650 - -highway-bus_stop # icon z15- (also has caption(optional) z17-) -=== 3600 - -amenity-drinking_water # icon z12- (also has caption(optional) z14-) -=== 3500 - -isoline-step_1000 # pathtext z10- (also has line z10-) -=== 3400 - -isoline-step_500 # pathtext z11- (also has line z10-) -=== 3350 - -aeroway-terminal # caption z15- (also has area z14-) -highway-motorway_junction # caption z15- -leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) -=== 3300 - -natural-bare_rock # caption z13- (also has area z11-) -natural-bay # caption z14- -natural-beach # caption z14- (also has area z10-) -natural-beach-gravel # caption z14- (also has area z10-) -natural-beach-sand # caption z14- (also has area z10-) -natural-cape # caption z14- -natural-desert # caption z14- (also has area z1-) -natural-sand # caption z15- (also has area z1-) -=== 3250 - -shop-supermarket # icon z16- (also has caption(optional) z16-) -=== 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-) -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-) -natural-water-river # caption z10- (also has area z1-) -railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z15-) -railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) -railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z15-, line(casing) z14-) -waterway-dam # pathtext z15- (also has line z14-, area z14-) -waterway-river # pathtext z11- (also has line z10-) -=== 3150 - -highway-unclassified # pathtext z13- (also has line z11-, line::border z11-) -highway-unclassified-area # pathtext z13- (also has line z11-, line::border z11-) -highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z11-, line(casing) z16-) -=== 3100 - -amenity-water_point # icon z12- (also has caption(optional) z14-) -highway-raceway # pathtext z16- (also has line z14-) -historic-aircraft # icon z16- (also has caption(optional) z16-) -historic-locomotive # icon z16- (also has caption(optional) z16-) -historic-mine # icon z15- (also has caption(optional) z15-) -historic-ship # icon z15- (also has caption(optional) z15-) -historic-tank # icon z16- (also has caption(optional) z16-) -historic-wreck # icon z16- (also has caption(optional) z16-) -landuse-allotments # caption z15- (also has area z12-) -landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) -landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) -man_made-water_tap # icon z12- (also has caption(optional) z14-) -man_made-water_well # icon z12- (also has caption(optional) z14-) -man_made-windmill # icon z16- (also has caption(optional) z16-) -=== 3050 - -isoline-step_100 # pathtext z13- (also has line z11-) -=== 3020 - -aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) -aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) -aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) -aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) -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 z12-) -highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-) -highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line(casing) z16-) -highway-road # pathtext z14- (also has line z12-, line::border z12-) -highway-road-bridge # pathtext z14- (also has line z12-, line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-) -highway-road-tunnel # pathtext z14- (also has line z12-, line::border z12-) -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-) -=== 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-) -=== 2975 - -highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-) -highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-) -=== 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-) -=== 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 z12-) -highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-) -highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line(casing) z16-) -=== 2955 - -highway-cycleway # pathtext z13- (also has line z11-) -highway-cycleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-cycleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -=== 2953 - -area:highway-footway # caption z15- (also has area z14-) -highway-footway # pathtext z13- (also has line z11-, line::border z16-) -highway-footway-area # pathtext z13- (also has line z11-, line::border z16-, area z14-) -highway-footway-bicycle # pathtext z13- (also has line z11-, line::border z12-, line::cycleline z13-) -highway-footway-bridge # pathtext z13- (also has line z11-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z13- (also has line z11-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) -highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) -=== 2950 - -natural-water-basin # caption z10- (also has area z1-) -natural-water-ditch # caption z17- (also has area z13-) -natural-water-drain # caption z17- (also has area z13-) -natural-water-lock # caption z10- (also has area z1-) -natural-water-moat # caption z17- (also has area z1-) -natural-water-wastewater # caption z17- (also has area z12-) -waterway-canal # pathtext z13- (also has line z12-) -waterway-fish_pass # pathtext z13- (also has line z13-) -waterway-stream # pathtext z13- (also has line z12-) -waterway-stream-ephemeral # pathtext z13- (also has line z13-) -waterway-stream-intermittent # pathtext z13- (also has line z13-) -waterway-weir # pathtext z15- (also has line z14-) -=== 2900 - -highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) -natural-rock # icon z14- (also has caption(optional) z17-) -=== 2850 - -highway-bridleway # pathtext z13- (also has line z11-) -highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-path # pathtext z13- (also has line z11-) -highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z12-) -highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-path-difficult # pathtext z13- (also has line z11-) -highway-path-expert # pathtext z13- (also has line z11-) -highway-path-horse # pathtext z13- (also has line z11-) -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 z16-) -highway-steps-bridge # pathtext z13- (also has line z12-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-steps-tunnel # pathtext z13- (also has line z12-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) -=== 2810 - -highway-track # pathtext z13- (also has line z11-) -highway-track-area # pathtext z13- (also has line z11-) -highway-track-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-track-no-access # pathtext z13- (also has line z11-) -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 z13-) -highway-service-area # pathtext z16- (also has line z13-, line::border z13-) -highway-service-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-service-driveway # pathtext z16- (also has line z15-, line::border z15-) -highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) -highway-service-tunnel # pathtext z16- (also has line z13-, line::border 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-) -piste:type-downhill-expert # pathtext z15- (also has line z12-) -piste:type-downhill-freeride # pathtext z15- (also has line z12-) -piste:type-downhill-intermediate # pathtext z15- (also has line z12-) -piste:type-downhill-novice # pathtext z15- (also has line z12-) -piste:type-hike # pathtext z13- (also has line z12-) -piste:type-nordic # pathtext z13- (also has line z12-) -piste:type-skitour # pathtext z13- (also has line z12-) -piste:type-sled # pathtext z15- (also has line z12-) -piste:type-snow_park # caption z15- (also has area z13-) -=== 2770 - -amenity-townhall # icon z15- (also has caption(optional) z15-) -leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) -tourism-hotel # icon z16- (also has caption(optional) z16-) -=== 2750 - -amenity-arts_centre # icon z17- (also has caption(optional) z17-) -amenity-bank # icon z16- (also has caption(optional) z16-) -amenity-library # icon z17- (also has caption(optional) z17-) -amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) -amenity-pharmacy # icon z16- (also has caption(optional) z17-) -shop-convenience # icon z16- (also has caption(optional) z16-) -shop-deli # icon z16- (also has caption(optional) z16-) -shop-farm # icon z16- (also has caption(optional) z16-) -shop-greengrocer # icon z16- (also has caption(optional) z16-) -shop-grocery # icon z16- (also has caption(optional) z16-) -shop-health_food # icon z16- (also has caption(optional) z16-) -=== 2700 - -amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) -amenity-boat_rental # icon z17- (also has caption(optional) z17-) -amenity-car_sharing # icon z18- (also has caption(optional) z18-) -amenity-taxi # icon z16- (also has caption(optional) z16-) -=== 2600 - -historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) -historic-memorial-statue # icon z15- (also has caption(optional) z15-) -tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) -tourism-artwork-statue # icon z15- (also has caption(optional) z15-) -=== 2590 - -tourism-motel # icon z16- (also has caption(optional) z16-) -=== 2580 - -tourism-apartment # icon z16- (also has caption(optional) z16-) -tourism-guest_house # icon z16- (also has caption(optional) z16-) -tourism-hostel # icon z16- (also has caption(optional) z16-) -=== 2570 - -amenity-ice_cream # icon z16- (also has caption(optional) z17-) -shop-bakery # icon z16- (also has caption(optional) z16-) -shop-butcher # icon z16- (also has caption(optional) z16-) -shop-cheese # icon z16- (also has caption(optional) z16-) -shop-chocolate # icon z16- (also has caption(optional) z16-) -shop-confectionery # icon z16- (also has caption(optional) z16-) -shop-pasta # icon z16- (also has caption(optional) z16-) -shop-pastry # icon z16- (also has caption(optional) z16-) -shop-seafood # icon z16- (also has caption(optional) z16-) -shop-water # icon z16- (also has caption(optional) z16-) -=== 2550 - -aeroway-helipad # icon z16- (also has caption(optional) z16-) -amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) -amenity-car_rental # icon z18- (also has caption(optional) z18-) -amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) -=== 2500 - -amenity-cinema # icon z17- (also has caption(optional) z17-) -amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) -amenity-nightclub # icon z16- (also has caption(optional) z16-) -amenity-post_office # icon z17- (also has caption(optional) z17-) -attraction # icon z16- (also has caption(optional) z16-) -attraction-amusement_ride # icon z16- (also has caption(optional) z16-) -attraction-animal # icon z16- (also has caption(optional) z16-) -attraction-big_wheel # icon z16- (also has caption(optional) z16-) -attraction-bumper_car # icon z16- (also has caption(optional) z16-) -attraction-carousel # icon z16- (also has caption(optional) z16-) -attraction-historic # icon z16- (also has caption(optional) z16-) -attraction-maze # icon z16- (also has caption(optional) z16-) -attraction-roller_coaster # icon z16- (also has caption(optional) z16-) -attraction-water_slide # 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 z12-) -highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z12-) -highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border 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-) -leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) -office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) -tourism-zoo-petting # icon z15- (also has caption(optional) z15-) -=== 2450 - -amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) -amenity-public_bath # icon z17- (also has caption(optional) z17-) -amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) -craft-brewery # icon z17- (also has caption(optional) z18-) -craft-confectionery # icon z17- (also has caption(optional) z18-) -craft-winery # icon z17- (also has caption(optional) z18-) -shop-alcohol # icon z16- (also has caption(optional) z16-) -shop-antiques # icon z16- (also has caption(optional) z16-) -shop-appliance # icon z18- (also has caption(optional) z18-) -shop-baby_goods # icon z18- (also has caption(optional) z18-) -shop-beauty # icon z16- (also has caption(optional) z16-) -shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) -shop-beauty-nails # icon z16- (also has caption(optional) z16-) -shop-beverages # icon z16- (also has caption(optional) z16-) -shop-boutique # icon z18- (also has caption(optional) z18-) -shop-car_repair # icon z16- (also has caption(optional) z16-) -shop-caravan # icon z16- (also has caption(optional) z16-) -shop-charity # icon z16- (also has caption(optional) z16-) -shop-chemist # icon z16- (also has caption(optional) z16-) -shop-clothes # icon z16- (also has caption(optional) z16-) -shop-computer # icon z16- (also has caption(optional) z16-) -shop-cosmetics # icon z16- (also has caption(optional) z16-) -shop-dairy # icon z18- (also has caption(optional) z18-) -shop-department_store # icon z16- (also has caption(optional) z16-) -shop-electronics # icon z16- (also has caption(optional) z16-) -shop-fashion_accessories # icon z18- (also has caption(optional) z18-) -shop-florist # icon z16- (also has caption(optional) z16-) -shop-hairdresser # icon z16- (also has caption(optional) z16-) -shop-laundry # icon z16- (also has caption(optional) z16-) -shop-mobile_phone # icon z16- (also has caption(optional) z16-) -shop-newsagent # icon z17- (also has caption(optional) z18-) -shop-second_hand # icon z16- (also has caption(optional) z16-) -shop-shoes # icon z16- (also has caption(optional) z16-) -shop-sports # icon z16- (also has caption(optional) z16-) -shop-stationery # icon z16- (also has caption(optional) z16-) -shop-tea # icon z18- (also has caption(optional) z18-) -shop-telecommunication # icon z16- (also has caption(optional) z16-) -shop-toys # icon z16- (also has caption(optional) z16-) -shop-travel_agency # icon z18- (also has caption(optional) z18-) -shop-wine # icon z16- (also has caption(optional) z16-) -=== 2400 - -amenity-hunting_stand # icon z14- (also has caption(optional) z15-) -barrier-block # icon z16- (also has caption(optional) z16-) -barrier-bollard # icon z16- (also has caption(optional) z16-) -barrier-chain # icon z16- (also has caption(optional) z16-) -barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) -barrier-gate # icon z16- (also has caption(optional) z16-) -barrier-kissing_gate # icon z16- (also has caption(optional) z16-) -barrier-lift_gate # icon z16- (also has caption(optional) z16-) -barrier-stile # icon z16- (also has caption(optional) z16-) -barrier-swing_gate # icon z16- (also has caption(optional) z16-) -barrier-turnstile # icon z16- (also has caption(optional) z16-) -barrier-wicket_gate # icon z17- (also has caption(optional) z17-) -barrier-yes # icon z16- (also has caption(optional) z16-, line z15-) -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-) -=== 2250 - -amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) -amenity-college # icon z16- (also has caption(optional) z16-, area z13-) -amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) -amenity-dentist # icon z17- (also has caption(optional) z17-) -landuse-military # icon z16- (also has caption(optional) z17-, area z12-) -landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) -=== 2000 - -amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) -leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) -leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) -natural-wetland # caption z16- (also has area z11-) -natural-wetland-bog # caption z16- (also has area z11-) -natural-wetland-fen # caption z16- (also has area z11-) -natural-wetland-mangrove # caption z16- (also has area z11-) -natural-wetland-marsh # caption z16- (also has area z11-) -natural-wetland-reedbed # caption z16- (also has area z11-) -natural-wetland-saltmarsh # caption z16- (also has area z11-) -natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) -natural-wetland-swamp # caption z16- (also has area z11-) -natural-wetland-tidalflat # caption z16- (also has area z11-) -tourism-picnic_site # icon z14- (also has caption(optional) z14-) -=== 1800 - -building-train_station # icon z17- (also has caption(optional) z17-, area z14-) -railway-level_crossing # icon z17- -=== 1700 - -railway-platform # caption z16- (also has area z16-) -=== 1650 - -leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) -=== 1620 - -leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) -leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) -=== 1610 - -amenity-animal_shelter # icon z17- (also has caption(optional) z17-) -amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) -amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) -amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) -amenity-driving_school # icon z17- (also has caption(optional) z17-) -amenity-flight_school # icon z17- (also has caption(optional) z17-) -amenity-language_school # icon z17- (also has caption(optional) z17-) -amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) -amenity-money_transfer # icon z17- (also has caption(optional) z18-) -amenity-music_school # icon z17- (also has caption(optional) z17-) -amenity-payment_centre # icon z17- (also has caption(optional) z18-) -amenity-prep_school # icon z17- (also has caption(optional) z17-) -amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) -amenity-sailing_school # icon z17- (also has caption(optional) z17-) -amenity-veterinary # icon z16- (also has caption(optional) z16-) -craft-electrician # icon z17- (also has caption(optional) z18-) -craft-electronics_repair # icon z17- (also has caption(optional) z18-) -craft-photographer # icon z17- (also has caption(optional) z18-) -craft-plumber # icon z17- (also has caption(optional) z18-) -craft-shoemaker # icon z17- (also has caption(optional) z18-) -craft-tailor # icon z17- (also has caption(optional) z18-) -healthcare-blood_donation # icon z17- (also has caption(optional) z17-) -healthcare-laboratory # icon z17- (also has caption(optional) z17-) -healthcare-optometrist # icon z17- (also has caption(optional) z17-) -healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) -healthcare-sample_collection # icon z17- (also has caption(optional) z17-) -leisure-escape_game # icon z17- (also has caption(optional) z17-) -leisure-fitness_centre # icon z16- (also has caption(optional) z17-) -leisure-hackerspace # icon z17- (also has caption(optional) z17-) -leisure-sauna # icon z17- (also has caption(optional) z17-) -man_made-observatory # icon z15- (also has caption(optional) z16-) -office-estate_agent # icon z18- (also has caption(optional) z18-) -office-government # icon z18- (also has caption(optional) z18-) -office-insurance # icon z18- (also has caption(optional) z18-) -office-lawyer # icon z17- (also has caption(optional) z17-) -shop-art # icon z16- (also has caption(optional) z16-) -shop-bag # icon z18- (also has caption(optional) z18-) -shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) -shop-bed # icon z18- (also has caption(optional) z18-) -shop-bicycle # icon z16- (also has caption(optional) z16-) -shop-books # icon z16- (also has caption(optional) z16-) -shop-camera # icon z16- (also has caption(optional) z16-) -shop-cannabis # icon z18- (also has caption(optional) z18-) -shop-car # icon z16- (also has caption(optional) z16-) -shop-car_parts # icon z16- (also has caption(optional) z16-) -shop-coffee # icon z18- (also has caption(optional) z18-) -shop-copyshop # icon z16- (also has caption(optional) z16-) -shop-doityourself # icon z16- (also has caption(optional) z16-) -shop-dry_cleaning # icon z16- (also has caption(optional) z16-) -shop-electrical # icon z18- (also has caption(optional) z18-) -shop-erotic # icon z16- (also has caption(optional) z16-) -shop-furniture # icon z16- (also has caption(optional) z16-) -shop-garden_centre # icon z16- (also has caption(optional) z16-) -shop-gift # icon z16- (also has caption(optional) z16-) -shop-hardware # icon z16- (also has caption(optional) z16-) -shop-houseware # icon z16- (also has caption(optional) z16-) -shop-interior_decoration # icon z16- (also has caption(optional) z16-) -shop-jewelry # icon z16- (also has caption(optional) z16-) -shop-kiosk # icon z16- (also has caption(optional) z16-) -shop-kitchen # icon z16- (also has caption(optional) z16-) -shop-lighting # icon z16- (also has caption(optional) z16-) -shop-massage # icon z17- (also has caption(optional) z18-) -shop-money_lender # icon z17- (also has caption(optional) z17-) -shop-motorcycle # icon z16- (also has caption(optional) z16-) -shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) -shop-music # icon z16- (also has caption(optional) z16-) -shop-musical_instrument # icon z16- (also has caption(optional) z16-) -shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) -shop-optician # icon z16- (also has caption(optional) z16-) -shop-outdoor # icon z16- (also has caption(optional) z16-) -shop-paint # icon z18- (also has caption(optional) z18-) -shop-pawnbroker # icon z17- (also has caption(optional) z17-) -shop-perfumery # icon z18- (also has caption(optional) z18-) -shop-pet # icon z16- (also has caption(optional) z16-) -shop-photo # icon z16- (also has caption(optional) z16-) -shop-rental # icon z16- (also has caption(optional) z16-) -shop-rental-bike # icon z16- (also has caption(optional) z16-) -shop-sewing # icon z16- (also has caption(optional) z16-) -shop-tattoo # icon z16- (also has caption(optional) z16-) -shop-ticket # icon z16- (also has caption(optional) z16-) -shop-tobacco # icon z18- (also has caption(optional) z18-) -shop-tyres # icon z16- (also has caption(optional) z16-) -shop-variety_store # icon z17- (also has caption(optional) z17-) -shop-video # icon z16- (also has caption(optional) z16-) -shop-video_games # icon z16- (also has caption(optional) z16-) -=== 1600 - -aeroway-gate # icon z17- (also has caption(optional) z17-) -amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) -amenity-school # icon z16- (also has caption(optional) z16-, area z13-) -amenity-studio # icon z16- (also has caption(optional) z16-) -historic-archaeological_site # icon z17- (also has caption(optional) z17-) -historic-boundary_stone # icon z16- (also has caption(optional) z16-) -historic-gallows # icon z16- (also has caption(optional) z17-) -historic-memorial-cross # icon z17- (also has caption(optional) z17-) -historic-pillory # icon z16- (also has caption(optional) z17-) -historic-tomb # icon z16- (also has caption(optional) z16-) -historic-wayside_cross # icon z16- (also has caption(optional) z16-) -historic-wayside_shrine # icon z16- (also has caption(optional) z17-) -man_made-cross # icon z14- (also has caption(optional) z16-) -tourism-artwork # icon z15- (also has caption(optional) z15-) -tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) -tourism-artwork-painting # icon z15- (also has caption(optional) z15-) -=== 1550 - -amenity-shelter # icon z12- (also has caption(optional) z13-) -amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) -emergency-lifeguard # icon z14- (also has caption(optional) z18-) -leisure-bandstand # icon z17- (also has caption(optional) z17-) -leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) -leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) -natural-cliff # pathtext z14- (also has line z12-) -=== 1500 - -sport-american_football # icon z17- (also has caption(optional) z17-) -sport-athletics # icon z17- (also has caption(optional) z17-) -sport-badminton # icon z17- (also has caption(optional) z17-) -sport-baseball # icon z17- (also has caption(optional) z17-) -sport-basketball # icon z17- (also has caption(optional) z17-) -sport-beachvolleyball # icon z17- (also has caption(optional) z17-) -sport-climbing # icon z17- (also has caption(optional) z17-) -sport-field_hockey # icon z17- (also has caption(optional) z17-) -sport-four_square # icon z17- (also has caption(optional) z17-) -sport-golf # icon z17- (also has caption(optional) z17-) -sport-gymnastics # icon z17- (also has caption(optional) z17-) -sport-handball # icon z17- (also has caption(optional) z17-) -sport-ice_hockey # icon z17- (also has caption(optional) z17-) -sport-padel # icon z17- (also has caption(optional) z17-) -sport-pelota # icon z17- (also has caption(optional) z17-) -sport-pickleball # icon z17- (also has caption(optional) z17-) -sport-skateboard # icon z17- (also has caption(optional) z17-) -sport-skiing # icon z17- (also has caption(optional) z17-) -sport-swimming # icon z17- (also has caption(optional) z17-) -sport-table_tennis # icon z17- (also has caption(optional) z17-) -sport-tennis # icon z17- (also has caption(optional) z17-) -sport-volleyball # icon z17- (also has caption(optional) z17-) -sport-yoga # icon z17- (also has caption(optional) z17-) -=== 1400 - -sport-10pin # icon z17- (also has caption(optional) z17-) -sport-9pin # icon z17- (also has caption(optional) z17-) -sport-archery # icon z17- (also has caption(optional) z17-) -sport-australian_football # icon z17- (also has caption(optional) z17-) -sport-boules # icon z17- (also has caption(optional) z17-) -sport-bowls # icon z17- (also has caption(optional) z17-) -sport-chess # icon z17- (also has caption(optional) z17-) -sport-cricket # icon z17- (also has caption(optional) z17-) -sport-curling # icon z17- (also has caption(optional) z17-) -sport-diving # icon z17- (also has caption(optional) z17-) -sport-equestrian # icon z17- (also has caption(optional) z17-) -sport-futsal # icon z17- (also has caption(optional) z17-) -sport-scuba_diving # icon z17- (also has caption(optional) z17-) -sport-shooting # icon z17- (also has caption(optional) z17-) -=== 1350 - -sport-multi # icon z17- (also has caption(optional) z17-) -sport-soccer # icon z17- (also has caption(optional) z17-) -=== 1300 - -amenity-atm # icon z18- (also has caption(optional) z18-) -amenity-dojo # icon z16- (also has caption(optional) z18-) -isoline-step_50 # pathtext z15- (also has line z13-) -landuse-recreation_ground # caption z15- (also has area z12-) -leisure-dance # icon z16- (also has caption(optional) z17-) -leisure-recreation_ground # caption z17- -leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) -leisure-sports_hall # icon z17- (also has caption(optional) z17-) -=== 1250 - -amenity-compressed_air # icon z18- (also has caption(optional) z19-) -amenity-parcel_locker # icon z17- (also has caption(optional) z17-) -amenity-payment_terminal # icon z17- (also has caption(optional) z17-) -amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) -amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) -amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) -highway-elevator # icon z17- -leisure-picnic_table # icon z15- (also has caption(optional) z16-) -man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) -man_made-telescope-radio # icon z17- (also has caption(optional) z17-) -man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) -man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) -natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) -=== 1200 - -isoline-step_10 # pathtext z16- (also has line z15-) -isoline-zero # pathtext z15- (also has line z15-) -power-line # pathtext z15- (also has line z13-, line::dash z13-) -=== 1000 - -social_facility-food_bank # icon z17- (also has caption(optional) z17-) -social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) -=== 851 - -amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) -amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) -amenity-nursing_home # icon z17- (also has caption(optional) z17-) -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 z16-) -landuse-farmland # caption z15- (also has area z10-) -landuse-garages # caption z15- (also has area z13-) -landuse-orchard # caption z15- (also has area z12-) -landuse-vineyard # caption z15- (also has area z12-) -leisure-ice_rink # icon z17- (also has caption(optional) z17-) -leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) -man_made-chimney # icon z16- (also has caption(optional) z18-) -man_made-crane # icon z16- (also has caption(optional) z18-) -man_made-flagpole # icon z13- (also has caption(optional) z14-) -man_made-flare # icon z13- (also has caption(optional) z18-) -man_made-mast-communication # icon z13- (also has caption(optional) z14-) -man_made-tower # icon z13- (also has caption(optional) z14-) -man_made-tower-communication # icon z13- (also has caption(optional) z14-) -=== 850 - -junction # caption z17- -junction-circular # caption z17- -junction-roundabout # caption z17- -man_made-breakwater # caption z17- (also has line z14-, area z12-) -man_made-pier # caption z17- (also has line z14-, area z12-) -man_made-works # icon z16- (also has caption(optional) z17-, area z13-) -public_transport-platform # caption z17- (also has area z16-) -waterway-lock_gate # icon z16- -=== 700 - -amenity-brothel # icon z18- (also has caption(optional) z18-) -amenity-casino # icon z17- (also has caption(optional) z17-) -amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) -amenity-gambling # icon z17- (also has caption(optional) z17-) -amenity-internet_cafe # icon z18- (also has caption(optional) z18-) -amenity-love_hotel # icon z18- (also has caption(optional) z18-) -amenity-police # icon z16- (also has caption(optional) z17-, area z15-) -amenity-stripclub # icon z18- (also has caption(optional) z18-) -craft # icon z18- (also has caption(optional) z18-) -craft-beekeeper # icon z17- (also has caption(optional) z18-) -craft-blacksmith # icon z17- (also has caption(optional) z18-) -craft-carpenter # icon z17- (also has caption(optional) z18-) -craft-caterer # icon z17- (also has caption(optional) z18-) -craft-gardener # icon z17- (also has caption(optional) z18-) -craft-grinding_mill # icon z17- (also has caption(optional) z18-) -craft-handicraft # icon z17- (also has caption(optional) z18-) -craft-hvac # icon z17- (also has caption(optional) z18-) -craft-key_cutter # icon z17- (also has caption(optional) z18-) -craft-locksmith # icon z17- (also has caption(optional) z18-) -craft-metal_construction # icon z17- (also has caption(optional) z18-) -craft-painter # icon z17- (also has caption(optional) z18-) -craft-sawmill # icon z17- (also has caption(optional) z18-) -healthcare-alternative # icon z17- (also has caption(optional) z17-) -healthcare-audiologist # icon z17- (also has caption(optional) z17-) -healthcare-podiatrist # icon z17- (also has caption(optional) z17-) -healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) -healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) -leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) -leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) -leisure-indoor_play # icon z17- (also has caption(optional) z17-) -office-company # icon z18- (also has caption(optional) z18-) -office-ngo # icon z18- (also has caption(optional) z18-) -office-telecommunication # icon z18- (also has caption(optional) z18-) -shop-agrarian # icon z16- (also has caption(optional) z16-) -shop-auction # icon z18- (also has caption(optional) z18-) -shop-bookmaker # icon z18- (also has caption(optional) z18-) -shop-carpet # icon z18- (also has caption(optional) z18-) -shop-collector # icon z18- (also has caption(optional) z18-) -shop-craft # icon z18- (also has caption(optional) z18-) -shop-curtain # icon z18- (also has caption(optional) z18-) -shop-fabric # icon z18- (also has caption(optional) z18-) -shop-fishing # icon z18- (also has caption(optional) z18-) -shop-funeral_directors # icon z18- (also has caption(optional) z18-) -shop-gas # icon z16- (also has caption(optional) z16-) -shop-hearing_aids # icon z18- (also has caption(optional) z18-) -shop-herbalist # icon z18- (also has caption(optional) z18-) -shop-hifi # icon z18- (also has caption(optional) z18-) -shop-lottery # icon z18- (also has caption(optional) z18-) -shop-medical_supply # icon z18- (also has caption(optional) z18-) -shop-outpost # icon z18- (also has caption(optional) z18-) -shop-pet_grooming # icon z18- (also has caption(optional) z18-) -shop-storage_rental # icon z18- (also has caption(optional) z18-) -shop-trade # icon z16- (also has caption(optional) z16-) -shop-watches # icon z18- (also has caption(optional) z18-) -shop-wholesale # icon z18- (also has caption(optional) z18-) -=== 500 - -amenity-shower # icon z17- (also has caption(optional) z17-) -amenity-toilets # icon z15- (also has caption(optional) z18-) -man_made-embankment # pathtext z18- (also has line z16-) -office # icon z18- (also has caption(optional) z18-) -office-security # icon z17- (also has caption(optional) z18-) -post_office-post_partner # icon z18- (also has caption(optional) z18-) -shop # icon z18- (also has caption(optional) z18-) -=== 470 - -amenity-bbq # icon z16- (also has caption(optional) z17-) -amenity-luggage_locker # icon z17- (also has caption(optional) z19-) -amenity-public_bookcase # icon z18- (also has caption(optional) z18-) -cemetery-grave # icon z17- (also has caption(optional) z17-) -leisure-firepit # icon z16- (also has caption(optional) z17-) -leisure-outdoor_seating # icon z18- -man_made-mast # icon z13- (also has caption(optional) z14-) -man_made-silo # icon z13- (also has caption(optional) z14-) -man_made-storage_tank # icon z13- (also has caption(optional) z14-) -man_made-water_tower # icon z13- (also has caption(optional) z14-) -power-portal # icon z13- -power-tower # icon z13- -=== 450 - -amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking-underground # icon z16- (also has caption(optional) z18-) -amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) -=== 300 - -amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) -amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) -amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) -amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) -amenity-parking_entrance # icon z17- (also has caption(optional) z19-) -amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) -disusedbusiness # icon z20- -emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) -=== 250 - -building # caption z17- (also has area z14-) -building-garage # caption z17- (also has area z14-) -building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) -building-has_parts # caption z17- (also has area z14-) -man_made-utility_pole # icon z15- -power-plant # icon z17- (also has area z13-) -power-plant-coal # icon z17- (also has area z13-) -power-plant-gas # icon z17- (also has area z13-) -power-plant-hydro # icon z17- (also has area z13-) -power-plant-solar # icon z17- (also has area z13-) -power-plant-wind # icon z13- (also has caption(optional) z16-, area z13-) -power-pole # icon z15- -=== 230 - -barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z17- (also has caption(optional) z18-) -=== 225 - -entrance # icon z18- (also has caption(optional) z19-) -entrance-entry # icon z17- (also has caption(optional) z19-) -entrance-exit # icon z17- (also has caption(optional) z19-) -=== 220 - -spherical_buoy-cardinal-east # icon z15- -spherical_buoy-cardinal-north # icon z15- -spherical_buoy-cardinal-south # icon z15- -spherical_buoy-cardinal-west # icon z15- -spherical_buoy-isolated_danger # icon z15- -spherical_buoy-lateral-port # icon z15- -spherical_buoy-lateral-starboard # icon z15- -spherical_buoy-safe_water # icon z15- -spherical_buoy-special_purpose # icon z15- -=== 216 - -beacon-cardinal-east # icon z13- -beacon-cardinal-north # icon z13- -beacon-cardinal-south # icon z13- -beacon-cardinal-west # icon z13- -beacon-isolated_danger # icon z13- -beacon-lateral-port # icon z13- -beacon-lateral-starboard # icon z13- -beacon-safe_water # icon z13- -beacon-special_purpose # icon z13- -buoy-cardinal-east # icon z13- -buoy-cardinal-north # icon z13- -buoy-cardinal-south # icon z13- -buoy-cardinal-west # icon z13- -buoy-isolated_danger # icon z13- -buoy-lateral-port # icon z13- -buoy-lateral-starboard # icon z13- -buoy-safe_water # icon z13- -buoy-special_purpose # icon z13- -entrance-emergency # icon z20- (also has caption(optional) z20-) -highway-traffic_signals # icon z19- -=== 215 - -historic-anchor # icon z18- (also has caption(optional) z18-) -historic-cannon # icon z18- (also has caption(optional) z18-) -historic-memorial-plaque # icon z18- (also has caption(optional) z18-) -historic-stone # icon z18- (also has caption(optional) z18-) -=== 210 - -amenity-post_box # icon z18- -amenity-recycling-container # icon z17- (also has caption(optional) z18-) -historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) -=== 200 - -amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) -amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) -amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) -amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) -=== 150 - -landuse-commercial # caption z16- -landuse-construction # caption z15- (also has area z13-) -landuse-farmyard # caption z15- (also has area z10-) -landuse-industrial # caption z15- (also has area z13-) -landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) -landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) -landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) -landuse-railway # caption z15- (also has area z13-) -landuse-residential # caption z17- -landuse-retail # caption z16- (also has area z13-) -leisure-common # caption z17- -leisure-slipway # icon z17- (also has caption(optional) z17-) -leisure-track # caption z16- (also has line z15-) -leisure-track-area # caption z16- (also has area z15-) -man_made-petroleum_well # icon z14- (also has caption(optional) z18-) -man_made-wastewater_plant # caption z15- (also has area z13-) -power-generator # icon z17- (also has area z13-) -power-generator-gas # icon z17- (also has area z13-) -power-generator-hydro # icon z17- (also has area z13-) -power-generator-wind # icon z13- (also has caption(optional) z16-, area z13-) -=== 120 - -amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) -amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) -amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) -amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) -amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) -amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) -leisure-park-no-access # icon z14- (also has caption(optional) z14-, area z10-) -leisure-park-private # icon z14- (also has caption(optional) z14-, area z10-) -leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) -=== 100 - -natural-tree # icon z15- (also has caption(optional) z16-) -=== 6 +# === 7550 + +# place-city-capital-3 # caption z4- +# place-city-capital-4 # caption z4- +# === 7500 + +# place-sea # caption z4- +# === 7450 + +# place-city-capital # caption z4- +# place-city-capital-10 # caption z4- +# place-city-capital-11 # caption z4- +# place-city-capital-5 # caption z4- +# place-city-capital-6 # caption z4- +# place-city-capital-7 # caption z4- +# place-city-capital-8 # caption z4- +# place-city-capital-9 # caption z4- +# === 7400 + +# place-city # caption z4- +# === 7350 + +# place-state-USA # caption z5-10 +# === 7300 + +# place-state # caption z6-10 +# === 7250 + +# aeroway-aerodrome-international # icon z7- (also has caption(optional) z10-, area z10-) +# === 7200 + +# place-island # caption z9- +# === 7150 + +# place-town # caption z8- +# === 7100 + +# place-suburb # caption z10-14 +# === 7050 + +# railway-station-subway-moscow # icon z11-15 (also has caption(optional) z12-15) +# railway-station-subway-spb # icon z11-16 (also has caption(optional) z12-16) +# === 7000 + +# aeroway-aerodrome # icon z14- (also has caption(optional) z14-, area z10-) +# === 6950 + +# place-village # caption z11- +# === 6900 + +# amenity-ferry_terminal # icon z11- (also has caption(optional) z16-) +# railway-station # icon z12- (also has caption(optional) z12-) +# === 6800 + +# highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-) +# highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6750 + +# highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-) +# highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line::bridgeblack z13-, line::bridgewhite z13-) +# highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::border z10-, line(casing) z12-) +# === 6740 + +# boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +# boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) +# boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-5 # icon z10-17 (also has caption(optional) z11-17) +# boundary-protected_area-6 # icon z10-17 (also has caption(optional) z11-17) +# leisure-nature_reserve # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17) +# === 6700 + +# landuse-reservoir # caption z10- (also has area z12-) +# natural-water-lake # caption z10- (also has area z1-) +# natural-water-reservoir # caption z10- (also has area z1-) +# === 6650 + +# barrier-toll_booth # icon z16- (also has caption(optional) z16-) +# === 6600 + +# historic-ruins # icon z17- and caption z17- (also has caption(optional) z17-) +# === 6551 + +# historic-castle # icon z12- (also has caption(optional) z12-) +# historic-castle-castrum # icon z12- (also has caption(optional) z12-) +# historic-castle-defensive # icon z12- (also has caption(optional) z12-) +# historic-castle-fortified_church # icon z12- (also has caption(optional) z12-) +# historic-castle-fortress # icon z12- (also has caption(optional) z12-) +# historic-castle-hillfort # icon z12- (also has caption(optional) z12-) +# historic-castle-kremlin # icon z12- (also has caption(optional) z12-) +# historic-castle-manor # icon z12- (also has caption(optional) z12-) +# historic-castle-palace # icon z12- (also has caption(optional) z12-) +# historic-castle-shiro # icon z12- (also has caption(optional) z12-) +# historic-castle-stately # icon z12- (also has caption(optional) z12-) +# historic-fort # icon z12- (also has caption(optional) z12-) +# === 6550 + +# aerialway-station # icon z12- (also has caption(optional) z15-) +# === 6500 + +# amenity-bus_station # icon z13- (also has caption(optional) z14-) +# === 6350 + +# railway-station-funicular # icon z12- (also has caption(optional) z12-) +# railway-station-light_rail # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-london # icon z13- (also has caption(optional) z14-) +# railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-) +# railway-station-monorail # icon z13- (also has caption(optional) z14-) +# railway-station-subway # icon z13- (also has caption(optional) z14-) +# railway-station-subway-adana # icon z12- (also has caption(optional) z14-) +# railway-station-subway-algiers # icon z12- (also has caption(optional) z14-) +# railway-station-subway-almaty # icon z12- (also has caption(optional) z14-) +# railway-station-subway-amsterdam # icon z12- (also has caption(optional) z14-) +# railway-station-subway-ankara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-athens # icon z13- (also has caption(optional) z14-) +# railway-station-subway-baku # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bangkok # icon z13- (also has caption(optional) z14-) +# railway-station-subway-barcelona # icon z13- (also has caption(optional) z14-) +# railway-station-subway-beijing # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bengalore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-berlin # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bilbao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-boston # icon z12- (also has caption(optional) z14-) +# railway-station-subway-brasilia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brescia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-brussels # icon z13- (also has caption(optional) z14-) +# railway-station-subway-bucharest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-budapest # icon z13- (also has caption(optional) z14-) +# railway-station-subway-buenos_aires # icon z12- (also has caption(optional) z14-) +# railway-station-subway-bursa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-cairo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-caracas # icon z13- (also has caption(optional) z14-) +# railway-station-subway-catania # icon z13- (also has caption(optional) z14-) +# railway-station-subway-changchun # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chengdu # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chicago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-chongqing # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dalian # icon z13- (also has caption(optional) z14-) +# railway-station-subway-delhi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dnepro # icon z13- (also has caption(optional) z14-) +# railway-station-subway-dubai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-ekb # icon z13- (also has caption(optional) z14-) +# railway-station-subway-fukuoka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-glasgow # icon z13- (also has caption(optional) z14-) +# railway-station-subway-guangzhou # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-) +# railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-) +# railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-) +# railway-station-subway-izmir # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kazan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kharkiv # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kiev # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-kobe # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kolkata # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kunming # icon z13- (also has caption(optional) z14-) +# railway-station-subway-kyoto # icon z13- (also has caption(optional) z14-) +# railway-station-subway-la # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lausanne # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lille # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lima # icon z13- (also has caption(optional) z14-) +# railway-station-subway-lisboa # icon z12- (also has caption(optional) z14-) +# railway-station-subway-london # icon z12- (also has caption(optional) z14-) +# railway-station-subway-lyon # icon z13- (also has caption(optional) z14-) +# railway-station-subway-madrid # icon z12- (also has caption(optional) z14-) +# railway-station-subway-malaga # icon z13- (also has caption(optional) z14-) +# railway-station-subway-manila # icon z13- (also has caption(optional) z14-) +# railway-station-subway-maracaibo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mashhad # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mecca # icon z13- (also has caption(optional) z14-) +# railway-station-subway-medellin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-mexico # icon z12- (also has caption(optional) z14-) +# railway-station-subway-milan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-minsk # icon z12-16 (also has caption(optional) z12-16) +# railway-station-subway-montreal # icon z13- (also has caption(optional) z14-) +# railway-station-subway-munchen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-nagoya # icon z13- (also has caption(optional) z14-) +# railway-station-subway-newyork # icon z12- (also has caption(optional) z14-) +# railway-station-subway-nnov # icon z13- (also has caption(optional) z14-) +# railway-station-subway-novosibirsk # icon z13- (also has caption(optional) z14-) +# railway-station-subway-osaka # icon z13- (also has caption(optional) z14-) +# railway-station-subway-oslo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-palma # icon z13- (also has caption(optional) z14-) +# railway-station-subway-panama # icon z13- (also has caption(optional) z14-) +# railway-station-subway-paris # icon z12- (also has caption(optional) z14-) +# railway-station-subway-philadelphia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-pyongyang # icon z13- (also has caption(optional) z14-) +# railway-station-subway-qingdao # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rennes # icon z13- (also has caption(optional) z14-) +# railway-station-subway-rio # icon z13- (also has caption(optional) z14-) +# railway-station-subway-roma # icon z12-16 (also has caption(optional) z14-16) +# railway-station-subway-rotterdam # icon z13- (also has caption(optional) z14-) +# railway-station-subway-samara # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santiago # icon z13- (also has caption(optional) z14-) +# railway-station-subway-santo_domingo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-saopaulo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sapporo # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sendai # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sf # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-) +# railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-) +# railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-singapore # icon z13- (also has caption(optional) z14-) +# railway-station-subway-sofia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-stockholm # icon z12- (also has caption(optional) z14-) +# railway-station-subway-tabriz # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taipei # icon z13- (also has caption(optional) z14-) +# railway-station-subway-taoyuan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tashkent # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tbilisi # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tehran # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tianjin # icon z13- (also has caption(optional) z14-) +# railway-station-subway-tokyo # icon z14- (also has caption(optional) z14-) +# railway-station-subway-valencia # icon z13- (also has caption(optional) z14-) +# railway-station-subway-vienna # icon z12- (also has caption(optional) z14-) +# railway-station-subway-warszawa # icon z13- (also has caption(optional) z14-) +# railway-station-subway-washington # icon z13- (also has caption(optional) z14-) +# railway-station-subway-wuhan # icon z13- (also has caption(optional) z14-) +# railway-station-subway-yerevan # icon z13- (also has caption(optional) z14-) +# 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-) +# route-ferry # pathtext z10- (also has line z7-) +# === 6200 + +# highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6150 + +# highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-) +# highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::border z10-, line(casing) z13-) +# === 6140 + +# highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-) +# highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line::border z11-, line(casing) z14-) +# === 6100 + +# barrier-border_control # icon z12- (also has caption(optional) z14-) +# railway-halt # icon z13- (also has caption(optional) z13-) +# tourism-alpine_hut # icon z11- (also has caption(optional) z11-) +# waterway-waterfall # icon z10- (also has caption(optional) z11-) +# === 5800 + +# place-hamlet # caption z13- +# place-quarter # caption z13- +# === 5750 + +# place-farm # caption z14- +# place-isolated_dwelling # caption z14- +# 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-) +# === 5600 + +# man_made-communications_tower # icon z12- (also has caption(optional) z13-) +# man_made-lighthouse # icon z11- (also has caption(optional) z14-) +# natural-peak # icon z10- (also has caption(optional) z11-) +# natural-volcano # icon z10- (also has caption(optional) z13-) +# === 5400 + +# amenity-theatre # icon z14- (also has caption(optional) z14-) +# historic-battlefield # icon z15- (also has caption(optional) z15-) +# historic-city_gate # icon z13- (also has caption(optional) z13-) +# historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) +# leisure-water_park # icon z16- (also has caption(optional) z16-, area z13-) +# shop-mall # icon z14- (also has caption(optional) z14-) +# tourism-aquarium # icon z16- (also has caption(optional) z16-) +# tourism-museum # icon z13- (also has caption(optional) z13-) +# tourism-theme_park # icon z14- (also has caption(optional) z14-) +# tourism-zoo # icon z13- (also has caption(optional) z13-) +# === 5200 + +# amenity-hospital # icon z14- (also has caption(optional) z15-, area z13-) +# amenity-university # icon z14- and caption z14- (also has caption(optional) z14-, area z13-) +# leisure-stadium # icon z13- (also has caption(optional) z13-, area z13-) +# === 5100 + +# leisure-marina # icon z16- (also has caption(optional) z16-) +# leisure-park # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-permissive # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# mountain_pass # icon z11- (also has caption(optional) z12-) +# place-square # caption z16- +# === 5050 + +# tourism-viewpoint # icon z11- (also has caption(optional) z13-) +# === 4950 + +# landuse-forest # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-coniferous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-deciduous # icon z12- (also has caption(optional) z13-, area z10-) +# landuse-forest-mixed # icon z12- (also has caption(optional) z13-, area z10-) +# === 4800 + +# natural-cave_entrance # icon z10- (also has caption(optional) z11-) +# natural-geyser # icon z10- (also has caption(optional) z12-) +# natural-hot_spring # icon z12- (also has caption(optional) z15-) +# natural-spring # icon z12- (also has caption(optional) z14-) +# === 4650 + +# natural-saddle # icon z13- (also has caption(optional) z15-) +# place-islet # caption z14- (also has area z10-) +# === 4500 + +# railway-subway_entrance-moscow # icon z15- (also has caption(optional) z15-) +# railway-subway_entrance-spb # icon z15- (also has caption(optional) z16-) +# === 4450 + +# amenity-ranger_station # icon z13- (also has caption(optional) z14-, area z13-) +# historic-monument # icon z13- (also has caption(optional) z13-) +# tourism-information-office # icon z13- (also has caption(optional) z14-, area z15-) +# tourism-information-visitor_centre # icon z13- (also has caption(optional) z14-, area z13-) +# === 4400 + +# amenity-community_centre # icon z15- (also has caption(optional) z15-) +# amenity-community_centre-youth_centre # icon z15- (also has caption(optional) z15-) +# amenity-conference_centre # icon z16- (also has caption(optional) z16-) +# amenity-events_venue # icon z16- (also has caption(optional) z16-) +# amenity-exhibition_centre # icon z16- (also has caption(optional) z16-) +# tourism-attraction # icon z14- (also has caption(optional) z14-) +# tourism-gallery # icon z15- (also has caption(optional) z15-) +# === 4300 + +# amenity-charging_station-small # icon z17- (also has caption(optional) z18-, area z15-) +# === 4280 + +# amenity-charging_station-motorcar # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-fuel # icon z15- (also has caption(optional) z15-, area z15-) +# waterway-fuel # icon z16- (also has caption(optional) z16-) +# === 4270 + +# highway-services # icon z14- (also has caption(optional) z14-, area z13-) +# === 4250 + +# amenity-place_of_worship-buddhist # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-jehovahs_witness # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-christian-mormon # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-hindu # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-jewish # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-muslim # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-shinto # icon z14- (also has caption(optional) z14-, area z13-) +# amenity-place_of_worship-taoist # icon z14- (also has caption(optional) z14-, area z13-) +# === 4200 + +# amenity-place_of_worship # icon z14- (also has caption(optional) z14-, area z13-) +# historic-memorial # icon z15- (also has caption(optional) z15-) +# === 4150 + +# amenity-cafe # icon z15- (also has caption(optional) z15-) +# amenity-restaurant # icon z15- (also has caption(optional) z15-) +# === 4100 + +# amenity-fast_food # icon z15- (also has caption(optional) z15-) +# amenity-food_court # icon z15- (also has caption(optional) z15-) +# === 4050 + +# amenity-bar # icon z15- (also has caption(optional) z15-) +# === 4000 + +# amenity-biergarten # icon z15- (also has caption(optional) z15-) +# amenity-pub # icon z15- (also has caption(optional) z15-) +# === 3950 + +# amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) +# amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) +# emergency-mountain_rescue # icon z12- (also has caption(optional) z12-, area z13-) +# tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) +# === 3900 + +# highway-rest_area # icon z14- (also has caption(optional) z15-, area z13-) +# tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-) +# tourism-caravan_site # icon z13- (also has caption(optional) z13-) +# tourism-chalet # icon z14- (also has caption(optional) z14-) +# === 3850 + +# shop-car_repair-tyres # icon z15- (also has caption(optional) z15-) +# === 3800 + +# amenity-charging_station-motorcycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3752 + +# amenity-charging_station-bicycle # icon z18- (also has caption(optional) z18-, area z16-) +# === 3751 + +# amenity-charging_station # icon z18- (also has caption(optional) z18-, area z16-) +# === 3750 + +# amenity-charging_station-carless # icon z18- (also has caption(optional) z18-, area z16-) +# === 3749 + +# railway-subway_entrance # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-almaty # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-amsterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ankara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-athens # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-baku # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bangkok # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-barcelona # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-beijing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bengalore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-berlin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bilbao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-boston # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brasilia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brescia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-brussels # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bucharest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-budapest # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-buenos_aires # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-bursa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-cairo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-caracas # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-catania # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-changchun # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chengdu # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chicago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-chongqing # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dalian # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-delhi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dnepro # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-dubai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-ekb # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-fukuoka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-glasgow # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-guangzhou # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kazan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kharkiv # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kiev # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kobe # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kolkata # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kunming # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-kyoto # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-la # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lausanne # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lille # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lima # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lisboa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-london # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-lyon # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-madrid # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-malaga # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-manila # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-maracaibo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mashhad # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mecca # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-medellin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-mexico # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-milan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-minsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-montreal # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-munchen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nagoya # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-newyork # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-nnov # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-novosibirsk # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-osaka # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-oslo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-palma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-panama # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-paris # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-philadelphia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-pyongyang # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-qingdao # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rennes # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rio # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-roma # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-rotterdam # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-samara # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santiago # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-santo_domingo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-saopaulo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sapporo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-stockholm # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tabriz # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taipei # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-taoyuan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tashkent # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tbilisi # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tehran # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tianjin # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-tokyo # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-valencia # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-vienna # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-warszawa # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-washington # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-wuhan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yerevan # icon z16- (also has caption(optional) z17-) +# railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) +# === 3700 + +# railway-tram_stop # icon z14- (also has caption(optional) z17-) +# === 3650 + +# highway-bus_stop # icon z15- (also has caption(optional) z17-) +# === 3600 + +# amenity-drinking_water # icon z12- (also has caption(optional) z14-) +# === 3500 + +# isoline-step_1000 # pathtext z10- (also has line z10-) +# === 3400 + +# isoline-step_500 # pathtext z11- (also has line z10-) +# === 3350 + +# aeroway-terminal # caption z15- (also has area z14-) +# highway-motorway_junction # caption z15- +# leisure-beach_resort # icon z16- (also has caption(optional) z16-, area z10-) +# === 3300 + +# natural-bare_rock # caption z13- (also has area z11-) +# natural-bay # caption z14- +# natural-beach # caption z14- (also has area z10-) +# natural-beach-gravel # caption z14- (also has area z10-) +# natural-beach-sand # caption z14- (also has area z10-) +# natural-cape # caption z14- +# natural-desert # caption z14- (also has area z1-) +# natural-sand # caption z15- (also has area z1-) +# === 3250 + +# shop-supermarket # icon z16- (also has caption(optional) z16-) +# === 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-) +# 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-) +# natural-water-river # caption z10- (also has area z1-) +# railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z15-) +# railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z15-) +# railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line::dash z15-, line(casing) z14-) +# waterway-dam # pathtext z15- (also has line z14-, area z14-) +# waterway-river # pathtext z11- (also has line z10-) +# === 3150 + +# highway-unclassified # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-area # pathtext z13- (also has line z11-, line::border z11-) +# highway-unclassified-bridge # pathtext z13- (also has line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-unclassified-tunnel # pathtext z13- (also has line z11-, line::border z11-, line(casing) z16-) +# === 3100 + +# amenity-water_point # icon z12- (also has caption(optional) z14-) +# highway-raceway # pathtext z16- (also has line z14-) +# historic-aircraft # icon z16- (also has caption(optional) z16-) +# historic-locomotive # icon z16- (also has caption(optional) z16-) +# historic-mine # icon z15- (also has caption(optional) z15-) +# historic-ship # icon z15- (also has caption(optional) z15-) +# historic-tank # icon z16- (also has caption(optional) z16-) +# historic-wreck # icon z16- (also has caption(optional) z16-) +# landuse-allotments # caption z15- (also has area z12-) +# landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +# landuse-cemetery-christian # icon z14- (also has caption(optional) z15-, area z10-) +# man_made-water_tap # icon z12- (also has caption(optional) z14-) +# man_made-water_well # icon z12- (also has caption(optional) z14-) +# man_made-windmill # icon z16- (also has caption(optional) z16-) +# === 3050 + +# isoline-step_100 # pathtext z13- (also has line z11-) +# === 3020 + +# aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-drag_lift # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-gondola # pathtext z15- (also has line z12-, line::dash z12-) +# aerialway-j-bar # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-magic_carpet # pathtext z15- (also has line z13-, line::dash z13-) +# aerialway-mixed_lift # pathtext z15- (also has line z12-, line::dash z12-) +# 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 z12-) +# highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-) +# highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line::border z12-, line(casing) z16-) +# highway-road # pathtext z14- (also has line z12-, line::border z12-) +# highway-road-bridge # pathtext z14- (also has line z12-, line::border z12-, line::bridgeblack z16-, line::bridgewhite z16-) +# highway-road-tunnel # pathtext z14- (also has line z12-, line::border z12-) +# 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-) +# === 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-) +# === 2975 + +# highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-) +# highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::border 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-) +# === 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-) +# === 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 z12-) +# highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-) +# highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::border z12-, line(casing) z16-) +# === 2955 + +# highway-cycleway # pathtext z13- (also has line z11-) +# highway-cycleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-cycleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2953 + +# area:highway-footway # caption z15- (also has area z14-) +# highway-footway # pathtext z13- (also has line z11-, line::border z16-) +# highway-footway-area # pathtext z13- (also has line z11-, line::border z16-, area z14-) +# highway-footway-bicycle # pathtext z13- (also has line z11-, line::border z12-, line::cycleline z13-) +# highway-footway-bridge # pathtext z13- (also has line z11-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-footway-tunnel # pathtext z13- (also has line z11-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-tertiary_link # pathtext z18- (also has line z14-, line::border z14-) +# highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-) +# highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-) +# === 2950 + +# natural-water-basin # caption z10- (also has area z1-) +# natural-water-ditch # caption z17- (also has area z13-) +# natural-water-drain # caption z17- (also has area z13-) +# natural-water-lock # caption z10- (also has area z1-) +# natural-water-moat # caption z17- (also has area z1-) +# natural-water-wastewater # caption z17- (also has area z12-) +# waterway-canal # pathtext z13- (also has line z12-) +# waterway-fish_pass # pathtext z13- (also has line z13-) +# waterway-stream # pathtext z13- (also has line z12-) +# waterway-stream-ephemeral # pathtext z13- (also has line z13-) +# waterway-stream-intermittent # pathtext z13- (also has line z13-) +# waterway-weir # pathtext z15- (also has line z14-) +# === 2900 + +# highway-ford # icon z14- and pathtext z16- (also has line z13-, line::border z14-) +# natural-rock # icon z14- (also has caption(optional) z17-) +# === 2850 + +# highway-bridleway # pathtext z13- (also has line z11-) +# highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# highway-path # pathtext z13- (also has line z11-) +# highway-path-bicycle # pathtext z13- (also has line z11-, line::cycleline z12-) +# highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-path-difficult # pathtext z13- (also has line z11-) +# highway-path-expert # pathtext z13- (also has line z11-) +# highway-path-horse # pathtext z13- (also has line z11-) +# 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 z16-) +# highway-steps-bridge # pathtext z13- (also has line z12-, line::border z16-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-steps-tunnel # pathtext z13- (also has line z12-, line::border z16-, line::tunnelBackground z17-, line::tunnelCasing z17-) +# === 2810 + +# highway-track # pathtext z13- (also has line z11-) +# highway-track-area # pathtext z13- (also has line z11-) +# highway-track-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) +# highway-track-no-access # pathtext z13- (also has line z11-) +# 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 z13-) +# highway-service-area # pathtext z16- (also has line z13-, line::border z13-) +# highway-service-bridge # pathtext z16- (also has line z13-, line::border z13-, line::bridgeblack z15-, line::bridgewhite z15-) +# highway-service-driveway # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-parking_aisle # pathtext z16- (also has line z15-, line::border z15-) +# highway-service-tunnel # pathtext z16- (also has line z13-, line::border 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-) +# piste:type-downhill-expert # pathtext z15- (also has line z12-) +# piste:type-downhill-freeride # pathtext z15- (also has line z12-) +# piste:type-downhill-intermediate # pathtext z15- (also has line z12-) +# piste:type-downhill-novice # pathtext z15- (also has line z12-) +# piste:type-hike # pathtext z13- (also has line z12-) +# piste:type-nordic # pathtext z13- (also has line z12-) +# piste:type-skitour # pathtext z13- (also has line z12-) +# piste:type-sled # pathtext z15- (also has line z12-) +# piste:type-snow_park # caption z15- (also has area z13-) +# === 2770 + +# amenity-townhall # icon z15- (also has caption(optional) z15-) +# leisure-resort # icon z16- (also has caption(optional) z16-, area z13-) +# tourism-hotel # icon z16- (also has caption(optional) z16-) +# === 2750 + +# amenity-arts_centre # icon z17- (also has caption(optional) z17-) +# amenity-bank # icon z16- (also has caption(optional) z16-) +# amenity-library # icon z17- (also has caption(optional) z17-) +# amenity-marketplace # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-pharmacy # icon z16- (also has caption(optional) z17-) +# shop-convenience # icon z16- (also has caption(optional) z16-) +# shop-deli # icon z16- (also has caption(optional) z16-) +# shop-farm # icon z16- (also has caption(optional) z16-) +# shop-greengrocer # icon z16- (also has caption(optional) z16-) +# shop-grocery # icon z16- (also has caption(optional) z16-) +# shop-health_food # icon z16- (also has caption(optional) z16-) +# === 2700 + +# amenity-bicycle_rental # icon z17- (also has caption(optional) z17-) +# amenity-boat_rental # icon z17- (also has caption(optional) z17-) +# amenity-car_sharing # icon z18- (also has caption(optional) z18-) +# amenity-taxi # icon z16- (also has caption(optional) z16-) +# === 2600 + +# historic-memorial-sculpture # icon z15- (also has caption(optional) z15-) +# historic-memorial-statue # icon z15- (also has caption(optional) z15-) +# tourism-artwork-sculpture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-statue # icon z15- (also has caption(optional) z15-) +# === 2590 + +# tourism-motel # icon z16- (also has caption(optional) z16-) +# === 2580 + +# tourism-apartment # icon z16- (also has caption(optional) z16-) +# tourism-guest_house # icon z16- (also has caption(optional) z16-) +# tourism-hostel # icon z16- (also has caption(optional) z16-) +# === 2570 + +# amenity-ice_cream # icon z16- (also has caption(optional) z17-) +# shop-bakery # icon z16- (also has caption(optional) z16-) +# shop-butcher # icon z16- (also has caption(optional) z16-) +# shop-cheese # icon z16- (also has caption(optional) z16-) +# shop-chocolate # icon z16- (also has caption(optional) z16-) +# shop-confectionery # icon z16- (also has caption(optional) z16-) +# shop-pasta # icon z16- (also has caption(optional) z16-) +# shop-pastry # icon z16- (also has caption(optional) z16-) +# shop-seafood # icon z16- (also has caption(optional) z16-) +# shop-water # icon z16- (also has caption(optional) z16-) +# === 2550 + +# aeroway-helipad # icon z16- (also has caption(optional) z16-) +# amenity-bicycle_repair_station # icon z17- (also has caption(optional) z17-) +# amenity-car_rental # icon z18- (also has caption(optional) z18-) +# amenity-motorcycle_rental # icon z17- (also has caption(optional) z17-) +# === 2500 + +# amenity-cinema # icon z17- (also has caption(optional) z17-) +# amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) +# amenity-nightclub # icon z16- (also has caption(optional) z16-) +# amenity-post_office # icon z17- (also has caption(optional) z17-) +# attraction # icon z16- (also has caption(optional) z16-) +# attraction-amusement_ride # icon z16- (also has caption(optional) z16-) +# attraction-animal # icon z16- (also has caption(optional) z16-) +# attraction-big_wheel # icon z16- (also has caption(optional) z16-) +# attraction-bumper_car # icon z16- (also has caption(optional) z16-) +# attraction-carousel # icon z16- (also has caption(optional) z16-) +# attraction-historic # icon z16- (also has caption(optional) z16-) +# attraction-maze # icon z16- (also has caption(optional) z16-) +# attraction-roller_coaster # icon z16- (also has caption(optional) z16-) +# attraction-water_slide # 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 z12-) +# highway-living_street-bridge # pathtext z14- (also has line z12-, line::border z12-) +# highway-living_street-tunnel # pathtext z14- (also has line z12-, line::border 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- and caption z17- (also has caption(optional) z16-, area z12-) +# leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) +# office-diplomatic # icon z17- (also has caption(optional) z17-, area z15-) +# tourism-zoo-petting # icon z15- (also has caption(optional) z15-) +# === 2450 + +# amenity-bureau_de_change # icon z17- (also has caption(optional) z18-) +# amenity-public_bath # icon z17- (also has caption(optional) z17-) +# amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-, area z15-) +# craft-brewery # icon z17- (also has caption(optional) z18-) +# craft-confectionery # icon z17- (also has caption(optional) z18-) +# craft-winery # icon z17- (also has caption(optional) z18-) +# shop-alcohol # icon z16- (also has caption(optional) z16-) +# shop-antiques # icon z16- (also has caption(optional) z16-) +# shop-appliance # icon z18- (also has caption(optional) z18-) +# shop-baby_goods # icon z18- (also has caption(optional) z18-) +# shop-beauty # icon z16- (also has caption(optional) z16-) +# shop-beauty-day_spa # icon z16- (also has caption(optional) z16-) +# shop-beauty-nails # icon z16- (also has caption(optional) z16-) +# shop-beverages # icon z16- (also has caption(optional) z16-) +# shop-boutique # icon z18- (also has caption(optional) z18-) +# shop-car_repair # icon z16- (also has caption(optional) z16-) +# shop-caravan # icon z16- (also has caption(optional) z16-) +# shop-charity # icon z16- (also has caption(optional) z16-) +# shop-chemist # icon z16- (also has caption(optional) z16-) +# shop-clothes # icon z16- (also has caption(optional) z16-) +# shop-computer # icon z16- (also has caption(optional) z16-) +# shop-cosmetics # icon z16- (also has caption(optional) z16-) +# shop-dairy # icon z18- (also has caption(optional) z18-) +# shop-department_store # icon z16- (also has caption(optional) z16-) +# shop-electronics # icon z16- (also has caption(optional) z16-) +# shop-fashion_accessories # icon z18- (also has caption(optional) z18-) +# shop-florist # icon z16- (also has caption(optional) z16-) +# shop-hairdresser # icon z16- (also has caption(optional) z16-) +# shop-laundry # icon z16- (also has caption(optional) z16-) +# shop-mobile_phone # icon z16- (also has caption(optional) z16-) +# shop-newsagent # icon z17- (also has caption(optional) z18-) +# shop-second_hand # icon z16- (also has caption(optional) z16-) +# shop-shoes # icon z16- (also has caption(optional) z16-) +# shop-sports # icon z16- (also has caption(optional) z16-) +# shop-stationery # icon z16- (also has caption(optional) z16-) +# shop-tea # icon z18- (also has caption(optional) z18-) +# shop-telecommunication # icon z16- (also has caption(optional) z16-) +# shop-toys # icon z16- (also has caption(optional) z16-) +# shop-travel_agency # icon z18- (also has caption(optional) z18-) +# shop-wine # icon z16- (also has caption(optional) z16-) +# === 2400 + +# amenity-hunting_stand # icon z14- (also has caption(optional) z15-) +# barrier-block # icon z16- (also has caption(optional) z16-) +# barrier-bollard # icon z16- (also has caption(optional) z16-) +# barrier-chain # icon z16- (also has caption(optional) z16-) +# barrier-cycle_barrier # icon z16- (also has caption(optional) z16-) +# barrier-gate # icon z16- (also has caption(optional) z16-) +# barrier-kissing_gate # icon z16- (also has caption(optional) z16-) +# barrier-lift_gate # icon z16- (also has caption(optional) z16-) +# barrier-stile # icon z16- (also has caption(optional) z16-) +# barrier-swing_gate # icon z16- (also has caption(optional) z16-) +# barrier-turnstile # icon z16- (also has caption(optional) z16-) +# barrier-wicket_gate # icon z17- (also has caption(optional) z17-) +# barrier-yes # icon z16- (also has caption(optional) z16-, line z15-) +# 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-) +# === 2250 + +# amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-college # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-courthouse # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-dentist # icon z17- (also has caption(optional) z17-) +# landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +# landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +# === 2000 + +# amenity-sanitary_dump_station # icon z15- (also has caption(optional) z15-) +# leisure-golf_course # icon z15- (also has caption(optional) z17-, area z12-) +# leisure-miniature_golf # icon z16- (also has caption(optional) z17-, area z14-) +# natural-wetland # caption z16- (also has area z11-) +# natural-wetland-bog # caption z16- (also has area z11-) +# natural-wetland-fen # caption z16- (also has area z11-) +# natural-wetland-mangrove # caption z16- (also has area z11-) +# natural-wetland-marsh # caption z16- (also has area z11-) +# natural-wetland-reedbed # caption z16- (also has area z11-) +# natural-wetland-saltmarsh # caption z16- (also has area z11-) +# natural-wetland-saltmarsh-tidal # caption z16- (also has area z11-) +# natural-wetland-swamp # caption z16- (also has area z11-) +# natural-wetland-tidalflat # caption z16- (also has area z11-) +# tourism-picnic_site # icon z14- (also has caption(optional) z14-) +# === 1800 + +# building-train_station # icon z17- (also has caption(optional) z17-, area z14-) +# railway-level_crossing # icon z17- +# === 1700 + +# railway-platform # caption z16- (also has area z16-) +# === 1650 + +# leisure-sports_centre-sport-swimming # icon z15- (also has caption(optional) z15-, area z13-) +# === 1620 + +# leisure-fitness_centre-sport-yoga # icon z16- (also has caption(optional) z17-, area z16-) +# leisure-sports_centre-sport-american_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-archery # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-athletics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-australian_football # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-badminton # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-baseball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-basketball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-beachvolleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-boules # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-bowls # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-climbing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-cricket # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-curling # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-equestrian # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-field_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-four_square # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-futsal # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-golf # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-gymnastics # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-handball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-ice_hockey # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-multi # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-padel # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pelota # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-pickleball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-scuba_diving # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-shooting # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skateboard # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-skiing # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-soccer # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-table_tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-tennis # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-volleyball # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_centre-sport-yoga # icon z16- (also has caption(optional) z16-, area z13-) +# === 1610 + +# amenity-animal_shelter # icon z17- (also has caption(optional) z17-) +# amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-driving_school # icon z17- (also has caption(optional) z17-) +# amenity-flight_school # icon z17- (also has caption(optional) z17-) +# amenity-language_school # icon z17- (also has caption(optional) z17-) +# amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) +# amenity-money_transfer # icon z17- (also has caption(optional) z18-) +# amenity-music_school # icon z17- (also has caption(optional) z17-) +# amenity-payment_centre # icon z17- (also has caption(optional) z18-) +# amenity-prep_school # icon z17- (also has caption(optional) z17-) +# amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) +# amenity-sailing_school # icon z17- (also has caption(optional) z17-) +# amenity-veterinary # icon z16- (also has caption(optional) z16-) +# craft-electrician # icon z17- (also has caption(optional) z18-) +# craft-electronics_repair # icon z17- (also has caption(optional) z18-) +# craft-photographer # icon z17- (also has caption(optional) z18-) +# craft-plumber # icon z17- (also has caption(optional) z18-) +# craft-shoemaker # icon z17- (also has caption(optional) z18-) +# craft-tailor # icon z17- (also has caption(optional) z18-) +# healthcare-blood_donation # icon z17- (also has caption(optional) z17-) +# healthcare-laboratory # icon z17- (also has caption(optional) z17-) +# healthcare-optometrist # icon z17- (also has caption(optional) z17-) +# healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-sample_collection # icon z17- (also has caption(optional) z17-) +# leisure-escape_game # icon z17- (also has caption(optional) z17-) +# leisure-fitness_centre # icon z16- (also has caption(optional) z17-) +# leisure-hackerspace # icon z17- (also has caption(optional) z17-) +# leisure-sauna # icon z17- (also has caption(optional) z17-) +# man_made-observatory # icon z15- (also has caption(optional) z16-) +# office-estate_agent # icon z18- (also has caption(optional) z18-) +# office-government # icon z18- (also has caption(optional) z18-) +# office-insurance # icon z18- (also has caption(optional) z18-) +# office-lawyer # icon z17- (also has caption(optional) z17-) +# shop-art # icon z16- (also has caption(optional) z16-) +# shop-bag # icon z18- (also has caption(optional) z18-) +# shop-bathroom_furnishing # icon z18- (also has caption(optional) z18-) +# shop-bed # icon z18- (also has caption(optional) z18-) +# shop-bicycle # icon z16- (also has caption(optional) z16-) +# shop-books # icon z16- (also has caption(optional) z16-) +# shop-camera # icon z16- (also has caption(optional) z16-) +# shop-cannabis # icon z18- (also has caption(optional) z18-) +# shop-car # icon z16- (also has caption(optional) z16-) +# shop-car_parts # icon z16- (also has caption(optional) z16-) +# shop-coffee # icon z18- (also has caption(optional) z18-) +# shop-copyshop # icon z16- (also has caption(optional) z16-) +# shop-doityourself # icon z16- (also has caption(optional) z16-) +# shop-dry_cleaning # icon z16- (also has caption(optional) z16-) +# shop-electrical # icon z18- (also has caption(optional) z18-) +# shop-erotic # icon z16- (also has caption(optional) z16-) +# shop-furniture # icon z16- (also has caption(optional) z16-) +# shop-garden_centre # icon z16- (also has caption(optional) z16-) +# shop-gift # icon z16- (also has caption(optional) z16-) +# shop-hardware # icon z16- (also has caption(optional) z16-) +# shop-houseware # icon z16- (also has caption(optional) z16-) +# shop-interior_decoration # icon z16- (also has caption(optional) z16-) +# shop-jewelry # icon z16- (also has caption(optional) z16-) +# shop-kiosk # icon z16- (also has caption(optional) z16-) +# shop-kitchen # icon z16- (also has caption(optional) z16-) +# shop-lighting # icon z16- (also has caption(optional) z16-) +# shop-massage # icon z17- (also has caption(optional) z18-) +# shop-money_lender # icon z17- (also has caption(optional) z17-) +# shop-motorcycle # icon z16- (also has caption(optional) z16-) +# shop-motorcycle_repair # icon z16- (also has caption(optional) z18-) +# shop-music # icon z16- (also has caption(optional) z16-) +# shop-musical_instrument # icon z16- (also has caption(optional) z16-) +# shop-nutrition_supplements # icon z18- (also has caption(optional) z18-) +# shop-optician # icon z16- (also has caption(optional) z16-) +# shop-outdoor # icon z16- (also has caption(optional) z16-) +# shop-paint # icon z18- (also has caption(optional) z18-) +# shop-pawnbroker # icon z17- (also has caption(optional) z17-) +# shop-perfumery # icon z18- (also has caption(optional) z18-) +# shop-pet # icon z16- (also has caption(optional) z16-) +# shop-photo # icon z16- (also has caption(optional) z16-) +# shop-rental # icon z16- (also has caption(optional) z16-) +# shop-rental-bike # icon z16- (also has caption(optional) z16-) +# shop-sewing # icon z16- (also has caption(optional) z16-) +# shop-tattoo # icon z16- (also has caption(optional) z16-) +# shop-ticket # icon z16- (also has caption(optional) z16-) +# shop-tobacco # icon z18- (also has caption(optional) z18-) +# shop-tyres # icon z16- (also has caption(optional) z16-) +# shop-variety_store # icon z17- (also has caption(optional) z17-) +# shop-video # icon z16- (also has caption(optional) z16-) +# shop-video_games # icon z16- (also has caption(optional) z16-) +# === 1600 + +# aeroway-gate # icon z17- (also has caption(optional) z17-) +# amenity-kindergarten # icon z17- (also has caption(optional) z17-, area z13-) +# amenity-school # icon z16- (also has caption(optional) z16-, area z13-) +# amenity-studio # icon z16- (also has caption(optional) z16-) +# historic-archaeological_site # icon z17- (also has caption(optional) z17-) +# historic-boundary_stone # icon z16- (also has caption(optional) z16-) +# historic-gallows # icon z16- (also has caption(optional) z17-) +# historic-memorial-cross # icon z17- (also has caption(optional) z17-) +# historic-pillory # icon z16- (also has caption(optional) z17-) +# historic-tomb # icon z16- (also has caption(optional) z16-) +# historic-wayside_cross # icon z16- (also has caption(optional) z16-) +# historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +# man_made-cross # icon z14- (also has caption(optional) z16-) +# tourism-artwork # icon z15- (also has caption(optional) z15-) +# tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) +# tourism-artwork-painting # icon z15- (also has caption(optional) z15-) +# === 1550 + +# amenity-shelter # icon z12- (also has caption(optional) z13-) +# amenity-shelter-public_transport # icon z14- (also has caption(optional) z14-) +# emergency-lifeguard # icon z14- (also has caption(optional) z18-) +# leisure-bandstand # icon z17- (also has caption(optional) z17-) +# leisure-fitness_station # icon z17- (also has caption(optional) z17-, area z15-) +# leisure-playground # icon z17- (also has caption(optional) z17-, area z15-) +# natural-cliff # pathtext z14- (also has line z12-) +# === 1500 + +# sport-american_football # icon z17- (also has caption(optional) z17-) +# sport-athletics # icon z17- (also has caption(optional) z17-) +# sport-badminton # icon z17- (also has caption(optional) z17-) +# sport-baseball # icon z17- (also has caption(optional) z17-) +# sport-basketball # icon z17- (also has caption(optional) z17-) +# sport-beachvolleyball # icon z17- (also has caption(optional) z17-) +# sport-climbing # icon z17- (also has caption(optional) z17-) +# sport-field_hockey # icon z17- (also has caption(optional) z17-) +# sport-four_square # icon z17- (also has caption(optional) z17-) +# sport-golf # icon z17- (also has caption(optional) z17-) +# sport-gymnastics # icon z17- (also has caption(optional) z17-) +# sport-handball # icon z17- (also has caption(optional) z17-) +# sport-ice_hockey # icon z17- (also has caption(optional) z17-) +# sport-padel # icon z17- (also has caption(optional) z17-) +# sport-pelota # icon z17- (also has caption(optional) z17-) +# sport-pickleball # icon z17- (also has caption(optional) z17-) +# sport-skateboard # icon z17- (also has caption(optional) z17-) +# sport-skiing # icon z17- (also has caption(optional) z17-) +# sport-swimming # icon z17- (also has caption(optional) z17-) +# sport-table_tennis # icon z17- (also has caption(optional) z17-) +# sport-tennis # icon z17- (also has caption(optional) z17-) +# sport-volleyball # icon z17- (also has caption(optional) z17-) +# sport-yoga # icon z17- (also has caption(optional) z17-) +# === 1400 + +# sport-10pin # icon z17- (also has caption(optional) z17-) +# sport-9pin # icon z17- (also has caption(optional) z17-) +# sport-archery # icon z17- (also has caption(optional) z17-) +# sport-australian_football # icon z17- (also has caption(optional) z17-) +# sport-boules # icon z17- (also has caption(optional) z17-) +# sport-bowls # icon z17- (also has caption(optional) z17-) +# sport-chess # icon z17- (also has caption(optional) z17-) +# sport-cricket # icon z17- (also has caption(optional) z17-) +# sport-curling # icon z17- (also has caption(optional) z17-) +# sport-diving # icon z17- (also has caption(optional) z17-) +# sport-equestrian # icon z17- (also has caption(optional) z17-) +# sport-futsal # icon z17- (also has caption(optional) z17-) +# sport-scuba_diving # icon z17- (also has caption(optional) z17-) +# sport-shooting # icon z17- (also has caption(optional) z17-) +# === 1350 + +# sport-multi # icon z17- (also has caption(optional) z17-) +# sport-soccer # icon z17- (also has caption(optional) z17-) +# === 1300 + +# amenity-atm # icon z18- (also has caption(optional) z18-) +# amenity-dojo # icon z16- (also has caption(optional) z18-) +# isoline-step_50 # pathtext z15- (also has line z13-) +# landuse-recreation_ground # caption z15- (also has area z12-) +# leisure-dance # icon z16- (also has caption(optional) z17-) +# leisure-recreation_ground # caption z17- +# leisure-sports_centre # icon z16- (also has caption(optional) z16-, area z13-) +# leisure-sports_hall # icon z17- (also has caption(optional) z17-) +# === 1250 + +# amenity-compressed_air # icon z18- (also has caption(optional) z19-) +# amenity-parcel_locker # icon z17- (also has caption(optional) z17-) +# amenity-payment_terminal # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) +# amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) +# amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-) +# highway-elevator # icon z17- +# leisure-picnic_table # icon z15- (also has caption(optional) z16-) +# man_made-telescope-gamma # icon z17- (also has caption(optional) z17-) +# man_made-telescope-radio # icon z17- (also has caption(optional) z17-) +# man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) +# man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) +# natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) +# === 1200 + +# isoline-step_10 # pathtext z16- (also has line z15-) +# isoline-zero # pathtext z15- (also has line z15-) +# power-line # pathtext z15- (also has line z13-, line::dash z13-) +# === 1000 + +# social_facility-food_bank # icon z17- (also has caption(optional) z17-) +# social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +# === 851 + +# amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) +# amenity-nursing_home # icon z17- (also has caption(optional) z17-) +# 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 z16-) +# landuse-farmland # caption z15- (also has area z10-) +# landuse-garages # caption z15- (also has area z13-) +# landuse-orchard # caption z15- (also has area z12-) +# landuse-vineyard # caption z15- (also has area z12-) +# leisure-ice_rink # icon z17- (also has caption(optional) z17-) +# leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) +# man_made-chimney # icon z16- (also has caption(optional) z18-) +# man_made-crane # icon z16- (also has caption(optional) z18-) +# man_made-flagpole # icon z13- (also has caption(optional) z14-) +# man_made-flare # icon z13- (also has caption(optional) z18-) +# man_made-mast-communication # icon z13- (also has caption(optional) z14-) +# man_made-tower # icon z13- (also has caption(optional) z14-) +# man_made-tower-communication # icon z13- (also has caption(optional) z14-) +# === 850 + +# junction # caption z17- +# junction-circular # caption z17- +# junction-roundabout # caption z17- +# man_made-breakwater # caption z17- (also has line z14-, area z12-) +# man_made-pier # caption z17- (also has line z14-, area z12-) +# man_made-works # icon z16- (also has caption(optional) z17-, area z13-) +# public_transport-platform # caption z17- (also has area z16-) +# waterway-lock_gate # icon z16- +# === 700 + +# amenity-brothel # icon z18- (also has caption(optional) z18-) +# amenity-casino # icon z17- (also has caption(optional) z17-) +# amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-gambling # icon z17- (also has caption(optional) z17-) +# amenity-internet_cafe # icon z18- (also has caption(optional) z18-) +# amenity-love_hotel # icon z18- (also has caption(optional) z18-) +# amenity-police # icon z16- (also has caption(optional) z17-, area z15-) +# amenity-stripclub # icon z18- (also has caption(optional) z18-) +# craft # icon z18- (also has caption(optional) z18-) +# craft-beekeeper # icon z17- (also has caption(optional) z18-) +# craft-blacksmith # icon z17- (also has caption(optional) z18-) +# craft-carpenter # icon z17- (also has caption(optional) z18-) +# craft-caterer # icon z17- (also has caption(optional) z18-) +# craft-gardener # icon z17- (also has caption(optional) z18-) +# craft-grinding_mill # icon z17- (also has caption(optional) z18-) +# craft-handicraft # icon z17- (also has caption(optional) z18-) +# craft-hvac # icon z17- (also has caption(optional) z18-) +# craft-key_cutter # icon z17- (also has caption(optional) z18-) +# craft-locksmith # icon z17- (also has caption(optional) z18-) +# craft-metal_construction # icon z17- (also has caption(optional) z18-) +# craft-painter # icon z17- (also has caption(optional) z18-) +# craft-sawmill # icon z17- (also has caption(optional) z18-) +# healthcare-alternative # icon z17- (also has caption(optional) z17-) +# healthcare-audiologist # icon z17- (also has caption(optional) z17-) +# healthcare-podiatrist # icon z17- (also has caption(optional) z17-) +# healthcare-psychotherapist # icon z17- (also has caption(optional) z17-) +# healthcare-speech_therapist # icon z17- (also has caption(optional) z17-) +# leisure-adult_gaming_centre # icon z17- (also has caption(optional) z17-) +# leisure-amusement_arcade # icon z17- (also has caption(optional) z17-) +# leisure-indoor_play # icon z17- (also has caption(optional) z17-) +# office-company # icon z18- (also has caption(optional) z18-) +# office-ngo # icon z18- (also has caption(optional) z18-) +# office-telecommunication # icon z18- (also has caption(optional) z18-) +# shop-agrarian # icon z16- (also has caption(optional) z16-) +# shop-auction # icon z18- (also has caption(optional) z18-) +# shop-bookmaker # icon z18- (also has caption(optional) z18-) +# shop-carpet # icon z18- (also has caption(optional) z18-) +# shop-collector # icon z18- (also has caption(optional) z18-) +# shop-craft # icon z18- (also has caption(optional) z18-) +# shop-curtain # icon z18- (also has caption(optional) z18-) +# shop-fabric # icon z18- (also has caption(optional) z18-) +# shop-fishing # icon z18- (also has caption(optional) z18-) +# shop-funeral_directors # icon z18- (also has caption(optional) z18-) +# shop-gas # icon z16- (also has caption(optional) z16-) +# shop-hearing_aids # icon z18- (also has caption(optional) z18-) +# shop-herbalist # icon z18- (also has caption(optional) z18-) +# shop-hifi # icon z18- (also has caption(optional) z18-) +# shop-lottery # icon z18- (also has caption(optional) z18-) +# shop-medical_supply # icon z18- (also has caption(optional) z18-) +# shop-outpost # icon z18- (also has caption(optional) z18-) +# shop-pet_grooming # icon z18- (also has caption(optional) z18-) +# shop-storage_rental # icon z18- (also has caption(optional) z18-) +# shop-trade # icon z16- (also has caption(optional) z16-) +# shop-watches # icon z18- (also has caption(optional) z18-) +# shop-wholesale # icon z18- (also has caption(optional) z18-) +# === 500 + +# amenity-shower # icon z17- (also has caption(optional) z17-) +# amenity-toilets # icon z15- (also has caption(optional) z18-) +# man_made-embankment # pathtext z18- (also has line z16-) +# office # icon z18- (also has caption(optional) z18-) +# office-security # icon z17- (also has caption(optional) z18-) +# post_office-post_partner # icon z18- (also has caption(optional) z18-) +# shop # icon z18- (also has caption(optional) z18-) +# === 470 + +# amenity-bbq # icon z16- (also has caption(optional) z17-) +# amenity-luggage_locker # icon z17- (also has caption(optional) z19-) +# amenity-public_bookcase # icon z18- (also has caption(optional) z18-) +# cemetery-grave # icon z17- (also has caption(optional) z17-) +# leisure-firepit # icon z16- (also has caption(optional) z17-) +# leisure-outdoor_seating # icon z18- +# man_made-mast # icon z13- (also has caption(optional) z14-) +# man_made-silo # icon z13- (also has caption(optional) z14-) +# man_made-storage_tank # icon z13- (also has caption(optional) z14-) +# man_made-water_tower # icon z13- (also has caption(optional) z14-) +# power-portal # icon z13- +# power-tower # icon z13- +# === 450 + +# amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-multi-storey-fee # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-park_and_ride # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking-underground # icon z16- (also has caption(optional) z18-) +# amenity-parking-underground-fee # icon z16- (also has caption(optional) z18-) +# === 300 + +# amenity-bicycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-bicycle_parking-covered # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-motorcycle_parking # icon z17- (also has caption(optional) z17-, area z15-) +# amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) +# amenity-parking_entrance # icon z17- (also has caption(optional) z19-) +# amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) +# disusedbusiness # icon z20- +# emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) +# === 250 + +# building # caption z17- (also has area z14-) +# building-garage # caption z17- (also has area z14-) +# building-guardhouse # icon z16- (also has caption(optional) z18-, area z14-) +# building-has_parts # caption z17- (also has area z14-) +# man_made-utility_pole # icon z15- +# power-plant # icon z17- (also has area z13-) +# power-plant-coal # icon z17- (also has area z13-) +# power-plant-gas # icon z17- (also has area z13-) +# power-plant-hydro # icon z17- (also has area z13-) +# power-plant-solar # icon z17- (also has area z13-) +# power-plant-wind # icon z13- (also has caption(optional) z16-, area z13-) +# power-pole # icon z15- +# === 230 + +# barrier-entrance # icon z16- (also has caption(optional) z16-) +# entrance-main # icon z17- (also has caption(optional) z18-) +# === 225 + +# entrance # icon z18- (also has caption(optional) z19-) +# entrance-entry # icon z17- (also has caption(optional) z19-) +# entrance-exit # icon z17- (also has caption(optional) z19-) +# === 220 + +# spherical_buoy-cardinal-east # icon z15- +# spherical_buoy-cardinal-north # icon z15- +# spherical_buoy-cardinal-south # icon z15- +# spherical_buoy-cardinal-west # icon z15- +# spherical_buoy-isolated_danger # icon z15- +# spherical_buoy-lateral-port # icon z15- +# spherical_buoy-lateral-starboard # icon z15- +# spherical_buoy-safe_water # icon z15- +# spherical_buoy-special_purpose # icon z15- +# === 216 + +# beacon-cardinal-east # icon z13- +# beacon-cardinal-north # icon z13- +# beacon-cardinal-south # icon z13- +# beacon-cardinal-west # icon z13- +# beacon-isolated_danger # icon z13- +# beacon-lateral-port # icon z13- +# beacon-lateral-starboard # icon z13- +# beacon-safe_water # icon z13- +# beacon-special_purpose # icon z13- +# buoy-cardinal-east # icon z13- +# buoy-cardinal-north # icon z13- +# buoy-cardinal-south # icon z13- +# buoy-cardinal-west # icon z13- +# buoy-isolated_danger # icon z13- +# buoy-lateral-port # icon z13- +# buoy-lateral-starboard # icon z13- +# buoy-safe_water # icon z13- +# buoy-special_purpose # icon z13- +# entrance-emergency # icon z20- (also has caption(optional) z20-) +# highway-traffic_signals # icon z19- +# === 215 + +# historic-anchor # icon z18- (also has caption(optional) z18-) +# historic-cannon # icon z18- (also has caption(optional) z18-) +# historic-memorial-plaque # icon z18- (also has caption(optional) z18-) +# historic-stone # icon z18- (also has caption(optional) z18-) +# === 210 + +# amenity-post_box # icon z18- +# amenity-recycling-container # icon z17- (also has caption(optional) z18-) +# historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) +# === 200 + +# amenity-parking-lane # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-lane-fee # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) +# === 150 + +# landuse-commercial # caption z16- +# landuse-construction # caption z15- (also has area z13-) +# landuse-farmyard # caption z15- (also has area z10-) +# landuse-industrial # caption z15- (also has area z13-) +# landuse-industrial-mine # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-landfill # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-quarry # icon z15- (also has caption(optional) z15-, area z13-) +# landuse-railway # caption z15- (also has area z13-) +# landuse-residential # caption z17- +# landuse-retail # caption z16- (also has area z13-) +# leisure-common # caption z17- +# leisure-slipway # icon z17- (also has caption(optional) z17-) +# leisure-track # caption z16- (also has line z15-) +# leisure-track-area # caption z16- (also has area z15-) +# man_made-petroleum_well # icon z14- (also has caption(optional) z18-) +# man_made-wastewater_plant # caption z15- (also has area z13-) +# power-generator # icon z17- (also has area z13-) +# power-generator-gas # icon z17- (also has area z13-) +# power-generator-hydro # icon z17- (also has area z13-) +# power-generator-wind # icon z13- (also has caption(optional) z16-, area z13-) +# === 120 + +# amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) +# amenity-parking-no-access # icon z18- (also has caption(optional) z18-, area z15-) +# amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) +# amenity-parking-underground-private # icon z18- (also has caption(optional) z18-) +# amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-) +# leisure-park-no-access # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-park-private # icon z14- and caption z17- (also has caption(optional) z14-, area z10-) +# leisure-swimming_pool-private # icon z17- (also has caption(optional) z17-, area z13-) +# === 100 + +# natural-tree # icon z15- and caption z16- (also has caption(optional) z16-) +# === 6 # # All automatic optional captions priorities are below 0. @@ -1451,7 +1456,7 @@ natural-tree # icon z15- (also has captio # barrier-toll_booth # caption(optional) z16- (also has icon z16-) # === -3400 -# historic-ruins # caption(optional) z17- (also has icon z17-) +# historic-ruins # caption(optional) z17- (also has icon z17-, caption z17-) # === -3449 # historic-castle # caption(optional) z12- (also has icon z12-) @@ -1621,13 +1626,13 @@ natural-tree # icon z15- (also has captio # === -4800 # amenity-hospital # caption(optional) z15- (also has icon z14-, area z13-) -# amenity-university # caption(optional) z14- (also has icon z14-, area z13-) +# amenity-university # caption(optional) z14- (also has icon z14-, caption z14-, area z13-) # leisure-stadium # caption(optional) z13- (also has icon z13-, area z13-) # === -4900 # leisure-marina # caption(optional) z16- (also has icon z16-) -# leisure-park # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-permissive # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-permissive # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # mountain_pass # caption(optional) z12- (also has icon z11-) # === -4950 @@ -1668,11 +1673,11 @@ natural-tree # icon z15- (also has captio # tourism-gallery # caption(optional) z15- (also has icon z15-) # === -5700 -# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-) +# amenity-charging_station-small # caption(optional) z18- (also has icon z17-, area z15-) # === -5720 -# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-) -# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-) +# amenity-charging_station-motorcar # caption(optional) z16- (also has icon z16-, area z15-) +# amenity-fuel # caption(optional) z15- (also has icon z15-, area z15-) # waterway-fuel # caption(optional) z16- (also has icon z16-) # === -5730 @@ -1724,16 +1729,16 @@ natural-tree # icon z15- (also has captio # shop-car_repair-tyres # caption(optional) z15- (also has icon z15-) # === -6200 -# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-motorcycle # caption(optional) z18- (also has icon z18-, area z16-) # === -6248 -# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-bicycle # caption(optional) z18- (also has icon z18-, area z16-) # === -6249 -# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station # caption(optional) z18- (also has icon z18-, area z16-) # === -6250 -# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-) +# amenity-charging_station-carless # caption(optional) z18- (also has icon z18-, area z16-) # === -6251 # railway-subway_entrance # caption(optional) z17- (also has icon z16-) @@ -1956,7 +1961,7 @@ natural-tree # icon z15- (also has captio # attraction-water_slide # caption(optional) z17- (also has icon z17-) # landuse-plant_nursery # caption(optional) z17- (also has icon z17-, area z12-) # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) -# leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) +# leisure-garden # caption(optional) z16- (also has icon z16-, caption z17-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) # office-diplomatic # caption(optional) z17- (also has icon z17-, area z15-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) @@ -2346,8 +2351,8 @@ natural-tree # icon z15- (also has captio # shop # caption(optional) z18- (also has icon z18-) # === -9530 -xmas-tree # icon z18- -=== -9540 +# xmas-tree # icon z18- +# === -9540 # amenity-bbq # caption(optional) z17- (also has icon z16-) # amenity-luggage_locker # caption(optional) z19- (also has icon z17-) @@ -2425,73 +2430,73 @@ xmas-tree # icon z18- # amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-underground-private # caption(optional) z18- (also has icon z18-) # amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-) -# leisure-park-no-access # caption(optional) z14- (also has icon z14-, area z10-) -# leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-) +# leisure-park-no-access # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) +# leisure-park-private # caption(optional) z14- (also has icon z14-, caption z17-, area z10-) # leisure-swimming_pool-private # caption(optional) z17- (also has icon z17-, area z13-) # === -9900 -man_made-cairn # icon z17- (also has caption(optional) z17-) -man_made-survey_point # icon z14- (also has caption(optional) z15-) -tourism-information # icon z15- (also has caption(optional) z15-) -tourism-information-board # icon z15- (also has caption(optional) z15-) -tourism-information-guidepost # icon z15- (also has caption(optional) z15-) -tourism-information-map # icon z15- (also has caption(optional) z15-) -tourism-information-tactile_map # icon z15- (also has caption(optional) z15-) -=== -9940 - -amenity # caption z19- -amenity-telephone # icon z17- (also has caption(optional) z19-) -entrance-house # icon z18- (also has caption(optional) z19-) -=== -9950 - -entrance-garage # icon z19- (also has caption(optional) z19-) -=== -9960 - -amenity-food_sharing # icon z18- (also has caption(optional) z18-) -amenity-give_box # icon z18- (also has caption(optional) z18-) -amenity-parking_space # caption z19- -amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) -amenity-parking_space-permissive # caption z19- -amenity-parking_space-private # caption z19- -amenity-parking_space-underground # caption z19- -amenity-vending_machine # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) -amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) -building-address # caption z17- -man_made-telescope-optical # icon z17- (also has caption(optional) z17-) -=== -9970 - -amenity-bench-backless # icon z18- (also has caption(optional) z19-) -=== -9979 - -amenity-bench # icon z18- (also has caption(optional) z19-) -amenity-lounger # icon z18- (also has caption(optional) z19-) -amenity-waste_disposal # icon z18- (also has caption(optional) z18-) -emergency-access_point # icon z18- (also has caption(optional) z18-) -emergency-assembly_point # icon z19- (also has caption(optional) z19-) -emergency-defibrillator # icon z18- (also has caption(optional) z18-) -emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) -emergency-phone # icon z17- (also has caption(optional) z19-) -man_made-telescope # icon z18- (also has caption(optional) z18-) -=== -9980 - -emergency-access_point-address # caption z20- -=== -9981 - -amenity-hydrant # icon z19- (also has caption(optional) z19-) -amenity-waste_basket # icon z18- (also has caption(optional) z19-) -emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) -emergency-life_ring # icon z19- (also has caption(optional) z19-) -power-substation # icon z17- (also has caption(optional) z18-, area z13-) -=== -9990 - -# natural-tree # caption(optional) z16- (also has icon z15-) +# man_made-cairn # icon z17- (also has caption(optional) z17-) +# man_made-survey_point # icon z14- (also has caption(optional) z15-) +# tourism-information # icon z15- (also has caption(optional) z15-) +# tourism-information-board # icon z15- (also has caption(optional) z15-) +# tourism-information-guidepost # icon z15- (also has caption(optional) z15-) +# tourism-information-map # icon z15- (also has caption(optional) z15-) +# tourism-information-tactile_map # icon z15- (also has caption(optional) z15-) +# === -9940 + +# amenity # caption z19- +# amenity-telephone # icon z17- (also has caption(optional) z19-) +# entrance-house # icon z18- (also has caption(optional) z19-) +# === -9950 + +# entrance-garage # icon z19- (also has caption(optional) z19-) +# === -9960 + +# amenity-food_sharing # icon z18- (also has caption(optional) z18-) +# amenity-give_box # icon z18- (also has caption(optional) z18-) +# amenity-parking_space # caption z19- +# amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) +# amenity-parking_space-permissive # caption z19- +# amenity-parking_space-private # caption z19- +# amenity-parking_space-underground # caption z19- +# amenity-vending_machine # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-cigarettes # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-coffee # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-condoms # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-drinks # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-excrement_bags # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-food # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-) +# amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-) +# building-address # caption z17- +# man_made-telescope-optical # icon z17- (also has caption(optional) z17-) +# === -9970 + +# amenity-bench-backless # icon z18- (also has caption(optional) z19-) +# === -9979 + +# amenity-bench # icon z18- (also has caption(optional) z19-) +# amenity-lounger # icon z18- (also has caption(optional) z19-) +# amenity-waste_disposal # icon z18- (also has caption(optional) z18-) +# emergency-access_point # icon z18- (also has caption(optional) z18-) +# emergency-assembly_point # icon z19- (also has caption(optional) z19-) +# emergency-defibrillator # icon z18- (also has caption(optional) z18-) +# emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) +# emergency-phone # icon z17- (also has caption(optional) z19-) +# man_made-telescope # icon z18- (also has caption(optional) z18-) +# === -9980 + +# emergency-access_point-address # caption z20- +# === -9981 + +# amenity-hydrant # icon z19- (also has caption(optional) z19-) +# amenity-waste_basket # icon z18- (also has caption(optional) z19-) +# emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +# emergency-life_ring # icon z19- (also has caption(optional) z19-) +# power-substation # icon z17- (also has caption(optional) z18-, area z13-) +# === -9990 + +# natural-tree # caption(optional) z16- (also has icon z15-, caption z16-) # === -9994 # amenity-bench # caption(optional) z19- (also has icon z18-) @@ -2499,7 +2504,7 @@ power-substation # icon z17- (also has captio # amenity-food_sharing # caption(optional) z18- (also has icon z18-) # amenity-give_box # caption(optional) z18- (also has icon z18-) # amenity-hydrant # caption(optional) z19- (also has icon z19-) -amenity-loading_dock # icon z19- (also has caption(optional) z19-) +# amenity-loading_dock # icon z19- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) @@ -2524,7 +2529,7 @@ amenity-loading_dock # icon z19- (also has captio # emergency-phone # caption(optional) z19- (also has icon z17-) # entrance-garage # caption(optional) z19- (also has icon z19-) # entrance-house # caption(optional) z19- (also has icon z18-) -entrance-service # icon z19- (also has caption(optional) z19-) +# entrance-service # icon z19- (also has caption(optional) z19-) # entrance-service # caption(optional) z19- (also has icon z19-) # man_made-cairn # caption(optional) z17- (also has icon z17-) # man_made-survey_point # caption(optional) z15- (also has icon z14-) @@ -2536,4 +2541,4 @@ entrance-service # icon z19- (also has captio # tourism-information-guidepost # caption(optional) z15- (also has icon z15-) # tourism-information-map # caption(optional) z15- (also has icon z15-) # tourism-information-tactile_map # caption(optional) z15- (also has icon z15-) -=== -10000 +# === -10000 diff --git a/data/styles/walking_outdoor/include/transit_systems.mapcss b/data/styles/walking_outdoor/include/transit_systems.mapcss new file mode 100644 index 000000000..262aa09e1 --- /dev/null +++ b/data/styles/walking_outdoor/include/transit_systems.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/transit_systems.mapcss"); +@import("../../outdoor/include/transit_systems.mapcss"); diff --git a/data/styles/walking_outdoor/include/ways.mapcss b/data/styles/walking_outdoor/include/ways.mapcss new file mode 100644 index 000000000..d6cf9977f --- /dev/null +++ b/data/styles/walking_outdoor/include/ways.mapcss @@ -0,0 +1,302 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/include/ways.mapcss"); +@import("../../outdoor/include/ways.mapcss"); + +/* Its not unusual for trails to be tagged as footways, e.g. in UK */ +line|z11-[highway=footway], +line|z12-[highway=ladder], +line|z12-[highway=steps], +{color: @footway; opacity: 1;} + +line|z11-[highway=path], +{color: @path; opacity: 1;} + +line|z11-[highway=path][_path_grade=expert], +{color: @path_expert; opacity: 1;} + +line|z12-[piste:type=hike], +{color: @piste; opacity: 0.7;} + +line|z11-[highway=bridleway], +{color: @path; opacity: 1;} + +line|z11-[highway=cycleway], +line|z13-[highway=footway][bicycle=designated]::cycleline, +line|z12-[highway=path][bicycle=designated]::cycleline, +{color: @cycleway; opacity: 1;} + +line|z11[highway=track], +{width: 1.1; dashes: 6,2.5; opacity: 0.6;} +line|z12[highway=track], +{width: 1.3; dashes: 6,2.5; opacity: 0.7;} +line|z13[highway=track], +{width: 1.6; dashes: 7,3;} +line|z14[highway=track], +{width: 2; dashes: 7,3;} +line|z15[highway=track], +{width: 2.5; dashes: 9,3.5;} +line|z16[highway=track], +{width: 3.2; dashes: 9,3.5;} +line|z17[highway=track], +{width: 4; dashes: 12,4;} +line|z18-[highway=track], +{width: 5; dashes: 12,4;} + +line|z11[highway=footway], +{width: 1; dashes: 3.5,2;} +line|z11[highway=path], +{width: 1; dashes: 3.5,2; opacity: 0.6;} +line|z12[highway=footway], +/* Make steps on z12-14 look same as footways, z15- follows main style */ +line|z12[highway=ladder], +line|z12[highway=steps], +{width: 1.1; dashes: 3.5,2;} +line|z12[highway=path], +line|z12[piste:type=hike], +{width: 1.1; dashes: 3.5,2; opacity: 0.7;} +line|z13[highway=path], +line|z13[piste:type=hike], +line|z13[highway=footway], +line|z13[highway=ladder], +line|z13[highway=steps], +{width: 1.3; dashes: 4,2.5;} +line|z14[highway=path], +line|z14[piste:type=hike], +line|z14[highway=footway], +line|z14[highway=ladder], +line|z14[highway=steps], +{width: 1.6; dashes: 4,2.5;} + +/* steps and ladder from z15 are set in default style */ + +line|z15[highway=path], +line|z15[piste:type=hike], +line|z15[highway=footway], +{width: 2; dashes: 6,3.5;} +line|z16[highway=path], +line|z16[piste:type=hike], +line|z16[highway=footway], +{width: 2.6; dashes: 6,3.5;} +line|z17[highway=path], +line|z17[piste:type=hike], +line|z17[highway=footway], +{width: 3.3; dashes: 8,4.5;} +line|z18-[highway=path], +line|z18-[piste:type=hike], +line|z18-[highway=footway], +{width: 4; dashes: 8,4.5;} + +line|z13-[highway=path][bicycle=designated], +line|z13-[highway=footway][bicycle=designated], +{opacity: 0.8;} + +line|z12[highway=path][bicycle=designated], +{width: 1.1; dashes: 3.5,2.5; opacity: 0.7;} +line|z13[highway=path][bicycle=designated], +{width: 1.3; dashes: 4,3;} +line|z14[highway=path][bicycle=designated], +{width: 1.6; dashes: 4,3;} +line|z15[highway=path][bicycle=designated], +{width: 2; dashes: 6,4.5;} +line|z16[highway=path][bicycle=designated], +{width: 2.6; dashes: 6,4.5; opacity: 0.9;} +line|z17[highway=path][bicycle=designated], +{width: 3.3; dashes: 8,6; opacity: 1;} +line|z18-[highway=path][bicycle=designated], +{width: 4; dashes: 8,6; opacity: 1;} + +line|z12[highway=footway][bicycle=designated], +{width: 1.1; dashes: 2,6; opacity: 0.7;} +line|z13[highway=footway][bicycle=designated], +{width: 1.3; dashes: 3,7;} +line|z14[highway=footway][bicycle=designated], +{width: 1.6; dashes: 4,8;} +line|z15[highway=footway][bicycle=designated], +{width: 2; dashes: 6,9;} +line|z16[highway=footway][bicycle=designated], +{width: 2.6; dashes: 8,10; opacity: 0.9;} +line|z17[highway=footway][bicycle=designated], +{width: 3.3; dashes: 10,11; opacity: 1;} +line|z18[highway=footway][bicycle=designated], +{width: 4; dashes: 15,15; opacity: 1;} +line|z19-[highway=footway][bicycle=designated], +{width: 4; dashes: 20,20; opacity: 1;} + +line|z11[highway=path][_path_grade=difficult], +line|z11[highway=path][_path_grade=expert], +{width: 1; dashes: 1,2; opacity: 0.7;} +line|z12[highway=path][_path_grade=difficult], +line|z12[highway=path][_path_grade=expert], +{width: 1.1; dashes: 1,2; opacity: 0.8;} + +line|z13[highway=path][_path_grade=difficult], +{width: 1.3; dashes: 1.5,2.5;} +line|z14[highway=path][_path_grade=difficult], +{width: 1.6; dashes: 1.5,2.5;} +line|z15[highway=path][_path_grade=difficult], +{width: 2; dashes: 2.5,4;} +line|z16[highway=path][_path_grade=difficult], +{width: 2.6; dashes: 2.5,4;} +line|z17[highway=path][_path_grade=difficult], +{width: 3.3; dashes: 3.6,5;} +line|z18-[highway=path][_path_grade=difficult], +{width: 4; dashes: 3.6,5;} + +line|z13[highway=path][_path_grade=expert], +{width: 1.3; dashes: 1.4,5;} +line|z14[highway=path][_path_grade=expert], +{width: 1.6; dashes: 1.4,5;} +line|z15[highway=path][_path_grade=expert], +{width: 2; dashes: 2.3,9;} +line|z16[highway=path][_path_grade=expert], +{width: 2.6; dashes: 2.3,9;} +line|z17[highway=path][_path_grade=expert], +{width: 3.3; dashes: 3.5,11;} +line|z18-[highway=path][_path_grade=expert], +{width: 4; dashes: 3.5,11;} + +/* +Don't display sidewalks till z13 (like highway=service). +"Rožňava" foot routes are very common with highway-footway-sidewalk +*/ +line|z11-12[highway=footway][footway=sidewalk], +/* Don't display pedestrian crossings till z16. */ +line|z11-15[highway=footway][footway=crossing], +{width: 0;} + +line|z11[highway=bridleway], +{width: 1; dashes: 6,1; opacity: 0.6;} +line|z12[highway=bridleway], +{width: 1.1; dashes: 6,1; opacity: 0.7;} +line|z13[highway=bridleway], +{width: 1.3; dashes: 7,1.2;} +line|z14[highway=bridleway], +{width: 1.6; dashes: 7,1.2;} +line|z15[highway=bridleway], +{width: 2; dashes: 9,1.7;} +line|z16[highway=bridleway], +{width: 2.6; dashes: 9,1.7;} +line|z17[highway=bridleway], +{width: 3.3; dashes: 12,2.2;} +line|z18-[highway=bridleway], +{width: 4; dashes: 12,2.2;} + +line|z11[highway=cycleway], +{width: 0.9; opacity: 0.7;} +line|z12[highway=cycleway], +{width: 1.1; opacity: 0.7;} +line|z13[highway=cycleway], +{width: 1.3; opacity: 0.8;} +line|z14[highway=cycleway], +{width: 1.6;} +line|z15[highway=cycleway], +{width: 2;} +line|z16[highway=cycleway], +{width: 2.6;} +line|z17[highway=cycleway], +{width: 3.3;} +line|z18-[highway=cycleway], +{width: 4;} + +line|z12-[highway=path][bicycle=designated]::cycleline, +{width: 0.5; opacity: 1;} +line|z13[highway=path][bicycle=designated]::cycleline, +{width: 0.6;} +line|z14[highway=path][bicycle=designated]::cycleline, +{width: 0.8;} +line|z15[highway=path][bicycle=designated]::cycleline, +{width: 1;} +line|z16[highway=path][bicycle=designated]::cycleline, +{width: 1.3;} +line|z17[highway=path][bicycle=designated]::cycleline, +{width: 1.6;} +line|z18-[highway=path][bicycle=designated]::cycleline, +{width: 2;} + +line|z13-[highway=footway][bicycle=designated]::cycleline, +{opacity: 1;} +line|z13[highway=footway][bicycle=designated]::cycleline, +{width: 0.5;} +line|z14[highway=footway][bicycle=designated]::cycleline, +{width: 0.6;} +line|z15[highway=footway][bicycle=designated]::cycleline, +{width: 0.7;} +line|z16[highway=footway][bicycle=designated]::cycleline, +{width: 0.8;} +line|z17[highway=footway][bicycle=designated]::cycleline, +{width: 1.1;} +line|z18[highway=footway][bicycle=designated]::cycleline, +{width: 1.4;} +line|z19-[highway=footway][bicycle=designated]::cycleline, +{width: 2.0;} + + + + +/* Ski pistes */ + +line|z12-[piste:type=nordic], +line|z12-[piste:type=skitour], +line|z15-[piste:type=connection], +{color: @piste; opacity: 0.8;} + +line|z12[piste:type=nordic], +line|z12-[piste:type=skitour], +{width: 0.8; opacity: 0.6;} +line|z13[piste:type=nordic], +line|z13[piste:type=skitour], +{width: 1; opacity: 0.7;} +line|z14[piste:type=nordic], +line|z14[piste:type=skitour], +{width: 1.2;} +line|z15[piste:type=nordic], +line|z15[piste:type=skitour], +line|z15[piste:type=connection], +{width: 1.4;} +line|z16[piste:type=nordic], +line|z16[piste:type=skitour], +line|z16[piste:type=connection], +{width: 1.6;} +line|z17[piste:type=nordic], +line|z17[piste:type=skitour], +line|z17[piste:type=connection], +{width: 1.9;} +line|z18-[piste:type=nordic], +line|z18-[piste:type=skitour], +line|z18-[piste:type=connection], +{width: 2.3;} + + +line|z12-[piste:type=downhill], +line|z12-[piste:type=sled], +{color: @piste; opacity: 0.3;} + +line|z12-[piste:type=downhill][piste:difficulty=novice] +{color: @piste_novice; opacity: 0.5;} +line|z12-[piste:type=downhill][piste:difficulty=easy] +{color: @piste_easy;} +line|z12-[piste:type=downhill][piste:difficulty=intermediate] +{color: @piste_intermediate;} +line|z12-[piste:type=downhill][piste:difficulty=advanced] +{color: @piste_advanced;} +line|z12-[piste:type=downhill][piste:difficulty=expert], +{color: @piste_expert;} +line|z12-[piste:type=downhill][piste:difficulty=freeride], +{color: @piste_freeride;} + +line|z12[piste:type=sled], +line|z12[piste:type=downhill], +{width: 1; opacity: 0.4;} +line|z13-14[piste:type=sled], +line|z13-14[piste:type=downhill], +{width: 1.4;} +line|z15-16[piste:type=sled], +line|z15-16[piste:type=downhill], +{width: 2.2;} +line|z17-[piste:type=sled], +line|z17-[piste:type=downhill], +{width: 3.2;} + +area|z12-[piste:type=downhill][area], +area|z12-[piste:type=sled][area], +{width: 0;} diff --git a/data/styles/outdoors/include/Roads_label.mapcss b/data/styles/walking_outdoor/include/ways_label.mapcss similarity index 92% rename from data/styles/outdoors/include/Roads_label.mapcss rename to data/styles/walking_outdoor/include/ways_label.mapcss index cd8af148e..5aaf4de43 100644 --- a/data/styles/outdoors/include/Roads_label.mapcss +++ b/data/styles/walking_outdoor/include/ways_label.mapcss @@ -1,6 +1,6 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Roads_label.mapcss"); - +@import("../../walking/include/ways_label.mapcss"); +@import("../../outdoor/include/ways_label.mapcss"); line|z13-[highway=track], line|z13-[highway=path], @@ -31,7 +31,6 @@ line|z16-[highway=bridleway], line|z16-[highway=cycleway], {font-size: 12; text-color: @label_medium; text-halo-color: @label_halo_light;} - line|z13-[piste:type=nordic], line|z13-[piste:type=hike], line|z13-[piste:type=skitour], diff --git a/data/styles/walking_outdoor/light/colors.mapcss b/data/styles/walking_outdoor/light/colors.mapcss new file mode 100644 index 000000000..d46778d09 --- /dev/null +++ b/data/styles/walking_outdoor/light/colors.mapcss @@ -0,0 +1,3 @@ +/* Keep here changes of the base map style file only. */ +@import("../../walking/light/colors.mapcss"); +@import("../../outdoor/light/colors.mapcss"); diff --git a/data/styles/walking_outdoor/light/style.mapcss b/data/styles/walking_outdoor/light/style.mapcss new file mode 100644 index 000000000..db4bbe110 --- /dev/null +++ b/data/styles/walking_outdoor/light/style.mapcss @@ -0,0 +1,9 @@ +@import("colors.mapcss"); +@import("../include/basemap.mapcss"); +@import("../include/basemap_label.mapcss"); +@import("../include/ways.mapcss"); +@import("../include/ways_label.mapcss"); +@import("../include/icons.mapcss"); +@import("../include/icons_label_colors.mapcss"); +@import("../include/transit_systems.mapcss"); +@import("../../walking/light/dynamic_colors.mapcss"); diff --git a/data/symbols/default/arrow.obj b/data/symbols/walking/arrow.obj similarity index 100% rename from data/symbols/default/arrow.obj rename to data/symbols/walking/arrow.obj diff --git a/data/symbols/default/arrow_shadow.obj b/data/symbols/walking/arrow_shadow.obj similarity index 100% rename from data/symbols/default/arrow_shadow.obj rename to data/symbols/walking/arrow_shadow.obj diff --git a/data/symbols/default/default.ui b/data/symbols/walking/default.ui similarity index 100% rename from data/symbols/default/default.ui rename to data/symbols/walking/default.ui diff --git a/data/symbols/default/smaa-area.png b/data/symbols/walking/smaa-area.png similarity index 100% rename from data/symbols/default/smaa-area.png rename to data/symbols/walking/smaa-area.png diff --git a/data/symbols/default/smaa-search.png b/data/symbols/walking/smaa-search.png similarity index 100% rename from data/symbols/default/smaa-search.png rename to data/symbols/walking/smaa-search.png diff --git a/dev_sandbox/CMakeLists.txt b/dev_sandbox/CMakeLists.txt index 7e9af633c..969daa3a4 100644 --- a/dev_sandbox/CMakeLists.txt +++ b/dev_sandbox/CMakeLists.txt @@ -103,8 +103,22 @@ copy_resources( classificator.txt colors.txt countries.txt - drules_proto_default_light.bin - drules_proto_default_dark.bin + drules_proto_walking_light.bin + drules_proto_walking_outdoor_light.bin + drules_proto_walking_dark.bin + drules_proto_walking_outdoor_dark.bin + drules_proto_cycling_light.bin + drules_proto_cycling_outdoor_light.bin + drules_proto_cycling_dark.bin + drules_proto_cycling_outdoor_dark.bin + drules_proto_driving_light.bin + drules_proto_driving_outdoor_light.bin + drules_proto_driving_dark.bin + drules_proto_driving_outdoor_dark.bin + drules_proto_public-transport_light.bin + drules_proto_public-transport_outdoor_light.bin + drules_proto_public-transport_dark.bin + drules_proto_public-transport_outdoor_dark.bin drules_proto_vehicle_light.bin drules_proto_vehicle_dark.bin editor.config diff --git a/docs/DEBUG_COMMANDS.md b/docs/DEBUG_COMMANDS.md index 4e110327a..5e2232c89 100644 --- a/docs/DEBUG_COMMANDS.md +++ b/docs/DEBUG_COMMANDS.md @@ -12,8 +12,6 @@ For more information, please see the source code at [`Framework::ParseSearchQuer - `?dark` or `mapstyle:dark`: Enable night mode for the map view only. You may need to change the zoom level to reload the view. - `?light` or `mapstyle:light`: Enable light mode for the map view only. You may need to change the zoom level to reload the view. -- `?odark` or `mapstyle:outdoors_dark`: Same as `?dark`, but using the outdoor variant. -- `?olight` or `mapstyle:outdoors_light`: Same as `?light`, but using the outdoor variant. - `?vdark` or `mapstyle:vdark`: Same as `?dark`, but using the vehicle variant. - `?vlight` or `mapstyle:vlight`: Same as `?light`, but using the vehicle variant. @@ -22,13 +20,6 @@ For more information, please see the source code at [`Framework::ParseSearchQuer - `?aa` or `effect:antialiasing`: Enable antialiasing. - `?no-aa` or `effect:no-antialiasing`: Disable antialiasing. -### Map layers - -- `?scheme`: Enable the subway layer. -- `?no-scheme`: Disable the subway layer. -- `?isolines`: Enable the isolines layer. -- `?no-isolines`: Disable the isolines layer. - ### 3D mode (for the Qt desktop app only) - `?3d`: Enable 3D (perspective) mode. - `?b3d`: Enable 3D buildings. diff --git a/docs/STYLES.md b/docs/STYLES.md index f11c88c38..6c5c208db 100644 --- a/docs/STYLES.md +++ b/docs/STYLES.md @@ -83,7 +83,7 @@ by rebuilding styles and symbols quickly. See the guide referenced above to find details on how to build and execute it. To test on Android or iOS device either re-build the app or put -the compiled style files (e.g. `drules_proto_default_light.bin`) into +the compiled style files (e.g. `drules_proto_walking_light.bin`) into a `styles/` subfolder of maps directory on the device (e.g. `Android/data/app.comaps/files/styles/`). diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 9a16783b6..c992481b8 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -191,7 +191,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 1510; + LastUpgradeCheck = 2700; ORGANIZATIONNAME = CoMaps; TargetAttributes = { 47375D952420D4DB00FFCC49 = { diff --git a/iphone/CoreApi/CoreApi.modulemap b/iphone/CoreApi/CoreApi.modulemap index 7433507b9..79c945bd6 100644 --- a/iphone/CoreApi/CoreApi.modulemap +++ b/iphone/CoreApi/CoreApi.modulemap @@ -8,7 +8,6 @@ framework module CoreApi { header "MWMBookmarkGroup.h" header "MWMFrameworkHelper.h" header "MWMCarPlayBookmarkObject.h" - header "MWMMapOverlayManager.h" header "MWMSearchFrameworkHelper.h" header "MWMNetworkPolicy.h" header "PlacePageBookmarkData.h" diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index 00a26e576..3edf00ed0 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -45,8 +45,6 @@ 479F705F234FBB8F00011E2E /* MWMBookmarkGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F705D234FBB8C00011E2E /* MWMBookmarkGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; 479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */; }; 479F7063234FBC5900011E2E /* MWMCarPlayBookmarkObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 47C637D62354AEBE00E12DE0 /* MWMMapOverlayManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637D42354AEBD00E12DE0 /* MWMMapOverlayManager.mm */; }; - 47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */; }; 47C637DD2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47CA68DD2502022400671019 /* MWMBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 47CA68DB2502022400671019 /* MWMBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -152,8 +150,6 @@ 479F705D234FBB8C00011E2E /* MWMBookmarkGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkGroup.h; sourceTree = ""; }; 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlayBookmarkObject.h; sourceTree = ""; }; 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlayBookmarkObject.mm; sourceTree = ""; }; - 47C637D42354AEBD00E12DE0 /* MWMMapOverlayManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapOverlayManager.mm; sourceTree = ""; }; - 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapOverlayManager.h; sourceTree = ""; }; 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = ""; }; 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFrameworkHelper.h; sourceTree = ""; }; 47CA68DB2502022400671019 /* MWMBookmark.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmark.h; sourceTree = ""; }; @@ -259,7 +255,6 @@ 47942D6A237CC3B500DEFAE3 /* PlacePageData */, 4718C42F2355FC0D00640DF1 /* NetworkPolicy */, 47C637D92354B76700E12DE0 /* Search */, - 47C637D32354AEA800E12DE0 /* Traffic */, 479F704C234FB5C800011E2E /* Bookmarks */, 479F7048234F784B00011E2E /* Common */, 477C775523435B69001C5B4E /* Framework */, @@ -391,15 +386,6 @@ path = Bookmarks; sourceTree = ""; }; - 47C637D32354AEA800E12DE0 /* Traffic */ = { - isa = PBXGroup; - children = ( - 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */, - 47C637D42354AEBD00E12DE0 /* MWMMapOverlayManager.mm */, - ); - path = Traffic; - sourceTree = ""; - }; 47C637D92354B76700E12DE0 /* Search */ = { isa = PBXGroup; children = ( @@ -539,7 +525,6 @@ 471527392491EDAA00E91BBA /* MWMBookmarkColor.h in Headers */, 47F4F1F923A3336C0022FD56 /* MWMMapNodeAttributes.h in Headers */, 479F704A234F785B00011E2E /* MWMTypes.h in Headers */, - 47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */, 47942D9C237D927800DEFAE3 /* PlacePageBookmarkData.h in Headers */, EDC4E3522C5D222D009286A2 /* RecentlyDeletedCategory.h in Headers */, 47942D72237CC40B00DEFAE3 /* OpeningHours.h in Headers */, @@ -582,7 +567,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; ORGANIZATIONNAME = CoMaps; TargetAttributes = { 470015EE2342509C00EBF03D = { @@ -647,7 +632,6 @@ 47D9019623AC22E500D9364C /* MWMMapUpdateInfo.mm in Sources */, 47CA68E42506D29000671019 /* MWMBookmarkColor.mm in Sources */, 471AB98E23AB925D00F56D49 /* MWMMapSearchResult.mm in Sources */, - 47C637D62354AEBE00E12DE0 /* MWMMapOverlayManager.mm in Sources */, 475784C32344B422008291A4 /* Framework.cpp in Sources */, 4718C4332355FC3C00640DF1 /* MWMNetworkPolicy.mm in Sources */, 47CA68E92506F61400671019 /* MWMTrack.mm in Sources */, diff --git a/iphone/CoreApi/CoreApi/CoreApi.h b/iphone/CoreApi/CoreApi/CoreApi.h index 638fd9e36..977c46582 100644 --- a/iphone/CoreApi/CoreApi/CoreApi.h +++ b/iphone/CoreApi/CoreApi/CoreApi.h @@ -19,7 +19,6 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import -#import #import #import #import diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index 9222401c3..1f6aace42 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -31,34 +31,43 @@ + (void)setVisibleViewport:(CGRect)rect scaleFactor:(CGFloat)scale { + (void)setTheme:(MWMTheme)theme { auto &f = GetFramework(); - auto const style = f.GetMapStyle(); - auto const isOutdoor = ^BOOL(MapStyle style) { - switch (style) { - case MapStyleOutdoorsLight: - case MapStyleOutdoorsDark: - return YES; - default: - return NO; - } - }(style); - auto const newStyle = ^MapStyle(MWMTheme theme) { + auto const mapAppearance = f.CurrentMapAppearance(); + auto const newMapAppearance = ^MapAppearance(MWMTheme theme) { switch (theme) { case MWMThemeDay: - return isOutdoor ? MapStyleOutdoorsLight : MapStyleDefaultLight; + return MapAppearance::Light; case MWMThemeVehicleDay: - return MapStyleVehicleLight; + return MapAppearance::Light; case MWMThemeNight: - return isOutdoor ? MapStyleOutdoorsDark : MapStyleDefaultDark; + return MapAppearance::Dark; case MWMThemeVehicleNight: - return MapStyleVehicleDark; + return MapAppearance::Dark; case MWMThemeAuto: NSAssert(NO, @"Invalid theme"); - return MapStyleDefaultLight; + return MapAppearance::Light; } }(theme); + if (mapAppearance != newMapAppearance) + f.SwitchToMapAppearance(newMapAppearance); - if (style != newStyle) - f.SetMapStyle(newStyle); + auto const isUsingVehicleStyle = f.IsUsingVehicleStyle(); + auto const newIsUsingVehicleStyle = ^bool(MWMTheme theme) { + switch (theme) { + case MWMThemeDay: + return false; + case MWMThemeVehicleDay: + return true; + case MWMThemeNight: + return false; + case MWMThemeVehicleNight: + return true; + case MWMThemeAuto: + NSAssert(NO, @"Invalid theme"); + return false; + } + }(theme); + if (isUsingVehicleStyle != newIsUsingVehicleStyle) + f.SwitchToUsingVehicleStyle(newIsUsingVehicleStyle); } + (MWMDayTime)daytimeAtLocation:(CLLocation *)location { diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h deleted file mode 100644 index fef6239d5..000000000 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h +++ /dev/null @@ -1,65 +0,0 @@ -#import - -typedef NS_ENUM(NSUInteger, MWMMapOverlayTrafficState) { - MWMMapOverlayTrafficStateDisabled, - MWMMapOverlayTrafficStateEnabled, - MWMMapOverlayTrafficStateWaitingData, - MWMMapOverlayTrafficStateOutdated, - MWMMapOverlayTrafficStateNoData, - MWMMapOverlayTrafficStateNetworkError, - MWMMapOverlayTrafficStateExpiredData, - MWMMapOverlayTrafficStateExpiredApp -} NS_SWIFT_NAME(MapOverlayTrafficState); - -typedef NS_ENUM(NSUInteger, MWMMapOverlayTransitState) { - MWMMapOverlayTransitStateDisabled, - MWMMapOverlayTransitStateEnabled, - MWMMapOverlayTransitStateNoData, -} NS_SWIFT_NAME(MapOverlayTransitState); - -typedef NS_ENUM(NSUInteger, MWMMapOverlayIsolinesState) { - MWMMapOverlayIsolinesStateDisabled, - MWMMapOverlayIsolinesStateEnabled, - MWMMapOverlayIsolinesStateExpiredData, - MWMMapOverlayIsolinesStateNoData, -} NS_SWIFT_NAME(MapOverlayTransitState); - -typedef NS_ENUM(NSUInteger, MWMMapOverlayOutdoorState) { - MWMMapOverlayOutdoorStateDisabled, - MWMMapOverlayOutdoorStateEnabled, -} NS_SWIFT_NAME(MapOverlayOutdoorState); - -NS_SWIFT_NAME(MapOverlayManagerObserver) -@protocol MWMMapOverlayManagerObserver - -@optional -- (void)onTrafficStateUpdated; -- (void)onTransitStateUpdated; -- (void)onIsoLinesStateUpdated; -- (void)onOutdoorStateUpdated; - -@end - -NS_SWIFT_NAME(MapOverlayManager) -@interface MWMMapOverlayManager : NSObject - -+ (void)addObserver:(id)observer; -+ (void)removeObserver:(id)observer; - -+ (MWMMapOverlayTrafficState)trafficState; -+ (MWMMapOverlayTransitState)transitState; -+ (MWMMapOverlayIsolinesState)isolinesState; -+ (MWMMapOverlayOutdoorState)outdoorState; - -+ (BOOL)trafficEnabled; -+ (BOOL)transitEnabled; -+ (BOOL)isoLinesEnabled; -+ (BOOL)isolinesVisible; -+ (BOOL)outdoorEnabled; - -+ (void)setTrafficEnabled:(BOOL)enable; -+ (void)setTransitEnabled:(BOOL)enable; -+ (void)setIsoLinesEnabled:(BOOL)enable; -+ (void)setOutdoorEnabled:(BOOL)enable; - -@end diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm deleted file mode 100644 index 3b9d0bd9c..000000000 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm +++ /dev/null @@ -1,210 +0,0 @@ -#import "MWMMapOverlayManager.h" - -#include "Framework.h" - -static NSString *kGuidesWasShown = @"guidesWasShown"; -static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle"; - -@interface MWMMapOverlayManager () - -@property(nonatomic) NSHashTable> *observers; - -@end - -@implementation MWMMapOverlayManager - -#pragma mark - Instance - -+ (MWMMapOverlayManager *)manager { - static MWMMapOverlayManager *manager; - static dispatch_once_t onceToken = 0; - dispatch_once(&onceToken, ^{ - manager = [[self alloc] initManager]; - }); - return manager; -} - -- (instancetype)initManager { - self = [super init]; - if (self) { - _observers = [NSHashTable weakObjectsHashTable]; - GetFramework().GetTrafficManager().SetStateListener([self](TrafficManager::TrafficState state) { - for (id observer in self.observers) { - if ([observer respondsToSelector:@selector(onTrafficStateUpdated)]) { - [observer onTrafficStateUpdated]; - } - } - }); - GetFramework().GetTransitManager().SetStateListener([self](TransitReadManager::TransitSchemeState state) { - for (id observer in self.observers) { - if ([observer respondsToSelector:@selector(onTransitStateUpdated)]) { - [observer onTransitStateUpdated]; - } - } - }); - GetFramework().GetIsolinesManager().SetStateListener([self](IsolinesManager::IsolinesState state) { - for (id observer in self.observers) { - if ([observer respondsToSelector:@selector(onIsoLinesStateUpdated)]) { - [observer onIsoLinesStateUpdated]; - } - } - }); - [NSNotificationCenter.defaultCenter addObserverForName:didChangeOutdoorMapStyle object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { - for (id observer in self.observers) { - if ([observer respondsToSelector:@selector(onOutdoorStateUpdated)]) { - [observer onOutdoorStateUpdated]; - } - } - }]; - } - return self; -} - -#pragma mark - Add/Remove Observers - -+ (void)addObserver:(id)observer { - [[MWMMapOverlayManager manager].observers addObject:observer]; -} - -+ (void)removeObserver:(id)observer { - [[MWMMapOverlayManager manager].observers removeObject:observer]; -} - -#pragma mark - Properties - -+ (MWMMapOverlayTrafficState)trafficState { - switch (GetFramework().GetTrafficManager().GetState()) { - case TrafficManager::TrafficState::Disabled: - return MWMMapOverlayTrafficStateDisabled; - case TrafficManager::TrafficState::Enabled: - return MWMMapOverlayTrafficStateEnabled; - case TrafficManager::TrafficState::WaitingData: - return MWMMapOverlayTrafficStateWaitingData; - case TrafficManager::TrafficState::Outdated: - return MWMMapOverlayTrafficStateOutdated; - case TrafficManager::TrafficState::NoData: - return MWMMapOverlayTrafficStateNoData; - case TrafficManager::TrafficState::NetworkError: - return MWMMapOverlayTrafficStateNetworkError; - case TrafficManager::TrafficState::ExpiredData: - return MWMMapOverlayTrafficStateExpiredData; - case TrafficManager::TrafficState::ExpiredApp: - return MWMMapOverlayTrafficStateExpiredApp; - } -} - -+ (MWMMapOverlayTransitState)transitState { - switch (GetFramework().GetTransitManager().GetState()) { - case TransitReadManager::TransitSchemeState::Disabled: - return MWMMapOverlayTransitStateDisabled; - case TransitReadManager::TransitSchemeState::Enabled: - return MWMMapOverlayTransitStateEnabled; - case TransitReadManager::TransitSchemeState::NoData: - return MWMMapOverlayTransitStateNoData; - } -} - -+ (MWMMapOverlayIsolinesState)isolinesState { - switch (GetFramework().GetIsolinesManager().GetState()) { - case IsolinesManager::IsolinesState::Disabled: - return MWMMapOverlayIsolinesStateDisabled; - case IsolinesManager::IsolinesState::Enabled: - return MWMMapOverlayIsolinesStateEnabled; - case IsolinesManager::IsolinesState::ExpiredData: - return MWMMapOverlayIsolinesStateExpiredData; - case IsolinesManager::IsolinesState::NoData: - return MWMMapOverlayIsolinesStateNoData; - } -} - -+ (MWMMapOverlayOutdoorState)outdoorState { - switch (GetFramework().GetMapStyle()) { - case MapStyleOutdoorsLight: - case MapStyleOutdoorsDark: - return MWMMapOverlayOutdoorStateEnabled; - default: - return MWMMapOverlayOutdoorStateDisabled; - } -} - -+ (BOOL)trafficEnabled { - return self.trafficState != MWMMapOverlayTrafficStateDisabled; -} - -+ (BOOL)transitEnabled { - return self.transitState != MWMMapOverlayTransitStateDisabled; -} - -+ (BOOL)isoLinesEnabled { - return self.isolinesState != MWMMapOverlayIsolinesStateDisabled; -} - -+ (BOOL)isolinesVisible { - return GetFramework().GetIsolinesManager().IsVisible(); -} - -+ (BOOL)outdoorEnabled { - return self.outdoorState != MWMMapOverlayOutdoorStateDisabled; -} - -+ (void)setTrafficEnabled:(BOOL)enable { - if (enable) { - [self setTransitEnabled:false]; - [self setIsoLinesEnabled:false]; - } - - auto &f = GetFramework(); - f.GetTrafficManager().SetEnabled(enable); - f.SaveTrafficEnabled(enable); -} - -+ (void)setTransitEnabled:(BOOL)enable { - if (enable) { - [self setTrafficEnabled:!enable]; - [self setIsoLinesEnabled:false]; - [self setOutdoorEnabled:false]; - } - - auto &f = GetFramework(); - f.GetTransitManager().EnableTransitSchemeMode(enable); - f.SaveTransitSchemeEnabled(enable); -} - -+ (void)setIsoLinesEnabled:(BOOL)enable { - if (enable) { - [self setTrafficEnabled:false]; - [self setTransitEnabled:false]; - } - - auto &f = GetFramework(); - f.GetIsolinesManager().SetEnabled(enable); - f.SaveIsolinesEnabled(enable); -} - -+ (void)setOutdoorEnabled:(BOOL)enable { - if (enable) { - [self setTransitEnabled:false]; - [self setTrafficEnabled:false]; - } - - auto &f = GetFramework(); - switch (f.GetMapStyle()) { - case MapStyleDefaultLight: - case MapStyleVehicleLight: - case MapStyleOutdoorsLight: - f.SetMapStyle(enable ? MapStyleOutdoorsLight : MapStyleDefaultLight); - break; - case MapStyleDefaultDark: - case MapStyleVehicleDark: - case MapStyleOutdoorsDark: - f.SetMapStyle(enable ? MapStyleOutdoorsDark : MapStyleDefaultDark); - break; - default: - break; - } - - // TODO: - Observing for the selected/deselected state of the Outdoor style should be implemented not by NSNotificationCenter but the same way as for IsoLines with 'GetFramework().GetIsolinesManager().SetStateListener'. - [NSNotificationCenter.defaultCenter postNotificationName:didChangeOutdoorMapStyle object:nil]; -} - -@end diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index bf680280a..e7d98d81e 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -150,7 +150,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 1510; + LastUpgradeCheck = 2700; ORGANIZATIONNAME = CoMaps; TargetAttributes = { 47A13C6424B4A86000027D4F = { diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift index e395d4715..6522f885a 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift @@ -377,7 +377,7 @@ extension BookmarksListPresenter: CategorySettingsViewControllerDelegate { } func categorySettingsController(_ viewController: CategorySettingsViewController, didDelete categoryId: MWMMarkGroupID) { - if let delegate = delegate as? UIViewController { + if let delegate = delegate { viewController.navigationController?.popToViewController(delegate, animated: true) } } diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index e41abb02b..09a00d975 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -10,6 +10,7 @@ #import +#import "MapControls.h" #import "DeepLinkRouteStrategyAdapter.h" #import "EAGLView.h" #import "FirstSession.h" @@ -17,7 +18,6 @@ #import "MWMActivityViewController.h" #import "MWMAlertViewController.h" #import "MWMAvailableAreaAffectDirection.h" -#import "MWMBottomMenuState.h" #import "MWMButtonCell.h" #import "MWMCarPlaySearchResultObject.h" #import "MWMCarPlaySearchService.h" @@ -54,7 +54,6 @@ #import "MWMRoutingOptions.h" #import "MWMSearchNoResults.h" #import "MWMSettings.h" -#import "MWMSideButtons.h" #import "MWMSpeedCameraManagerMode.h" #import "MWMStorage+UI.h" #import "MWMTableViewCell.h" @@ -62,7 +61,6 @@ #import "MWMTextToSpeech.h" #import "MWMTextToSpeechObserver.h" #import "MWMTextView.h" -#import "MWMTrafficButtonViewController.h" #import "MWMViewController.h" #import "MapViewController.h" #import "MapsAppDelegate.h" diff --git a/iphone/Maps/Bridging/BridgeControllers.swift b/iphone/Maps/Bridging/BridgeControllers.swift index e7ade0cd4..3fd993a3c 100644 --- a/iphone/Maps/Bridging/BridgeControllers.swift +++ b/iphone/Maps/Bridging/BridgeControllers.swift @@ -10,6 +10,17 @@ import UIKit return profileBridgeController } + + /// The `MapPositionButton` for presentation in an alert + @objc static func mapPositionButton() -> UIViewController { + let mapPositionButtonBridgeController = UIHostingController(rootView: MapPositionButton()) + mapPositionButtonBridgeController.view.isUserInteractionEnabled = true + mapPositionButtonBridgeController.view.isOpaque = false + mapPositionButtonBridgeController.view.backgroundColor = .clear + return mapPositionButtonBridgeController + } + + /// The `RoutingOptionsView` for presentation in an alert @objc static func routingOptions() -> UIViewController { let routinOptionsBridgeController = UIHostingController(rootView: RoutingOptionsView()) @@ -20,28 +31,11 @@ import UIKit -/// Class for using the SwiftUI `AboutView` in the interface builder -class AboutBridgeController: UIHostingController { - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder, rootView: AboutView()) - } -} - - - -/// Class for using the SwiftUI `SettingsView` in the interface builder -class SettingsBridgeController: UIHostingController { - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder, rootView: SettingsView()) - } -} - - - -/// Class for using the SwiftUI `ProfileView` in the interface builder -class ProfileBridgeController: UIHostingController { +/// Class for using the SwiftUI `MainView` in the interface builder +class MainBridgeController: UIHostingController { required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder, rootView: ProfileView()) - self.view.tintColor = .toolbarAccent + super.init(coder: aDecoder, rootView: MainView()) + view.isOpaque = false + view.backgroundColor = .clear } } diff --git a/iphone/Maps/Bridging/MapControls.h b/iphone/Maps/Bridging/MapControls.h new file mode 100644 index 000000000..a19069612 --- /dev/null +++ b/iphone/Maps/Bridging/MapControls.h @@ -0,0 +1,35 @@ +#import + +NS_SWIFT_NAME(MapControls) +@interface MapControls : NSObject + ++ (MapControls *)shared; + +- (bool)hasMainButtons; + ++ (NSInteger)modeRawValue; ++ (void)setModeRawValue:(NSInteger)modeRawValue; + ++ (BOOL)drivingModeHasTraffic; ++ (void)drivingModeSetTraffic:(BOOL)hasTraffic; + ++ (BOOL)publicTransportModeHasTransitLines; ++ (void)publicTransportModeSetTransitLines:(BOOL)hasTransitLines; + ++ (BOOL)outdoorLayerEnabled; ++ (void)setOutdoorLayerEnabled:(BOOL)outdoorLayerEnabled; + ++ (BOOL)contourLinesLayerEnabled; ++ (void)setContourLinesLayerEnabled:(BOOL)contourLinesLayerEnabled; + ++ (BOOL)buildings3dLayerEnabled; ++ (void)setBuildings3dLayerEnabled:(BOOL)buildings3dLayerEnabled; + ++ (void)zoomScale:(CGFloat)scale; ++ (void)zoomIn; ++ (void)zoomOut; + ++ (void)switchToNextPositionMode; ++ (NSString *)positionModeRawValue; + +@end diff --git a/iphone/Maps/Bridging/MapControls.mm b/iphone/Maps/Bridging/MapControls.mm new file mode 100644 index 000000000..558642c47 --- /dev/null +++ b/iphone/Maps/Bridging/MapControls.mm @@ -0,0 +1,128 @@ +#import "SwiftBridge.h" +#import "MapControls.h" + +#include + +@implementation MapControls + +static MapControls *shared = nil; + ++ (MapControls *)shared +{ + if (shared == nil) + shared = [[super allocWithZone:NULL] init]; + + return shared; +} + ++ (id)allocWithZone:(NSZone *)zone +{ + return [self shared]; +} + +- (id)copyWithZone:(NSZone *)zone +{ + return self; +} + +- (id)init +{ + self = [super init]; + return self; +} + +- (bool)hasMainButtons; +{ + return true; +} + ++ (NSInteger)modeRawValue { + return GetFramework().CurrentMapMode(); +} + ++ (void)setModeRawValue:(NSInteger)modeRawValue { + GetFramework().SwitchToMapMode(static_cast(modeRawValue)); +} + ++ (BOOL)drivingModeHasTraffic { + return GetFramework().DrivingMapModeHasTraffic(); +} + ++ (void)drivingModeSetTraffic:(BOOL)hasTraffic { + GetFramework().DrivingMapModeSetTraffic(hasTraffic); +} + ++ (BOOL)publicTransportModeHasTransitLines { + return GetFramework().PublicTransportMapModeHasTransitLines(); +} + ++ (void)publicTransportModeSetTransitLines:(BOOL)hasTransitLines { + GetFramework().PublicTransportMapModeSetTransitLines(hasTransitLines); +} + ++ (BOOL)outdoorLayerEnabled +{ + return GetFramework().HasOutdoorLayer(); +} + ++ (void)setOutdoorLayerEnabled:(BOOL)outdoorLayerEnabled +{ + GetFramework().SetOutdoorLayer(outdoorLayerEnabled); +} + ++ (BOOL)contourLinesLayerEnabled +{ + return GetFramework().HasContourLinesLayer(); +} + ++ (void)setContourLinesLayerEnabled:(BOOL)contourLinesLayerEnabled +{ + GetFramework().SetContourLinesLayer(contourLinesLayerEnabled); +} + ++ (BOOL)buildings3dLayerEnabled; +{ + return GetFramework().HasBuildings3d(); +} + ++ (void)setBuildings3dLayerEnabled:(BOOL)buildings3dLayerEnabled; +{ + GetFramework().SetBuildings3d(buildings3dLayerEnabled); +} + ++ (void)zoomScale:(CGFloat)scale; +{ + GetFramework().Scale(scale, true); +} + ++ (void)zoomIn; +{ + GetFramework().Scale(Framework::SCALE_MAG, true); +} + ++ (void)zoomOut; +{ + GetFramework().Scale(Framework::SCALE_MIN, true); +} + ++ (NSString *)positionModeRawValue; +{ + location::EMyPositionMode mode = GetFramework().GetMyPositionMode(); + switch (mode) + { + case location::EMyPositionMode::NotFollowNoPosition: return @"Locate"; + case location::EMyPositionMode::NotFollow: return @"Locate"; + case location::EMyPositionMode::PendingPosition: return @"Locating"; + case location::EMyPositionMode::Follow: return @"Following"; + case location::EMyPositionMode::FollowAndRotate: return @"FollowingAndRotated"; + } + return @"Locate"; +} + ++ (void)switchToNextPositionMode; +{ + [MWMLocationManager enableLocationAlert]; + GetFramework().SwitchMyPositionNextMode(); +} + +@end diff --git a/iphone/Maps/Bridging/MapControls.swift b/iphone/Maps/Bridging/MapControls.swift new file mode 100644 index 000000000..ab34d00d3 --- /dev/null +++ b/iphone/Maps/Bridging/MapControls.swift @@ -0,0 +1,154 @@ +import Combine +import SwiftUI + +extension MapControls { + /// If the map controls are hidden + @objc static var areMapControlsHidden: Bool { + get { + return UserDefaults.standard.bool(forKey: mapControlsHiddenKey) + } + set { + UserDefaults.standard.set(newValue, forKey: mapControlsHiddenKey) + } + } + + + /// If the zoom buttons are hidden + @objc static var areMapZoomButtonsHidden: Bool { + get { + return UserDefaults.standard.bool(forKey: mapZoomButtonsHiddenKey) + } + set { + UserDefaults.standard.set(newValue, forKey: mapZoomButtonsHiddenKey) + } + } + + + /// The mode + static var mode: Mode { + get { + return Mode(rawValue: modeRawValue()) ?? .walking + } + set { + setModeRawValue(newValue.rawValue) + } + } + + + /// If the outdoor layer is being used + @objc static var hasOutdoorLayer: Bool { + get { + return outdoorLayerEnabled() + } + set { + setOutdoorLayerEnabled(newValue) + } + } + + + /// If the contour lines layer is being used + @objc static var hasContourLinesLayer: Bool { + get { + return contourLinesLayerEnabled() + } + set { + setContourLinesLayerEnabled(newValue) + } + } + + + /// If the buildings 3D layer is being used + @objc static var hasBuildings3dLayer: Bool { + get { + return buildings3dLayerEnabled() + } + set { + setBuildings3dLayerEnabled(newValue) + } + } + + + /// The position mode + static var positionMode: MapPositionButton.Mode { + return MapPositionButton.Mode(rawValue: MapControls.positionModeRawValue()) ?? .locate + } + + + /// If there are map updates + static var hasMapUpdates: Bool { + return MapsAppDelegate.theApp().badgeNumber() > 0 + } + + + /// If a track is currently being recorded + static var isRecordingTrack: Bool { + return TrackRecordingManager.shared.recordingState == .active + } + + + /// The key for storing if map controls are hidden + static private let mapControlsHiddenKey: String = "MapControlsHidden" + + + /// The key for storing if zoom buttons are hidden + static private let mapZoomButtonsHiddenKey: String = "MapZoomButtonsHidden" + + + /// The notification name for presenting the add place sheet + @objc static let presentAddPlaceNotificationName: Notification.Name = Notification.Name(rawValue: "PresentAddPlace") + + + /// The notification name for presenting the record track sheet + @objc static let presentRecordTrackNotificationName: Notification.Name = Notification.Name(rawValue: "PresentRecordTrack") + + + /// The notification name for presenting the location sharing sheet + @objc static let presentShareLocationNotificationName: Notification.Name = Notification.Name(rawValue: "PresentShareLocation") + + + /// The notification name for presenting the favourites sheet + @objc static let presentFavouritesNotificationName: Notification.Name = Notification.Name(rawValue: "PresentFavourites") + + + /// The notification name for presenting the search sheet + @objc static let presentSearchNotificationName: Notification.Name = Notification.Name(rawValue: "PresentSearch") + + + /// The notification name for presenting the map downloads sheet + @objc static let presentMapDownloadsNotificationName: Notification.Name = Notification.Name(rawValue: "PresentMapDownloads") + + + /// The notification name for presenting the settings sheet + @objc static let presentSettingsNotificationName: Notification.Name = Notification.Name(rawValue: "PresentSettings") + + + /// The notification name for presenting the profile sheet + @objc static let presentProfileNotificationName: Notification.Name = Notification.Name(rawValue: "PresentProfile") + + + /// The notification name for presenting the information sheet + @objc static let presentInformationNotificationName: Notification.Name = Notification.Name(rawValue: "PresentInformation") + + + /// The notification name for switching position mode + @objc static let switchPositionModeNotificationName: Notification.Name = Notification.Name(rawValue: "SwitchPositionMode") + + + /// The notification name for changing the track recording state + @objc static let changeTrackRecordingNotificationName: Notification.Name = Notification.Name(rawValue: "ChangeTrackRecording") + + + + /// The notification name for updating maps + @objc static let mapUpdatesNotificationName: Notification.Name = Notification.Name(rawValue: "MapUpdates") + + + + // MARK: Methods + + /// Zoom to a specific scale + /// - Parameter scale: The scale + @objc static func zoom(scale: CGFloat) { + zoomScale(scale) + } +} diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h index 8c6372c37..e87e31123 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.h +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h @@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN + (UIColor *)speedLimitLightGray; + (UIColor *)speedLimitDarkGray; + (UIColor *)carplayPlaceholderBackground; ++ (UIColor *)iconOpaqueGrayTint; + (UIColor *)colorWithName:(NSString *)colorName; + (UIColor *)colorFromHexString:(NSString *)hexString; diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.m b/iphone/Maps/Categories/UIColor+MapsMeColor.m index 11bb911ff..996186005 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.m +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.m @@ -176,4 +176,9 @@ + (UIColor *)speedLimitLightGray { + (UIColor *)speedLimitDarkGray { return [UIColor colorWithRed:scaled(51) green:scaled(51) blue:scaled(50) alpha:alpha100]; } + ++ (UIColor *)iconOpaqueGrayTint +{ + return StyleManager.shared.theme.colors.iconOpaqueGrayTint; +} @end diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift index 80d59d9ad..75ce72cc5 100644 --- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift +++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift @@ -823,4 +823,11 @@ extension CarPlayService { alert.userInfo = [CPConstants.TemplateKey.alert: CPConstants.TemplateType.restoreRoute] presentAlert(alert, animated: true) } + + @objc func windowHeight() -> CGFloat { + if let window { + return window.height + } + return 0 + } } diff --git a/iphone/Maps/Classes/Components/MWMButton.h b/iphone/Maps/Classes/Components/MWMButton.h index fb5e59f9d..487e2253f 100644 --- a/iphone/Maps/Classes/Components/MWMButton.h +++ b/iphone/Maps/Classes/Components/MWMButton.h @@ -12,6 +12,7 @@ typedef NS_ENUM(NSUInteger, MWMButtonColoring) @interface MWMButton : UIButton @property (copy, nonatomic) NSString * imageName; +@property (copy, nonatomic) NSString * backgroundImageName; @property (nonatomic) MWMButtonColoring coloring; @end diff --git a/iphone/Maps/Classes/Components/MWMButton.m b/iphone/Maps/Classes/Components/MWMButton.m index 9a82173ab..e19656776 100644 --- a/iphone/Maps/Classes/Components/MWMButton.m +++ b/iphone/Maps/Classes/Components/MWMButton.m @@ -12,6 +12,12 @@ - (void)setImageName:(NSString *)imageName [self setDefaultImages]; } +- (void)setBackgroundImageName:(NSString *)backgroundImageName +{ + _backgroundImageName = backgroundImageName; + [self setDefaultBackgroundImages]; +} + // This method is overridden by MWMButtonRenderer.swift //- (void)applyTheme //{ @@ -34,6 +40,10 @@ - (void)changeColoringToOpposite [self setDefaultImages]; self.imageView.image = [self imageForState:self.state]; } + if (self.backgroundImageName) + { + [self setDefaultBackgroundImages]; + } return; } if (self.state == UIControlStateNormal) @@ -52,6 +62,14 @@ - (void)setDefaultImages [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.imageName, postfix]] forState:UIControlStateSelected]; } +- (void)setDefaultBackgroundImages +{ + NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light"; + [self setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:kDefaultPattern, self.imageName, postfix]] forState:UIControlStateNormal]; + [self setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:kHighlightedPattern, self.imageName, postfix]] forState:UIControlStateHighlighted]; + [self setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.imageName, postfix]] forState:UIControlStateSelected]; +} + - (void)setHighlighted:(BOOL)highlighted { [super setHighlighted:highlighted]; diff --git a/iphone/Maps/Classes/CustomAlert/UnknownCurrentPositionAlert/UIAlertController+UnknownCurrentPosition.swift b/iphone/Maps/Classes/CustomAlert/UnknownCurrentPositionAlert/UIAlertController+UnknownCurrentPosition.swift index 257f0f316..c9ba600c9 100644 --- a/iphone/Maps/Classes/CustomAlert/UnknownCurrentPositionAlert/UIAlertController+UnknownCurrentPosition.swift +++ b/iphone/Maps/Classes/CustomAlert/UnknownCurrentPositionAlert/UIAlertController+UnknownCurrentPosition.swift @@ -1,5 +1,5 @@ extension UIAlertController { - static func unknownCurrentPosition() -> UIAlertController { + @objc static func unknownCurrentPosition() -> UIAlertController { let alert = UIAlertController(title: L("unknown_current_position"), message: nil, preferredStyle: .alert) alert.addAction(UIAlertAction(title: L("ok"), style: .default, handler: nil)) return alert diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 677a73eed..0659d1851 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -1,18 +1,9 @@ -#import "MWMBottomMenuState.h" #import "MWMMapDownloaderMode.h" #import "MWMNavigationDashboardManager.h" @class MapViewController; -@class BottomTabBarViewController; -@class TrackRecordingButtonViewController; @class SearchQuery; -typedef NS_ENUM(NSUInteger, TrackRecordingButtonState) { - TrackRecordingButtonStateHidden, - TrackRecordingButtonStateVisible, - TrackRecordingButtonStateClosed, -}; - @protocol MWMFeatureHolder; @interface MWMMapViewControlsManager : NSObject @@ -20,28 +11,14 @@ typedef NS_ENUM(NSUInteger, TrackRecordingButtonState) { + (MWMMapViewControlsManager *)manager NS_SWIFT_NAME(manager()); @property(nonatomic) BOOL hidden; -@property(nonatomic) BOOL zoomHidden; -@property(nonatomic) BOOL sideButtonsHidden; -@property(nonatomic) BOOL trafficButtonHidden; -@property(nonatomic) MWMBottomMenuState menuState; -@property(nonatomic) MWMBottomMenuState menuRestoreState; @property(nonatomic) BOOL isDirectionViewHidden; -@property(nonatomic) BottomTabBarViewController * tabBarController; -@property(nonatomic) TrackRecordingButtonViewController * trackRecordingButton; - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; - (UIStatusBarStyle)preferredStatusBarStyle; -#pragma mark - Layout - -- (UIView *)anchorView; - -- (void)viewWillTransitionToSize:(CGSize)size - withTransitionCoordinator:(id)coordinator; - -- (void)setTrackRecordingButtonState:(TrackRecordingButtonState)state; +- (void)addPlace; #pragma mark - MWMNavigationDashboardManager diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 728b3e1c9..540c79ee0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -5,8 +5,6 @@ #import "MWMNetworkPolicy+UI.h" #import "MWMPlacePageManager.h" #import "MWMPlacePageProtocol.h" -#import "MWMSideButtons.h" -#import "MWMTrafficButtonViewController.h" #import "MWMMapWidgetsHelper.h" #import "MapViewController.h" #import "MapsAppDelegate.h" @@ -26,10 +24,8 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; } // namespace -@interface MWMMapViewControlsManager () +@interface MWMMapViewControlsManager () -@property(nonatomic) MWMSideButtons * sideButtons; -@property(nonatomic) MWMTrafficButtonViewController * trafficButton; @property(nonatomic) UIButton * promoButton; @property(nonatomic) UIViewController * menuController; @property(nonatomic) id placePageManager; @@ -57,11 +53,7 @@ - (instancetype)initWithParentController:(MapViewController *)controller { return nil; self.ownerController = controller; self.hidden = NO; - self.sideButtonsHidden = NO; - self.trafficButtonHidden = NO; self.isDirectionViewHidden = YES; - self.menuState = MWMBottomMenuStateInactive; - self.menuRestoreState = MWMBottomMenuStateInactive; self.isAddingPlace = NO; self.searchManager = controller.searchManager; return self; @@ -70,31 +62,17 @@ - (instancetype)initWithParentController:(MapViewController *)controller { - (UIStatusBarStyle)preferredStatusBarStyle { BOOL const isNavigationUnderStatusBar = self.navigationManager.state != MWMNavigationDashboardStateHidden && self.navigationManager.state != MWMNavigationDashboardStateNavigation; - BOOL const isMenuViewUnderStatusBar = self.menuState == MWMBottomMenuStateActive; BOOL const isDirectionViewUnderStatusBar = !self.isDirectionViewHidden; BOOL const isAddPlaceUnderStatusBar = [self.ownerController.view hasSubviewWithViewClass:[MWMAddPlaceNavigationBar class]]; BOOL const isNightMode = [UIColor isNightMode]; BOOL const isSomethingUnderStatusBar = isNavigationUnderStatusBar || - isDirectionViewUnderStatusBar || isMenuViewUnderStatusBar || + isDirectionViewUnderStatusBar || isAddPlaceUnderStatusBar; return isSomethingUnderStatusBar || isNightMode ? UIStatusBarStyleLightContent : UIStatusBarStyleDefault; } -#pragma mark - Layout - -- (UIView *)anchorView { - return self.tabBarController.view; -} - -- (void)viewWillTransitionToSize:(CGSize)size - withTransitionCoordinator:(id)coordinator { - [self.trafficButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - [self.trackRecordingButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - [self.tabBarController viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; -} - #pragma mark - MWMPlacePageViewManager - (void)searchOnMap:(SearchQuery *)query { @@ -120,8 +98,10 @@ - (void)actionDownloadMaps:(MWMMapDownloaderMode)mode { - (void)didFinishAddingPlace { self.isAddingPlace = NO; - self.trafficButtonHidden = NO; - self.menuState = MWMBottomMenuStateInactive; + + if (![MWMRouter isRoutingActive]) + MapControls.areMapControlsHidden = false; + MapControls.areMapZoomButtonsHidden = false; } - (void)addPlace { @@ -133,8 +113,9 @@ - (void)addPlace:(BOOL)isBusiness position:(m2::PointD const *)optionalPosition self.isAddingPlace = YES; [self.searchManager close]; - self.menuState = MWMBottomMenuStateHidden; - self.trafficButtonHidden = YES; + + MapControls.areMapControlsHidden = true; + MapControls.areMapZoomButtonsHidden = true; [ownerController dismissPlacePage]; @@ -190,48 +171,20 @@ - (void)onRouteReady:(BOOL)hasWarnings { - (void)onRouteStart { self.hidden = NO; - self.sideButtons.zoomHidden = self.zoomHidden; - self.sideButtonsHidden = NO; + MapControls.areMapControlsHidden = true; self.disableStandbyOnRouteFollowing = YES; - self.trafficButtonHidden = YES; [self.navigationManager onRouteStart]; self.promoButton.hidden = YES; } - (void)onRouteStop { - self.sideButtons.zoomHidden = self.zoomHidden; [self.navigationManager onRouteStop]; self.disableStandbyOnRouteFollowing = NO; - self.trafficButtonHidden = NO; self.promoButton.hidden = YES; } #pragma mark - Properties -- (MWMSideButtons *)sideButtons { - if (!_sideButtons) - _sideButtons = [[MWMSideButtons alloc] initWithParentView:self.ownerController.controlsView]; - return _sideButtons; -} - -- (MWMTrafficButtonViewController *)trafficButton { - if (!_trafficButton) - _trafficButton = [[MWMTrafficButtonViewController alloc] init]; - return _trafficButton; -} - -- (BottomTabBarViewController *)tabBarController { - if (!_tabBarController) { - MapViewController * ownerController = _ownerController; - _tabBarController = [BottomTabBarBuilder buildWithMapViewController:ownerController controlsManager:self]; - [ownerController addChildViewController:_tabBarController]; - UIView * tabBarViewSuperView = ownerController.controlsView; - [tabBarViewSuperView addSubview:_tabBarController.view]; - } - - return _tabBarController; -} - - (id)placePageManager { if (!_placePageManager) _placePageManager = [[MWMPlacePageManager alloc] init]; @@ -240,89 +193,19 @@ - (BottomTabBarViewController *)tabBarController { - (MWMNavigationDashboardManager *)navigationManager { if (!_navigationManager) - _navigationManager = [[MWMNavigationDashboardManager alloc] initWithParentView:self.ownerController.controlsView]; + _navigationManager = [[MWMNavigationDashboardManager alloc] initWithParentView:self.ownerController.mainView]; return _navigationManager; } -@synthesize menuState = _menuState; - - (void)setHidden:(BOOL)hidden { + MapControls.areMapControlsHidden = hidden; + MapControls.areMapZoomButtonsHidden = hidden; + if (_hidden == hidden) return; // Do not hide the controls view during the place adding process. if (!_isAddingPlace) _hidden = hidden; - self.sideButtonsHidden = _sideButtonsHidden; - self.trafficButtonHidden = _trafficButtonHidden; - self.menuState = hidden ? MWMBottomMenuStateHidden : MWMBottomMenuStateInactive; -} - -- (void)setZoomHidden:(BOOL)zoomHidden { - _zoomHidden = zoomHidden; - self.sideButtons.zoomHidden = zoomHidden; -} - -- (void)setSideButtonsHidden:(BOOL)sideButtonsHidden { - _sideButtonsHidden = sideButtonsHidden; - self.sideButtons.hidden = self.hidden || sideButtonsHidden; -} - -- (void)setTrafficButtonHidden:(BOOL)trafficButtonHidden { - BOOL const isNavigation = self.navigationManager.state == MWMNavigationDashboardStateNavigation; - _trafficButtonHidden = isNavigation || trafficButtonHidden; - self.trafficButton.hidden = self.hidden || _trafficButtonHidden; -} - -- (void)setTrackRecordingButtonState:(TrackRecordingButtonState)state { - if (!_trackRecordingButton) { - _trackRecordingButton = [[TrackRecordingButtonViewController alloc] init]; - } - [self.trackRecordingButton setState:state completion:^{ - [MWMMapWidgetsHelper updateLayoutForAvailableArea]; - }]; - if (state == TrackRecordingButtonStateClosed) - _trackRecordingButton = nil; -} - -- (void)setMenuState:(MWMBottomMenuState)menuState { - _menuState = menuState; - MapViewController * ownerController = _ownerController; - switch (_menuState) { - case MWMBottomMenuStateActive: - _tabBarController.isHidden = NO; - if (_menuController == nil) { - _menuController = [BottomMenuBuilder buildMenuWithMapViewController:ownerController - controlsManager:self - delegate:self]; - [ownerController presentViewController:_menuController animated:YES completion:nil]; - } - break; - case MWMBottomMenuStateLayers: - _tabBarController.isHidden = NO; - if (_menuController == nil) { - _menuController = [BottomMenuBuilder buildLayersWithMapViewController:ownerController - controlsManager:self - delegate:self]; - [ownerController presentViewController:_menuController animated:YES completion:nil]; - } - break; - case MWMBottomMenuStateInactive: - _tabBarController.isHidden = NO; - if (_menuController != nil) { - [_menuController dismissViewControllerAnimated:YES completion:nil]; - _menuController = nil; - } - break; - case MWMBottomMenuStateHidden: - _tabBarController.isHidden = YES; - if (_menuController != nil) { - [_menuController dismissViewControllerAnimated:YES completion:nil]; - _menuController = nil; - } - break; - default: - break; - } } #pragma mark - MWMFeatureHolder diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h deleted file mode 100644 index adc10907c..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h +++ /dev/null @@ -1,18 +0,0 @@ -#import "MWMMyPositionMode.h" - -@interface MWMSideButtons : NSObject - -+ (MWMSideButtons *)buttons; - -@property (nonatomic) BOOL zoomHidden; -@property (nonatomic) BOOL hidden; -@property (nonatomic, readonly) UIView *view; - -- (instancetype)init __attribute__((unavailable("init is not available"))); -- (instancetype)initWithParentView:(UIView *)view; - -- (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode; - -+ (void)updateAvailableArea:(CGRect)frame; - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm deleted file mode 100644 index 9ebcd49e7..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ /dev/null @@ -1,149 +0,0 @@ -#import "MWMSideButtons.h" -#import "MWMButton.h" -#import "MWMLocationManager.h" -#import "MWMMapViewControlsManager.h" -#import "MWMRouter.h" -#import "MWMSettings.h" -#import "MWMSideButtonsView.h" -#import "SwiftBridge.h" - -#include - -namespace -{ -NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView"; -NSString * const kUDDidShowLongTapToShowSideButtonsToast = @"kUDDidShowLongTapToShowSideButtonsToast"; -} // namespace - -@interface MWMMapViewControlsManager () - -@property(nonatomic) MWMSideButtons * sideButtons; - -@end - -@interface MWMSideButtons () - -@property(nonatomic) IBOutlet MWMSideButtonsView * sideView; -@property(weak, nonatomic) IBOutlet MWMButton * zoomInButton; -@property(weak, nonatomic) IBOutlet MWMButton * zoomOutButton; -@property(weak, nonatomic) IBOutlet MWMButton * locationButton; - -@property(nonatomic) BOOL zoomSwipeEnabled; -@property(nonatomic, readonly) BOOL isZoomEnabled; - -@property(nonatomic) MWMMyPositionMode locationMode; - -@end - -@implementation MWMSideButtons - -- (UIView *)view { - return self.sideView; -} - -+ (MWMSideButtons *)buttons { return [MWMMapViewControlsManager manager].sideButtons; } -- (instancetype)initWithParentView:(UIView *)view -{ - self = [super init]; - if (self) - { - [NSBundle.mainBundle loadNibNamed:kMWMSideButtonsViewNibName owner:self options:nil]; - [view addSubview:self.sideView]; - [self.sideView setNeedsLayout]; - self.zoomSwipeEnabled = NO; - self.zoomHidden = NO; - } - return self; -} - -+ (void)updateAvailableArea:(CGRect)frame { [[self buttons].sideView updateAvailableArea:frame]; } - -- (void)zoomIn -{ - GetFramework().Scale(Framework::SCALE_MAG, true); -} - -- (void)zoomOut -{ - GetFramework().Scale(Framework::SCALE_MIN, true); -} - -- (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode -{ - [self refreshLocationButtonState:mode]; - self.locationMode = mode; -} - -#pragma mark - Location button - -- (void)refreshLocationButtonState:(MWMMyPositionMode)state -{ - MWMButton * locBtn = self.locationButton; - [locBtn.imageView stopRotation]; - switch (state) - { - case MWMMyPositionModePendingPosition: - { - [locBtn setStyleNameAndApply: @"ButtonPending"]; - [locBtn.imageView startRotation:1]; - break; - } - case MWMMyPositionModeNotFollow: - case MWMMyPositionModeNotFollowNoPosition: [locBtn setStyleNameAndApply: @"ButtonGetPosition"]; break; - case MWMMyPositionModeFollow: [locBtn setStyleNameAndApply: @"ButtonFollow"]; break; - case MWMMyPositionModeFollowAndRotate: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotate"]; break; - } -} - -#pragma mark - Actions - -- (IBAction)zoomTouchDown:(UIButton *)sender { self.zoomSwipeEnabled = YES; } -- (IBAction)zoomTouchUpInside:(UIButton *)sender -{ - self.zoomSwipeEnabled = NO; - if ([sender isEqual:self.zoomInButton]) - [self zoomIn]; - else - [self zoomOut]; -} - -- (IBAction)zoomTouchUpOutside:(UIButton *)sender { self.zoomSwipeEnabled = NO; } -- (IBAction)zoomSwipe:(UIPanGestureRecognizer *)sender -{ - if (!self.zoomSwipeEnabled) - return; - UIView * const superview = self.sideView.superview; - CGFloat const translation = - -[sender translationInView:superview].y / superview.bounds.size.height; - - CGFloat const scaleFactor = exp(translation); - GetFramework().Scale(scaleFactor, false); -} - -- (IBAction)locationTouchUpInside -{ - [MWMLocationManager enableLocationAlert]; - GetFramework().SwitchMyPositionNextMode(); -} - -#pragma mark - Properties - -- (BOOL)zoomHidden { return self.sideView.zoomHidden; } -- (void)setZoomHidden:(BOOL)zoomHidden -{ - if ([MWMRouter isRoutingActive]) - self.sideView.zoomHidden = NO; - else - self.sideView.zoomHidden = [MWMSettings zoomButtonsEnabled] ? zoomHidden : YES; -} - -- (BOOL)hidden { return self.sideView.hidden; } -- (void)setHidden:(BOOL)hidden -{ - if (!self.hidden && hidden) - [Toast showWithText:L(@"long_tap_toast")]; - - return [self.sideView setHidden:hidden animated:YES]; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.h deleted file mode 100644 index dee00bda0..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.h +++ /dev/null @@ -1,12 +0,0 @@ -@interface MWMSideButtonsView : UIView - -@property (nonatomic) BOOL zoomHidden; - -- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available"))); -- (instancetype)init __attribute__((unavailable("init is not available"))); - -- (void)setHidden:(BOOL)hidden animated:(BOOL)animated; - -- (void)updateAvailableArea:(CGRect)frame; - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm deleted file mode 100644 index 1ec1058d1..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm +++ /dev/null @@ -1,170 +0,0 @@ -#import "MWMSideButtonsView.h" -#import "MWMButton.h" -#import "MWMRouter.h" -#import "MWMMapViewControlsCommon.h" - -#include "base/math.hpp" - -namespace { -CGFloat const kLocationButtonSpacingMax = 52; -CGFloat const kLocationButtonSpacingMin = 8; -CGFloat const kButtonsTopOffset = 6; -CGFloat const kButtonsBottomOffset = 6; -} // namespace - -@interface MWMSideButtonsView () - -@property(weak, nonatomic) IBOutlet MWMButton *zoomIn; -@property(weak, nonatomic) IBOutlet MWMButton *zoomOut; -@property(weak, nonatomic) IBOutlet MWMButton *location; - -@property(nonatomic) CGRect availableArea; - -@end - -@implementation MWMSideButtonsView - -- (void)awakeFromNib { - [super awakeFromNib]; - self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; -} - -- (void)layoutSubviews { - CGFloat spacing = self.availableHeight - self.zoomOut.maxY - self.location.height; - spacing = math::Clamp(spacing, kLocationButtonSpacingMin, kLocationButtonSpacingMax); - - if (!IPAD && (UIDevice.currentDevice.orientation == UIDeviceOrientationLandscapeLeft || UIDevice.currentDevice.orientation == UIDeviceOrientationLandscapeRight) && [MWMRouter isRoutingActive]) { - spacing = spacing - 36; - } - - self.location.minY = self.zoomOut.maxY + spacing; - self.bounds = {{}, {self.zoomOut.width, self.location.maxY}}; - if (self.zoomHidden) - self.height = self.location.height; - self.location.maxY = self.height; - - [self animate]; - [super layoutSubviews]; -} - -- (void)layoutXPosition:(BOOL)hidden { - if (UIApplication.sharedApplication.userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft) { - if (hidden) - self.maxX = 0; - else - self.minX = self.availableArea.origin.x + kViewControlsOffsetToBounds; - } else { - const auto availableAreaMaxX = self.availableArea.origin.x + self.availableArea.size.width; - if (hidden) - self.minX = self.superview.width; - else - self.maxX = availableAreaMaxX - kViewControlsOffsetToBounds; - } -} - -- (void)layoutYPosition { - CGFloat const centerShift = (self.height - self.zoomIn.midY - self.zoomOut.midY) / 2; - [UIView animateWithDuration:kDefaultAnimationDuration - animations:^{ - self.midY = centerShift + self.superview.height / 2; - if ([MWMRouter isRoutingActive]) { - self.midY = self.midY - 18; - } - if (self.maxY > self.bottomBound) - self.maxY = self.bottomBound; - }]; -} - -- (void)fadeZoomButtonsShow:(BOOL)show { - CGFloat const alpha = show ? 1.0 : 0.0; - [UIView animateWithDuration:kDefaultAnimationDuration - animations:^{ - self.zoomIn.alpha = alpha; - self.zoomOut.alpha = alpha; - }]; -} - -- (void)fadeLocationButtonShow:(BOOL)show { - [UIView animateWithDuration:kDefaultAnimationDuration - animations:^{ - self.location.alpha = show ? 1.0 : 0.0; - }]; -} - -// Show/hide zoom and location buttons depending on available vertical space. -- (void)animate { - [self layoutYPosition]; - - BOOL const isZoomHidden = self.zoomIn.alpha == 0.0; - BOOL const willZoomHide = (self.location.maxY > self.availableHeight); - if (willZoomHide != isZoomHidden) - [self fadeZoomButtonsShow: !willZoomHide]; - - BOOL const isLocationHidden = self.location.alpha == 0.0; - BOOL const willLocationHide = (self.location.height > self.availableHeight); - if (willLocationHide != isLocationHidden) - [self fadeLocationButtonShow: !willLocationHide]; -} - -#pragma mark - Properties - -- (void)setZoomHidden:(BOOL)zoomHidden { - _zoomHidden = zoomHidden; - self.zoomIn.hidden = zoomHidden; - self.zoomOut.hidden = zoomHidden; - [self setNeedsLayout]; -} - -- (void)setHidden:(BOOL)hidden animated:(BOOL)animated { - if (animated) { - if (self.hidden == hidden) - return; - // Side buttons should be visible during any our show/hide anamation. - // Visibility should be detemined by alpha, not self.hidden. - self.hidden = NO; - [UIView animateWithDuration:kDefaultAnimationDuration - animations:^{ - self.alpha = hidden ? 0.0 : 1.0; - [self layoutXPosition:hidden]; - } - completion:^(BOOL finished) { - self.hidden = hidden; - }]; - } else { - self.hidden = hidden; - } -} - -- (void)updateAvailableArea:(CGRect)frame { - if (CGRectEqualToRect(self.availableArea, frame)) - return; - // If during our show/hide animation position is changed it is corrupted. - // Such kind of animation has 2 keys (opacity and position). - // But there are other animation cases like change of orientation. - // So we can use condition below: - // if (self.layer.animationKeys.count != 2) - // More elegant way is to check if x values are changed. - // If no - there is no need to update self x values. - if (self.availableArea.origin.x != frame.origin.x || self.availableArea.size.width != frame.size.width) - { - self.availableArea = frame; - [self layoutXPosition:self.hidden]; - } - else - self.availableArea = frame; - [self setNeedsLayout]; -} - -- (CGFloat)availableHeight { - return self.availableArea.size.height - kButtonsTopOffset - kButtonsBottomOffset; -} - -- (CGFloat)topBound { - return self.availableArea.origin.y + kButtonsTopOffset; -} -- (CGFloat)bottomBound { - auto const area = self.availableArea; - return area.origin.y + area.size.height - kButtonsBottomOffset; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib deleted file mode 100644 index c317aa632..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingButtonViewController.swift b/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingButtonViewController.swift deleted file mode 100644 index 33a07c247..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingButtonViewController.swift +++ /dev/null @@ -1,157 +0,0 @@ -final class TrackRecordingButtonViewController: MWMViewController { - - private enum Constants { - static let buttonDiameter = CGFloat(48) - static let topOffset = CGFloat(6) - static let trailingOffset = CGFloat(10) - static let blinkingDuration = 1.0 - static let color: (lighter: UIColor, darker: UIColor) = (.red, .red.darker(percent: 0.3)) - } - - private let trackRecordingManager: TrackRecordingManager = .shared - private let button = BottomTabBarButton() - private var blinkingTimer: Timer? - private var topConstraint = NSLayoutConstraint() - private var trailingConstraint = NSLayoutConstraint() - private var state: TrackRecordingButtonState = .hidden - - private static var availableArea: CGRect = .zero - private static var topConstraintValue: CGFloat { - availableArea.origin.y + Constants.topOffset - } - private static var trailingConstraintValue: CGFloat { - -(UIScreen.main.bounds.maxX - availableArea.maxX + Constants.trailingOffset) - } - - @objc - init() { - super.init(nibName: nil, bundle: nil) - let ownerViewController = MapViewController.shared() - ownerViewController?.addChild(self) - ownerViewController?.controlsView.addSubview(view) - self.setupView() - self.layout() - self.startTimer() - } - - @available(*, unavailable) - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func viewDidLoad() { - super.viewDidLoad() - setState(self.state, completion: nil) - } - - // MARK: - Public methods - - @objc - func setState(_ state: TrackRecordingButtonState, completion: (() -> Void)?) { - self.state = state - switch state { - case .visible: - setHidden(false, completion: nil) - case .hidden: - setHidden(true, completion: completion) - case .closed: - close(completion: completion) - @unknown default: - fatalError() - } - } - - // MARK: - Private methods - - private func setupView() { - view.translatesAutoresizingMaskIntoConstraints = false - view.addSubview(button) - - button.setStyleAndApply(.trackRecordingWidgetButton) - button.tintColor = Constants.color.darker - button.translatesAutoresizingMaskIntoConstraints = false - button.setImage(UIImage(resource: .icMenuBookmarkTrackRecording), for: .normal) - button.addTarget(self, action: #selector(didTap), for: .touchUpInside) - button.isHidden = true - } - - private func layout() { - guard let superview = view.superview else { return } - topConstraint = view.topAnchor.constraint(equalTo: superview.topAnchor, constant: Self.topConstraintValue) - trailingConstraint = view.trailingAnchor.constraint(equalTo: superview.trailingAnchor, constant: Self.trailingConstraintValue) - NSLayoutConstraint.activate([ - topConstraint, - trailingConstraint, - view.widthAnchor.constraint(equalToConstant: Constants.buttonDiameter), - view.heightAnchor.constraint(equalToConstant: Constants.buttonDiameter), - - button.leadingAnchor.constraint(equalTo: view.leadingAnchor), - button.trailingAnchor.constraint(equalTo: view.trailingAnchor), - button.topAnchor.constraint(equalTo: view.topAnchor), - button.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) - } - - private func updateLayout() { - guard let superview = view.superview else { return } - superview.animateConstraints { - self.topConstraint.constant = Self.topConstraintValue - self.trailingConstraint.constant = Self.trailingConstraintValue - } - } - - private func startTimer() { - guard blinkingTimer == nil else { return } - var lighter = false - let timer = Timer.scheduledTimer(withTimeInterval: Constants.blinkingDuration, repeats: true) { [weak self] _ in - guard let self = self else { return } - UIView.animate(withDuration: Constants.blinkingDuration, animations: { - self.button.tintColor = lighter ? Constants.color.lighter : Constants.color.darker - lighter.toggle() - }) - } - blinkingTimer = timer - RunLoop.current.add(timer, forMode: .common) - } - - private func stopTimer() { - blinkingTimer?.invalidate() - blinkingTimer = nil - } - - private func setHidden(_ hidden: Bool, completion: (() -> Void)?) { - UIView.transition(with: self.view, - duration: kDefaultAnimationDuration, - options: .transitionCrossDissolve, - animations: { - self.button.isHidden = hidden - }) { _ in - completion?() - } - } - - private func close(completion: (() -> Void)?) { - stopTimer() - setHidden(true) { [weak self] in - guard let self else { return } - self.removeFromParent() - self.view.removeFromSuperview() - completion?() - } - } - - static func updateAvailableArea(_ frame: CGRect) { - availableArea = frame - guard let button = MapViewController.shared()?.controlsManager.trackRecordingButton else { return } - DispatchQueue.main.async { - button.updateLayout() - } - } - - // MARK: - Actions - - @objc - private func didTap(_ sender: Any) { - MapViewController.shared()?.showTrackRecordingPlacePage() - } -} diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h deleted file mode 100644 index f17ca3efc..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h +++ /dev/null @@ -1,11 +0,0 @@ -#import "MWMViewController.h" - -@interface MWMTrafficButtonViewController : MWMViewController - -+ (MWMTrafficButtonViewController *)controller; - -@property(nonatomic) BOOL hidden; - -+ (void)updateAvailableArea:(CGRect)frame; - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm deleted file mode 100644 index ec7aad922..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ /dev/null @@ -1,216 +0,0 @@ -#import "MWMTrafficButtonViewController.h" - -#import - -#import "MWMAlertViewController.h" -#import "MWMButton.h" -#import "MWMMapViewControlsCommon.h" -#import "MWMMapViewControlsManager.h" -#import "MapViewController.h" -#import "SwiftBridge.h" -#import "base/assert.hpp" - -namespace { -CGFloat const kTopOffset = 6; - -NSArray *imagesWithName(NSString *name) { - NSUInteger const imagesCount = 3; - NSMutableArray *images = [NSMutableArray arrayWithCapacity:imagesCount]; - NSString *mode = [UIColor isNightMode] ? @"dark" : @"light"; - for (NSUInteger i = 1; i <= imagesCount; i += 1) { - NSString *imageName = [NSString stringWithFormat:@"%@_%@_%@", name, mode, @(i).stringValue]; - [images addObject:static_cast([UIImage imageNamed:imageName])]; - } - return [images copy]; -} -} // namespace - -@interface MWMMapViewControlsManager () - -@property(nonatomic) MWMTrafficButtonViewController *trafficButton; - -@end - -@interface MWMTrafficButtonViewController () - -@property(nonatomic) NSLayoutConstraint *topOffset; -@property(nonatomic) NSLayoutConstraint *leftOffset; -@property(nonatomic) CGRect availableArea; - -@end - -@implementation MWMTrafficButtonViewController - -+ (MWMTrafficButtonViewController *)controller { - return [MWMMapViewControlsManager manager].trafficButton; -} - -- (instancetype)init { - self = [super init]; - if (self) { - MapViewController *ovc = [MapViewController sharedController]; - [ovc addChildViewController:self]; - [ovc.controlsView addSubview:self.view]; - [self configLayout]; - [self applyTheme]; - [StyleManager.shared addListener:self]; - [MWMMapOverlayManager addObserver:self]; - } - return self; -} - -- (void)dealloc { - [StyleManager.shared removeListener:self]; -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - [Toast hideAll]; -} - -- (void)configLayout { - UIView *sv = self.view; - UIView *ov = sv.superview; - - self.topOffset = [sv.topAnchor constraintEqualToAnchor:ov.topAnchor constant:kTopOffset]; - self.topOffset.active = YES; - self.leftOffset = [sv.leadingAnchor constraintEqualToAnchor:ov.leadingAnchor constant:kViewControlsOffsetToBounds]; - self.leftOffset.active = YES; -} - -- (void)setHidden:(BOOL)hidden { - _hidden = hidden; - [self refreshLayout]; -} - -- (void)refreshLayout { - dispatch_async(dispatch_get_main_queue(), ^{ - auto const availableArea = self.availableArea; - auto const fitInAvailableArea = CGRectGetMaxY(self.view.frame) < CGRectGetMaxY(availableArea) + kTopOffset; - auto const shouldHide = self.hidden || !fitInAvailableArea; - auto const leftOffset = shouldHide ? -self.view.width : availableArea.origin.x + kViewControlsOffsetToBounds; - self.topOffset.constant = availableArea.origin.y + kTopOffset; - self.leftOffset.constant = leftOffset; - self.view.alpha = shouldHide ? 0 : 1; - }); -} - -- (void)handleTrafficState:(MWMMapOverlayTrafficState)state { - MWMButton *btn = (MWMButton *)self.view; - UIImageView *iv = btn.imageView; - switch (state) { - case MWMMapOverlayTrafficStateDisabled: - CHECK(false, ("Incorrect traffic manager state.")); - break; - case MWMMapOverlayTrafficStateEnabled: - btn.imageName = @"btn_traffic_on"; - break; - case MWMMapOverlayTrafficStateWaitingData: - iv.animationImages = imagesWithName(@"btn_traffic_update"); - iv.animationDuration = 0.8; - [iv startAnimating]; - break; - case MWMMapOverlayTrafficStateOutdated: - btn.imageName = @"btn_traffic_outdated"; - break; - case MWMMapOverlayTrafficStateNoData: - btn.imageName = @"btn_traffic_on"; - [Toast showWithText:L(@"traffic_data_unavailable")]; - break; - case MWMMapOverlayTrafficStateNetworkError: - [MWMMapOverlayManager setTrafficEnabled:NO]; - [[MWMAlertViewController activeAlertController] presentNoConnectionAlert]; - break; - case MWMMapOverlayTrafficStateExpiredData: - btn.imageName = @"btn_traffic_outdated"; - [Toast showWithText:L(@"traffic_update_maps_text")]; - break; - case MWMMapOverlayTrafficStateExpiredApp: - btn.imageName = @"btn_traffic_outdated"; - [Toast showWithText:L(@"traffic_update_app_message")]; - break; - } -} - -- (void)handleIsolinesState:(MWMMapOverlayIsolinesState)state { - switch (state) { - case MWMMapOverlayIsolinesStateDisabled: - break; - case MWMMapOverlayIsolinesStateEnabled: - if (![MWMMapOverlayManager isolinesVisible]) - [Toast showWithText:L(@"isolines_toast_zooms_1_10")]; - break; - case MWMMapOverlayIsolinesStateExpiredData: - [MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_activation_error_dialog")]; - [MWMMapOverlayManager setIsoLinesEnabled:NO]; - break; - case MWMMapOverlayIsolinesStateNoData: - [MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_location_error_dialog")]; - [MWMMapOverlayManager setIsoLinesEnabled:NO]; - break; - } -} - -- (void)applyTheme { - MWMButton *btn = static_cast(self.view); - UIImageView *iv = btn.imageView; - - // Traffic state machine: https://confluence.mail.ru/pages/viewpage.action?pageId=103680959 - [iv stopAnimating]; - if ([MWMMapOverlayManager trafficEnabled]) { - [self handleTrafficState:[MWMMapOverlayManager trafficState]]; - } else if ([MWMMapOverlayManager transitEnabled]) { - btn.imageName = @"btn_subway_on"; - if ([MWMMapOverlayManager transitState] == MWMMapOverlayTransitStateNoData) - [Toast showWithText:L(@"subway_data_unavailable")]; - } else if ([MWMMapOverlayManager isoLinesEnabled]) { - btn.imageName = @"btn_isoMap_on"; - [self handleIsolinesState:[MWMMapOverlayManager isolinesState]]; - } else if ([MWMMapOverlayManager outdoorEnabled]) { - btn.imageName = @"btn_isoMap_on"; - } else { - btn.imageName = @"btn_layers"; - } -} - -- (IBAction)buttonTouchUpInside { - BOOL needsToDisableMapLayer = - [MWMMapOverlayManager trafficEnabled] || - [MWMMapOverlayManager transitEnabled] || - [MWMMapOverlayManager isoLinesEnabled] || - [MWMMapOverlayManager outdoorEnabled]; - - if (needsToDisableMapLayer) { - [MWMMapOverlayManager setTrafficEnabled:NO]; - [MWMMapOverlayManager setTransitEnabled:NO]; - [MWMMapOverlayManager setIsoLinesEnabled:NO]; - [MWMMapOverlayManager setOutdoorEnabled:NO]; - } else { - MWMMapViewControlsManager.manager.menuState = MWMBottomMenuStateLayers; - } -} - -+ (void)updateAvailableArea:(CGRect)frame { - auto controller = [self controller]; - if (CGRectEqualToRect(controller.availableArea, frame)) - return; - controller.availableArea = frame; - [controller refreshLayout]; -} - -#pragma mark - MWMMapOverlayManagerObserver - -- (void)onTrafficStateUpdated { - [self applyTheme]; -} -- (void)onTransitStateUpdated { - [self applyTheme]; -} -- (void)onIsoLinesStateUpdated { - [self applyTheme]; -} -- (void)onOutdoorStateUpdated { - [self applyTheme]; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib deleted file mode 100644 index 044bc8658..000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index a7a4be5c0..34e629091 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -313,8 +313,8 @@ - (void)setState:(MWMNavigationDashboardState)state { _state = state; [[MapViewController sharedController] updateStatusBarStyle]; // Restore bottom buttons only if they were not already hidden by tapping anywhere on an empty map. - if (!MWMMapViewControlsManager.manager.hidden) - BottomTabBarViewController.controller.isHidden = state != MWMNavigationDashboardStateHidden; + if (!MWMMapViewControlsManager.manager.hidden) + MapControls.areMapControlsHidden = state != MWMNavigationDashboardStateHidden; } @synthesize routePreview = _routePreview; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index 20e7005f1..134750b03 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -55,6 +55,7 @@ @interface MWMNavigationInfoView () @property(weak, nonatomic) IBOutlet UIView *streetNameView; @property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameTopOffsetConstraint; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameTrailingOffsetConstraint; @property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameViewHideOffset; @property(weak, nonatomic) IBOutlet UILabel *streetNameLabel; @property(weak, nonatomic) IBOutlet UIView *turnsView; @@ -219,7 +220,7 @@ - (void)collapseSearchOnTimer { } - (void)layoutSearch { - BOOL const defaultView = defaultOrientation(self.availableArea.size); + BOOL const defaultView = !UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation); CGFloat alpha = 0; CGFloat searchButtonsSideSize = 0; self.searchButtonsViewWidth.constant = 0; @@ -231,6 +232,10 @@ - (void)layoutSearch { defaultView ? kSearchButtonsViewWidthPortrait : kSearchButtonsViewWidthLandscape; self.searchButtonsViewHeight.constant = defaultView ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape; + self.searchButtonsView.layer.cornerRadius = (!UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation) ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape) / 2; + if (@available(iOS 13.0, *)) { + self.searchButtonsView.layer.cornerCurve = kCACornerCurveContinuous; + } } for (UIButton *searchButton in self.searchButtons) searchButton.alpha = alpha; @@ -331,11 +336,12 @@ - (void)configLayout { self.topConstraint.active = YES; self.leftConstraint = [self.leadingAnchor constraintEqualToAnchor:ov.leadingAnchor]; self.leftConstraint.active = YES; - self.widthConstraint = [self.widthAnchor constraintEqualToConstant:ov.frame.size.width]; + self.widthConstraint = [self.widthAnchor constraintEqualToConstant:ov.frame.size.width/2]; self.widthConstraint.active = YES; self.heightConstraint = [self.heightAnchor constraintEqualToConstant:ov.frame.size.height]; self.heightConstraint.active = YES; self.streetNameTopOffsetConstraint.constant = self.additionalStreetNameTopOffset; + self.streetNameTrailingOffsetConstraint.constant = (-1 * ov.frame.size.width/2) - 100; } // Additional spacing for devices with a small top safe area (such as SE or when the device is in landscape mode). @@ -354,19 +360,20 @@ - (void)refreshLayout { [self animateConstraintsWithAnimations:^{ self.topConstraint.constant = availableArea.origin.y; self.leftConstraint.constant = availableArea.origin.x + kViewControlsOffsetToBounds; - self.widthConstraint.constant = availableArea.size.width - kViewControlsOffsetToBounds; + self.widthConstraint.constant = availableArea.size.width/2 - kViewControlsOffsetToBounds; self.heightConstraint.constant = availableArea.size.height; [self layoutSearch]; self.turnsTopOffset.constant = availableArea.origin.y > 0 ? kShiftedTurnsTopOffset : kBaseTurnsTopOffset; self.searchButtonsView.layer.cornerRadius = - (defaultOrientation(availableArea.size) ? kSearchButtonsViewHeightPortrait + (!UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation) ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape) / 2; if (@available(iOS 13.0, *)) { self.searchButtonsView.layer.cornerCurve = kCACornerCurveContinuous; } self.streetNameTopOffsetConstraint.constant = self.additionalStreetNameTopOffset; + self.streetNameTrailingOffsetConstraint.constant = (-availableArea.size.width/2) -100; }]; }); } @@ -395,10 +402,7 @@ - (void)setSearchState:(NavigationSearchState)searchState animated:(BOOL)animate SEL const collapseSelector = @selector(collapseSearchOnTimer); [NSObject cancelPreviousPerformRequestsWithTarget:self selector:collapseSelector object:self]; if (self.searchState == NavigationSearchState::Maximized) { - [self.superview bringSubviewToFront:self]; [self performSelector:collapseSelector withObject:self afterDelay:kCollapseSearchTimeout]; - } else { - [self.superview sendSubviewToBack:self]; } } @@ -455,7 +459,7 @@ - (void)setIsVisible:(BOOL)isVisible { NSAssert(sv != nil, @"Superview can't be nil"); if ([sv.subviews containsObject:self]) return; - [sv insertSubview:self atIndex:0]; + [sv insertSubview:self aboveSubview:[MapViewController sharedController].mainView]; [self configLayout]; } [UIView animateWithDuration:kDefaultAnimationDuration diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib index a544a91fc..1e497ca40 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib @@ -1,9 +1,9 @@ - + - + @@ -19,10 +19,10 @@ - + - + @@ -32,7 +32,7 @@ - - - - - - - - - - - - + - - - - + + - - - + - - - @@ -434,12 +443,18 @@ + + + + + + @@ -453,6 +468,7 @@ + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m index 54f462c8e..ba43410de 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m @@ -61,9 +61,9 @@ - (MWMAvailableAreaAffectDirections)sideButtonsAreaAffectDirections return MWMAvailableAreaAffectDirectionsTop; } -#pragma mark - AvailableArea / TrafficButtonArea +#pragma mark - AvailableArea / ModeButtonArea -- (MWMAvailableAreaAffectDirections)trafficButtonAreaAffectDirections +- (MWMAvailableAreaAffectDirections)modeButtonAreaAffectDirections { return MWMAvailableAreaAffectDirectionsTop; } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib index 86699c3a5..2241fe3f3 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib @@ -1,9 +1,9 @@ - + - + @@ -72,39 +72,39 @@ - - - - - - - - - - - - + - - + + + + + + + + + + - + + + + - + - + - + @@ -121,26 +121,25 @@ + - - - + - + + - - + - + @@ -170,10 +169,10 @@ - + - + @@ -189,6 +188,8 @@ + + @@ -375,6 +376,14 @@ + + + + + + + + @@ -384,11 +393,17 @@ + + + + + + @@ -469,6 +484,15 @@ + + + + + + + + + @@ -480,8 +504,14 @@ + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift index 261fc4efb..b9e057973 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift @@ -68,6 +68,10 @@ final class BaseRoutePreviewStatus: SolidTouchView { } } + override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { + return CGRectContainsPoint(self.bounds, point) || CGRectContainsPoint(CGRect(x: self.bounds.origin.x+self.bounds.size.width-68, y: self.bounds.origin.x-68, width: 68, height: self.bounds.size.height + 68), point); + } + private func addView() { guard superview != ownerView else { return } ownerView.addSubview(self) diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift index 84f4a7273..485037fb0 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift @@ -19,6 +19,10 @@ final class TransportRoutePreviewStatus: SolidTouchView { } } } + + override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { + return CGRectContainsPoint(self.bounds, point) || CGRectContainsPoint(CGRect(x: self.bounds.origin.x+self.bounds.size.width-68, y: self.bounds.origin.x-68, width: 68, height: self.bounds.size.height + 68), point); + } private func addView() { guard superview != ownerView else { return } diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index 27e5b6040..760223d9e 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -224,6 +224,7 @@ - (void)updateVisualScaleTo:(CGFloat)visualScale { LOG(LINFO, ("The visual scale is being updated to:", visualScale)); GetFramework().UpdateVisualScale(visualScale); + [_widgetsManager updateLayout]; } - (void)updateVisualScaleToMain @@ -231,6 +232,7 @@ - (void)updateVisualScaleToMain CGFloat const visualScale = UIScreen.mainScreen.scale; LOG(LINFO, ("The visual scale is being updated to the main scale:", visualScale)); GetFramework().UpdateVisualScale(visualScale); + [_widgetsManager updateLayout]; } @end diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index 913c2049d..5a3119322 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -9,7 +9,7 @@ @class SearchOnMapManager; @class SideButtonsArea; @class WidgetsArea; -@class TrafficButtonArea; +@class ModeButtonArea; @class PlacePageArea; @protocol MWMLocationModeListener; @@ -28,9 +28,7 @@ - (void)performAction:(NSString *_Nonnull)action; -- (void)openMenu; - (void)openSettings; -- (void)openAbout; - (void)openMapsDownloader:(MWMMapDownloaderMode)mode; - (void)openEditor; - (void)openBookmarkEditor; @@ -54,12 +52,13 @@ @property(nonatomic) MWMMyPositionMode currentPositionMode; @property(strong, nonatomic) IBOutlet EAGLView * _Nonnull mapView; +@property(strong, nonatomic) IBOutlet UIView * _Nonnull mainView; @property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView; @property(nonatomic) UIView * _Nonnull searchContainer; @property (weak, nonatomic) IBOutlet SideButtonsArea * sideButtonsArea; @property (weak, nonatomic) IBOutlet WidgetsArea * widgetsArea; -@property (weak, nonatomic) IBOutlet TrafficButtonArea * trafficButtonArea; +@property (weak, nonatomic) IBOutlet ModeButtonArea * modeButtonArea; @property (weak, nonatomic) IBOutlet PlacePageArea * placePageArea; @end diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index a81eea9f4..7d66e8ea2 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -38,8 +38,6 @@ NSString *const kDownloaderSegue = @"Map2MapDownloaderSegue"; NSString *const kEditorSegue = @"Map2EditorSegue"; NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; -NSString *const kSettingsSegue = @"Map2Settings"; -NSString *const kAboutSegue = @"Map2About"; } // namespace @interface NSValueWrapper : NSObject @@ -110,7 +108,7 @@ @interface MapViewController () )coordinator { [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [self.alertController viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - [self.controlsManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; } - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection { @@ -375,8 +372,8 @@ - (void)onGetFocus:(BOOL)isOnFocus { - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) - self.controlsManager.menuState = self.controlsManager.menuRestoreState; + if (![MWMRouter isRoutingActive]) + MapControls.areMapControlsHidden = false; [self updateStatusBarStyle]; GetFramework().SetRenderingEnabled(); @@ -421,8 +418,8 @@ - (void)viewDidLoad { MWMMyPositionModeNotFollowNoPosition : MWMMyPositionModePendingPosition]; } - if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) - self.controlsManager.menuState = self.controlsManager.menuRestoreState; + if (![MWMRouter isRoutingActive]) + MapControls.areMapControlsHidden = false; if (self.trackRecordingManager.isActive) [self showTrackRecordingPlacePage]; @@ -503,8 +500,8 @@ - (void)setupTrackPadGestureRecognizers API_AVAILABLE(ios(14.0)) { - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) - self.controlsManager.menuRestoreState = self.controlsManager.menuState; + MapControls.areMapControlsHidden = true; + GetFramework().SetRenderingDisabled(false); } @@ -547,6 +544,15 @@ - (void)initialize { // May be better solution would be multiobservers support in the C++ core. [self processMyPositionStateModeEvent:location_helpers::mwmMyPositionMode(mode)]; }); + + [[MWMStorage sharedStorage] setCheckUpdatesListener:^(MWMCheckUpdatesStatus){ + [NSNotificationCenter.defaultCenter postNotificationName:MapControls.mapUpdatesNotificationName object:nil]; + }]; + + auto runOnPowerManagerChangesFn = [&]() { + [NSNotificationCenter.defaultCenter postNotificationName:Settings.changePowerSavingAdjustmentsNotificationName object:nil]; + }; + f.RunOnPowerManagerChanges(runOnPowerManagerChangesFn); self.userTouchesAction = UserTouchesActionNone; [[MWMBookmarksManager sharedManager] addObserver:self]; @@ -558,6 +564,51 @@ - (void)initialize { [self checkAuthorization]; } }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentSearchNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + if (self.searchManager.isSearching) + [self.searchManager close]; + else + [self.searchManager startSearchingWithIsRouting:NO]; + }); + }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentFavouritesNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self.bookmarksCoordinator open]; + }); + }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentAddPlaceNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self.controlsManager addPlace]; + }); + }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentRecordTrackNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + if (self.trackRecordingManager.isActive) + [self showTrackRecordingPlacePage]; + else + [self.trackRecordingManager startWithMapViewController: self]; + }); + }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentShareLocationNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + if (MWMLocationManager.lastLocation == nil) + [self presentViewController:[UIAlertController unknownCurrentPosition] animated:true completion:nil]; + else + [[MWMActivityViewController shareControllerForMyPosition:MWMLocationManager.lastLocation.coordinate] presentInParentViewController: self anchorView: self.mainView]; + }); + }]; + + [NSNotificationCenter.defaultCenter addObserverForName:MapControls.presentMapDownloadsNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self openMapsDownloader:MWMMapDownloaderModeDownloaded]; + }); + }]; } - (void)dealloc { @@ -574,16 +625,8 @@ - (void)removeListener:(id)listener { } #pragma mark - Open controllers -- (void)openMenu { - [self.controlsManager.tabBarController onMenuButtonPressed:self]; -} - - (void)openSettings { - [self performSegueWithIdentifier:kSettingsSegue sender:nil]; -} - -- (void)openAbout { - [self performSegueWithIdentifier:kAboutSegue sender:nil]; + [NSNotificationCenter.defaultCenter postNotificationName:MapControls.presentSettingsNotificationName object:nil]; } - (void)openMapsDownloader:(MWMMapDownloaderMode)mode { @@ -614,7 +657,6 @@ - (void)openDrivingOptions { - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode { self.currentPositionMode = mode; [MWMLocationManager setMyPositionMode:mode]; - [[MWMSideButtons buttons] processMyPositionStateModeEvent:mode]; NSArray> *objects = self.listeners.allObjects; for (id object in objects) { [object processMyPositionStateModeEvent:mode]; @@ -636,6 +678,7 @@ - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode { self.disableStandbyOnLocationStateMode = YES; break; } + [NSNotificationCenter.defaultCenter postNotificationName:MapControls.switchPositionModeNotificationName object:nil]; } #pragma mark - MWMFrameworkDrapeObserver @@ -782,6 +825,7 @@ - (void)disableCarPlayRepresentation { [[self.mapView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor] setActive:YES]; [[self.mapView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor] setActive:YES]; [[self.mapView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor] setActive:YES]; + self.mainView.hidden = NO; self.controlsView.hidden = NO; [MWMFrameworkHelper setVisibleViewport:self.view.bounds scaleFactor:self.view.contentScaleFactor]; } @@ -794,6 +838,9 @@ - (void)enableCarPlayRepresentation { [[MapsAppDelegate theApp] showMap]; [self loadViewIfNeeded]; [self.mapView removeFromSuperview]; + if (!self.mainView.isHidden) { + self.mainView.hidden = YES; + } if (!self.controlsView.isHidden) { self.controlsView.hidden = YES; } @@ -863,7 +910,6 @@ - (void)showTrackRecordingPlacePage { } PlacePageData * placePageData = [[PlacePageData alloc] initWithTrackInfo:self.trackRecordingManager.trackRecordingInfo elevationInfo:self.trackRecordingManager.trackRecordingElevationProfileData]; - [self.controlsManager setTrackRecordingButtonState:TrackRecordingButtonStateHidden]; [self showOrUpdatePlacePage:placePageData]; [self startObservingTrackRecordingUpdatesForPlacePageData:placePageData]; } @@ -879,12 +925,10 @@ - (void)startObservingTrackRecordingUpdatesForPlacePageData:(PlacePageData *)pla switch (state) { case TrackRecordingStateInactive: [self stopObservingTrackRecordingUpdates]; - [self.controlsManager setTrackRecordingButtonState:TrackRecordingButtonStateClosed]; break; case TrackRecordingStateActive: if (UIApplication.sharedApplication.applicationState != UIApplicationStateActive) return; - [self.controlsManager setTrackRecordingButtonState:TrackRecordingButtonStateHidden]; [placePageData updateWithTrackInfo:trackInfo elevationInfo:elevationData()]; break; @@ -894,8 +938,6 @@ - (void)startObservingTrackRecordingUpdatesForPlacePageData:(PlacePageData *)pla - (void)stopObservingTrackRecordingUpdates { [self.trackRecordingManager removeObserver:self]; - if (self.trackRecordingManager.isActive) - [self.controlsManager setTrackRecordingButtonState:TrackRecordingButtonStateVisible]; } // MARK: - Handle macOS trackpad gestures diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index fbd72a8e7..cff09108c 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -12,8 +12,7 @@ NS_ASSUME_NONNULL_BEGIN UIBackgroundTaskIdentifier m_backgroundTask; } -@property(nonatomic) UIWindow * window; - +@property(nonatomic, readonly) UIWindow * window; @property(nonatomic, readonly) MWMCarPlayService *carplayService API_AVAILABLE(ios(12.0)); @property(nonatomic, readonly) MapViewController * mapViewController; @property(nonatomic, readonly) BOOL isDrapeEngineCreated; @@ -29,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)disableDownloadIndicator; - (void)enableDownloadIndicator; +- (void)handleDidEnterBackground; +- (void)searchText:(NSString *)searchString; - (void)showMap; - (NSUInteger)badgeNumber; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 4c34ae23b..144a330b8 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -1,4 +1,5 @@ #import "MapsAppDelegate.h" +#import "SceneDelegate.h" #import "EAGLView.h" #import "MWMCoreRouterType.h" @@ -22,8 +23,6 @@ #import #import -#include "map/gps_tracker.hpp" - #include "platform/background_downloader_ios.h" #include "platform/http_thread_apple.h" #include "platform/local_country_file_utils.hpp" @@ -105,6 +104,9 @@ - (void)commonInit { } - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [NSUserDefaults.standardUserDefaults setBool:false forKey:@"IsSearchPresented"]; + [NSUserDefaults.standardUserDefaults setDouble:0 forKey:@"SearchAdjustment"]; + NSLog(@"application:didFinishLaunchingWithOptions: %@", launchOptions); [HttpThreadImpl setDownloadIndicatorProtocol:self]; @@ -123,19 +125,19 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( if (![MapsAppDelegate isTestsEnvironment]) [[iCloudSynchronizaionManager shared] start]; - - [[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions]; - // application:openUrl:options is called later for deep links if YES is returned. + return YES; } -- (void)application:(UIApplication *)application - performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem - completionHandler:(void (^)(BOOL))completionHandler { - [self.mapViewController performAction:shortcutItem.type]; - completionHandler(YES); +- (UISceneConfiguration *)application:(UIApplication *)application + configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession + options:(UISceneConnectionOptions *)options { + return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" + sessionRole:connectingSceneSession.role]; } +- (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet *)sceneSessions {} + - (void)runBackgroundTasks:(NSArray *_Nonnull)tasks completionHandler:(void (^_Nullable)(UIBackgroundFetchResult))completionHandler { self.backgroundFetchScheduler = [[MWMBackgroundFetchScheduler alloc] initWithTasks:tasks @@ -152,12 +154,12 @@ - (void)applicationWillTerminate:(UIApplication *)application { DeleteFramework(); } -- (void)applicationDidEnterBackground:(UIApplication *)application { - LOG(LINFO, ("applicationDidEnterBackground - begin")); - [DeepLinkHandler.shared reset]; +- (void)handleDidEnterBackground { + LOG(LINFO, ("handleDidEnterBackground - begin")); if (m_activeDownloadsCounter) { - m_backgroundTask = [application beginBackgroundTaskWithExpirationHandler:^{ - [application endBackgroundTask:self->m_backgroundTask]; + UIApplication * app = UIApplication.sharedApplication; + m_backgroundTask = [app beginBackgroundTaskWithExpirationHandler:^{ + [app endBackgroundTask:self->m_backgroundTask]; self->m_backgroundTask = UIBackgroundTaskInvalid; }]; } @@ -166,66 +168,7 @@ - (void)applicationDidEnterBackground:(UIApplication *)application { [self runBackgroundTasks:tasks completionHandler:nil]; [MWMRouter saveRouteIfNeeded]; - LOG(LINFO, ("applicationDidEnterBackground - end")); -} - -- (void)applicationWillResignActive:(UIApplication *)application { - LOG(LINFO, ("applicationWillResignActive - begin")); - [self.mapViewController onGetFocus:NO]; - auto &f = GetFramework(); - // On some devices we have to free all belong-to-graphics memory - // because of new OpenGL driver powered by Metal. - if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103) { - f.SetRenderingDisabled(true); - f.OnDestroySurface(); - } else { - f.SetRenderingDisabled(false); - } - [MWMLocationManager applicationWillResignActive]; - f.EnterBackground(); - LOG(LINFO, ("applicationWillResignActive - end")); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - LOG(LINFO, ("applicationWillEnterForeground - begin")); - if (!GpsTracker::Instance().IsEnabled()) - return; - - MWMViewController *topVc = - static_cast(self.mapViewController.navigationController.topViewController); - if (![topVc isKindOfClass:[MWMViewController class]]) - return; - - if ([MWMSettings isTrackWarningAlertShown]) - return; - - [topVc.alertController presentTrackWarningAlertWithCancelBlock:^{ - GpsTracker::Instance().SetEnabled(false); - }]; - - [MWMSettings setTrackWarningAlertShown:YES]; - LOG(LINFO, ("applicationWillEnterForeground - end")); -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - LOG(LINFO, ("applicationDidBecomeActive - begin")); - - auto & f = GetFramework(); - f.EnterForeground(); - [self.mapViewController onGetFocus:YES]; - f.SetRenderingEnabled(); - // On some devices we have to free all belong-to-graphics memory - // because of new OpenGL driver powered by Metal. - if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103) { - CGSize const objcSize = self.mapViewController.mapView.pixelSize; - f.OnRecoverSurface(static_cast(objcSize.width), static_cast(objcSize.height), - true /* recreateContextDependentResources */); - } - [MWMLocationManager applicationDidBecomeActive]; - [MWMSearch addCategoriesToSpotlight]; - [MWMKeyboard applicationDidBecomeActive]; - [MWMTextToSpeech applicationDidBecomeActive]; - LOG(LINFO, ("applicationDidBecomeActive - end")); + LOG(LINFO, ("handleDidEnterBackground - end")); } // TODO: Drape enabling and iCloud sync are skipped during the test run due to the app crashing in teardown. This is a temporary solution. Drape should be properly disabled instead of merely skipping the enabling process. @@ -236,25 +179,6 @@ + (BOOL)isTestsEnvironment { return isTests; } -- (BOOL)application:(UIApplication *)application - continueUserActivity:(NSUserActivity *)userActivity - restorationHandler:(void (^)(NSArray> *_Nullable))restorationHandler { - if ([userActivity.activityType isEqualToString:CSSearchableItemActionType]) { - NSString *searchStringKey = userActivity.userInfo[CSSearchableItemActivityIdentifier]; - NSString *searchString = L(searchStringKey); - if (searchString) { - [self searchText:searchString]; - return YES; - } - } else if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] && - userActivity.webpageURL != nil) { - LOG(LINFO, ("application:continueUserActivity:restorationHandler: %@", userActivity.webpageURL)); - return [DeepLinkHandler.shared applicationDidReceiveUniversalLink:userActivity.webpageURL]; - } - - return NO; -} - - (void)disableDownloadIndicator { --m_activeDownloadsCounter; if (m_activeDownloadsCounter <= 0) { @@ -286,15 +210,9 @@ + (void)customizeAppearance { textField.keyboardAppearance = [UIColor isNightMode] ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault; } -- (BOOL)application:(UIApplication *)app - openURL:(NSURL *)url - options:(NSDictionary *)options { - NSLog(@"application:openURL: %@ options: %@", url, options); - return [DeepLinkHandler.shared applicationDidOpenUrl:url]; -} - - (void)showMap { - [(UINavigationController *)self.window.rootViewController popToRootViewControllerAnimated:YES]; + UIWindow * window = [self activeSceneDelegate].window; + [(UINavigationController *)window.rootViewController popToRootViewControllerAnimated:YES]; } - (void)updateApplicationIconBadgeNumber { @@ -303,7 +221,6 @@ - (void)updateApplicationIconBadgeNumber { // Delay init because BottomTabBarViewController.controller is null here. dispatch_async(dispatch_get_main_queue(), ^{ [UIApplication.sharedApplication setApplicationIconBadgeNumber:number]; - BottomTabBarViewController.controller.isApplicationBadgeHidden = (number == 0); }); } @@ -333,8 +250,21 @@ - (void)processCountryEvent:(NSString *)countryId { #pragma mark - Properties +- (SceneDelegate *)activeSceneDelegate { + for (UIScene * scene in UIApplication.sharedApplication.connectedScenes) { + if ([scene.delegate isKindOfClass:[SceneDelegate class]]) + return (SceneDelegate *)scene.delegate; + } + return nil; +} + +- (UIWindow *)window { + return [self activeSceneDelegate].window; +} + - (MapViewController *)mapViewController { - for (id vc in [(UINavigationController *)self.window.rootViewController viewControllers]) { + UIWindow * window = [self activeSceneDelegate].window; + for (id vc in [(UINavigationController *)window.rootViewController viewControllers]) { if ([vc isKindOfClass:[MapViewController class]]) return vc; } diff --git a/iphone/Maps/Classes/SceneDelegate.h b/iphone/Maps/Classes/SceneDelegate.h new file mode 100644 index 000000000..12a34f5e8 --- /dev/null +++ b/iphone/Maps/Classes/SceneDelegate.h @@ -0,0 +1,13 @@ +#pragma once + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface SceneDelegate : UIResponder + +@property(nonatomic, strong) UIWindow * window; + +@end + +NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Classes/SceneDelegate.mm b/iphone/Maps/Classes/SceneDelegate.mm new file mode 100644 index 000000000..15a400421 --- /dev/null +++ b/iphone/Maps/Classes/SceneDelegate.mm @@ -0,0 +1,145 @@ +#import "SceneDelegate.h" + +#import "MapsAppDelegate.h" +#import "MapViewController.h" +#import "MWMKeyboard.h" +#import "MWMLocationManager.h" +#import "MWMSearch+CoreSpotlight.h" +#import "MWMTextToSpeech.h" +#import "SwiftBridge.h" + +#import +#import +#import + +#include "map/gps_tracker.hpp" + +#include "base/assert.hpp" + +@implementation SceneDelegate + +- (void)scene:(UIScene *)scene + willConnectToSession:(UISceneSession *)session + options:(UISceneConnectionOptions *)connectionOptions { + // UIKit automatically creates the UIWindow and root view controller from Main.storyboard + // (configured via UISceneStoryboardFile in UIApplicationSceneManifest). + + // Handle cold-start deep links delivered via URL contexts. + NSURL * launchURL = connectionOptions.URLContexts.anyObject.URL; + if (launchURL) { + [DeepLinkHandler.shared applicationDidFinishLaunching:@{UIApplicationLaunchOptionsURLKey: launchURL}]; + } + + // Handle cold-start universal links delivered via user activities. + for (NSUserActivity * activity in connectionOptions.userActivities) { + if ([activity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] && activity.webpageURL) { + [DeepLinkHandler.shared applicationDidReceiveUniversalLink:activity.webpageURL]; + } + } +} + +- (void)sceneDidBecomeActive:(UIScene *)scene { + LOG(LINFO, ("sceneDidBecomeActive - begin")); + + auto & f = GetFramework(); + f.EnterForeground(); + [self.mapViewController onGetFocus:YES]; + f.SetRenderingEnabled(); + // On some devices we have to free all belong-to-graphics memory + // because of new OpenGL driver powered by Metal. + if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103) { + CGSize const objcSize = self.mapViewController.mapView.pixelSize; + f.OnRecoverSurface(static_cast(objcSize.width), static_cast(objcSize.height), + true /* recreateContextDependentResources */); + } + [MWMLocationManager applicationDidBecomeActive]; + [MWMSearch addCategoriesToSpotlight]; + [MWMKeyboard applicationDidBecomeActive]; + [MWMTextToSpeech applicationDidBecomeActive]; + LOG(LINFO, ("sceneDidBecomeActive - end")); +} + +- (void)sceneWillResignActive:(UIScene *)scene { + LOG(LINFO, ("sceneWillResignActive - begin")); + [self.mapViewController onGetFocus:NO]; + auto & f = GetFramework(); + // On some devices we have to free all belong-to-graphics memory + // because of new OpenGL driver powered by Metal. + if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103) { + f.SetRenderingDisabled(true); + f.OnDestroySurface(); + } else { + f.SetRenderingDisabled(false); + } + [MWMLocationManager applicationWillResignActive]; + f.EnterBackground(); + LOG(LINFO, ("sceneWillResignActive - end")); +} + +- (void)sceneWillEnterForeground:(UIScene *)scene { + LOG(LINFO, ("sceneWillEnterForeground - begin")); + if (!GpsTracker::Instance().IsEnabled()) + return; + + MWMViewController * topVc = + static_cast(self.mapViewController.navigationController.topViewController); + if (![topVc isKindOfClass:[MWMViewController class]]) + return; + + if ([MWMSettings isTrackWarningAlertShown]) + return; + + [topVc.alertController presentTrackWarningAlertWithCancelBlock:^{ + GpsTracker::Instance().SetEnabled(false); + }]; + + [MWMSettings setTrackWarningAlertShown:YES]; + LOG(LINFO, ("sceneWillEnterForeground - end")); +} + +- (void)sceneDidEnterBackground:(UIScene *)scene { + LOG(LINFO, ("sceneDidEnterBackground - begin")); + [DeepLinkHandler.shared reset]; + [MapsAppDelegate.theApp handleDidEnterBackground]; + LOG(LINFO, ("sceneDidEnterBackground - end")); +} + +- (void)scene:(UIScene *)scene openURLContexts:(NSSet *)URLContexts { + for (UIOpenURLContext * context in URLContexts) { + NSLog(@"scene:openURLContexts: %@", context.URL); + [DeepLinkHandler.shared applicationDidOpenUrl:context.URL]; + } +} + +- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity { + if ([userActivity.activityType isEqualToString:CSSearchableItemActionType]) { + NSString * searchStringKey = userActivity.userInfo[CSSearchableItemActivityIdentifier]; + NSString * searchString = L(searchStringKey); + if (searchString) + [MapsAppDelegate.theApp searchText:searchString]; + } else if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] && + userActivity.webpageURL != nil) { + LOG(LINFO, ("scene:continueUserActivity: %@", userActivity.webpageURL)); + [DeepLinkHandler.shared applicationDidReceiveUniversalLink:userActivity.webpageURL]; + } +} + +- (void)windowScene:(UIWindowScene *)windowScene + performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem + completionHandler:(void (^)(BOOL))completionHandler { + [self.mapViewController performAction:shortcutItem.type]; + completionHandler(YES); +} + +#pragma mark - Private + +- (MapViewController *)mapViewController { + for (id vc in [(UINavigationController *)self.window.rootViewController viewControllers]) { + if ([vc isKindOfClass:[MapViewController class]]) + return vc; + } + NSAssert(false, @"Please check the logic"); + return nil; +} + +@end diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 0efd182b9..143dcd569 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -157,7 +157,7 @@ - (void)addToSuperview { if (self.superview) return; MapViewController *controller = self.controller; - [controller.view insertSubview:self aboveSubview:controller.controlsView]; + [controller.view insertSubview:self aboveSubview:controller.mainView]; [[MWMStorage sharedStorage] addObserver:self]; // Center dialog in the parent view. diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h index 78ceb1589..45c3e6e28 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h @@ -7,8 +7,7 @@ - (void)setupWidgets:(Framework::DrapeCreationParams &)p; - (void)resize:(CGSize)size; -- (void)updateAvailableArea:(CGRect)frame; -- (void)updateLayout:(CGRect)frame; -- (void)updateLayoutForAvailableArea; +- (void)updateLayout; +- (void)updatePaddingForTop:(CGFloat)top bottom:(CGFloat)bottom leading:(CGFloat)leading trailing:(CGFloat)trailing; @end diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm index 33444784d..3f6d02eb1 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm @@ -7,6 +7,10 @@ @interface MWMMapWidgets () @property(nonatomic) float visualScale; @property(nonatomic) CGRect availableArea; +@property(nonatomic) CGFloat top; +@property(nonatomic) CGFloat bottom; +@property(nonatomic) CGFloat leading; +@property(nonatomic) CGFloat trailing; @end @@ -23,69 +27,63 @@ + (MWMMapWidgets *)widgetsManager - (void)setupWidgets:(Framework::DrapeCreationParams &)p { self.visualScale = p.m_visualScale; - m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("default"), p.m_visualScale)); + m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("walking"), p.m_visualScale)); m_skin->Resize(p.m_surfaceWidth, p.m_surfaceHeight); m_skin->ForEach( [&p](gui::EWidget widget, gui::Position const & pos) { p.m_widgetsInitInfo[widget] = pos; }); p.m_widgetsInitInfo[gui::WIDGET_SCALE_FPS_LABEL] = gui::Position(m2::PointF(self.visualScale * 10, self.visualScale * 45), dp::LeftTop); + + dispatch_async(dispatch_get_main_queue(), ^{ + [self updateLayout]; + }); } - (void)resize:(CGSize)size { if (m_skin != nullptr) m_skin->Resize(size.width, size.height); + dispatch_async(dispatch_get_main_queue(), ^{ - if ([MWMCarPlayService shared].isCarplayActivated) { - CGRect bounds = [MapViewController sharedController].mapView.bounds; - [self updateLayout: bounds]; - return; - } - [self updateLayoutForAvailableArea]; + [self updateLayout]; }); } -- (void)updateAvailableArea:(CGRect)frame +- (void)updateLayout { - if (CGRectEqualToRect(self.availableArea, frame)) - return; - self.availableArea = frame; - if ([MWMCarPlayService shared].isCarplayActivated) { + if (m_skin == nullptr) return; - } - [self updateLayout:frame]; -} -- (void)updateLayoutForAvailableArea -{ - [self updateLayout:self.availableArea]; -} + auto const visualScale = GetFramework().GetVisualScale(); -- (void)updateLayout:(CGRect)frame -{ - if (m_skin == nullptr) - return; gui::TWidgetsLayoutInfo layout; - auto const vs = self.visualScale; - auto const viewHeight = [MapViewController sharedController].mapView.height; - auto const viewWidth = [MapViewController sharedController].mapView.width; - auto const rulerOffset = - m2::PointF(frame.origin.x * vs, (frame.origin.y + frame.size.height - viewHeight) * vs); - auto const kCompassAdditionalYOffset = [TrackRecordingManager.shared isActive] ? 50 : 0; - auto const compassOffset = - m2::PointF((frame.origin.x + frame.size.width - viewWidth) * vs, (frame.origin.y + kCompassAdditionalYOffset) * vs); - m_skin->ForEach([&](gui::EWidget w, gui::Position const & pos) { - m2::PointF pivot = pos.m_pixelPivot; - switch (w) - { - case gui::WIDGET_RULER: - case gui::WIDGET_COPYRIGHT: pivot += rulerOffset; break; - case gui::WIDGET_COMPASS: pivot += compassOffset; break; - case gui::WIDGET_SCALE_FPS_LABEL: - case gui::WIDGET_CHOOSE_POSITION_MARK: break; - } - layout[w] = pivot; - }); + if ([MWMCarPlayService shared].isCarplayActivated) + { + auto const height = [[MWMCarPlayService shared] windowHeight] + 1000; + layout[gui::WIDGET_SCALE_FPS_LABEL] = m2::PointF(0, 0); + layout[gui::WIDGET_COMPASS] = m2::PointF(18 * visualScale, (height - 66) * visualScale); + layout[gui::WIDGET_COPYRIGHT] = m2::PointF(0, (height - 24) * visualScale); + layout[gui::WIDGET_RULER] = m2::PointF(0, (height - 24) * visualScale); + } + else + { + auto const height = [MapViewController sharedController].mainView.height; + layout[gui::WIDGET_SCALE_FPS_LABEL] = m2::PointF(self.leading * visualScale, self.top * visualScale); + layout[gui::WIDGET_COMPASS] = m2::PointF((self.leading + 18) * visualScale, (height - self.bottom - 66) * visualScale); + layout[gui::WIDGET_COPYRIGHT] = m2::PointF(self.leading * visualScale, (height - self.bottom - 24) * visualScale); + layout[gui::WIDGET_RULER] = m2::PointF(self.leading * visualScale, (height - self.bottom - 24) * visualScale); + } GetFramework().SetWidgetLayout(std::move(layout)); } +- (void)updatePaddingForTop:(CGFloat)top bottom:(CGFloat)bottom leading:(CGFloat)leading trailing:(CGFloat)trailing +{ + if (self.top != top || self.bottom != bottom || self.leading != leading || self.trailing != trailing) { + self.top = top; + self.bottom = bottom; + self.leading = leading; + self.trailing = trailing; + [self updateLayout]; + } +} + @end diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h index 695bc2c5a..d5b452e4b 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h @@ -1,7 +1,6 @@ @interface MWMMapWidgetsHelper : NSObject -+ (void)updateAvailableArea:(CGRect)frame; -+ (void)updateLayout:(CGRect)frame; -+ (void)updateLayoutForAvailableArea; ++ (void)updateLayout; ++ (void)updatePaddingForTop:(CGFloat)top bottom:(CGFloat)bottom leading:(CGFloat)leading trailing:(CGFloat)trailing; @end diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm index 488c7e500..437405168 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm @@ -3,19 +3,14 @@ @implementation MWMMapWidgetsHelper -+ (void)updateAvailableArea:(CGRect)frame ++ (void)updateLayout { - [[MWMMapWidgets widgetsManager] updateAvailableArea:frame]; + [[MWMMapWidgets widgetsManager] updateLayout]; } -+ (void)updateLayout:(CGRect)frame ++ (void)updatePaddingForTop:(CGFloat)top bottom:(CGFloat)bottom leading:(CGFloat)leading trailing:(CGFloat)trailing { - [[MWMMapWidgets widgetsManager] updateLayout:frame]; -} - -+ (void)updateLayoutForAvailableArea -{ - [[MWMMapWidgets widgetsManager] updateLayoutForAvailableArea]; + [[MWMMapWidgets widgetsManager] updatePaddingForTop:top bottom:bottom leading:leading trailing:trailing]; } @end diff --git a/iphone/Maps/CoMaps.plist b/iphone/Maps/CoMaps.plist index 7505d2689..0acdf81f2 100644 --- a/iphone/Maps/CoMaps.plist +++ b/iphone/Maps/CoMaps.plist @@ -134,32 +134,49 @@ UIApplicationShortcutItems - UIApplicationShortcutItemIconFile - ic_3dtouch_search + UIApplicationShortcutItemIconSymbolName + magnifyingglass UIApplicationShortcutItemTitle search UIApplicationShortcutItemType app.comaps.3daction.search - UIApplicationShortcutItemIconFile - ic_3dtouch_bookmarks + UIApplicationShortcutItemIconSymbolName + star.fill UIApplicationShortcutItemTitle bookmarks_and_tracks UIApplicationShortcutItemType app.comaps.3daction.bookmarks - UIApplicationShortcutItemIconFile - ic_3dtouch_planing_route + UIApplicationShortcutItemIconSymbolName + arrow.up.right.diamond UIApplicationShortcutItemTitle route UIApplicationShortcutItemType app.comaps.3daction.route - UIApplicationSupportsMultipleScenes - + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + SceneDelegate + UISceneStoryboardFile + Main + + + + UIBackgroundModes audio diff --git a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift index 6a9a2c279..30c8e76da 100644 --- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift +++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift @@ -121,8 +121,7 @@ } return true case .menu: - MapsAppDelegate.theApp().mapViewController.openMenu() - return true + return false case .settings: MapsAppDelegate.theApp().mapViewController.openSettings() return true diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 07e3e0434..f8b55b747 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -170,6 +170,16 @@ + (void)setType:(MWMRouterType)type { if (type == self.type) return; + if (type == MWMRouterTypePublicTransport) { + [MapControls setModeRawValue:ModePublicTransport]; + } else if (type == MWMRouterTypeVehicle) { + [MapControls setModeRawValue:ModeDriving]; + } else if (type == MWMRouterTypeBicycle) { + [MapControls setModeRawValue:ModeCycling]; + } else if (type == MWMRouterTypePedestrian) { + [MapControls setModeRawValue:ModeWalking]; + } + [self doStop:NO]; GetFramework().GetRoutingManager().SetRouter(coreRouterType(type)); } diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h index da011bfad..9bcb75d63 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.h +++ b/iphone/Maps/Core/Settings/MWMSettings.h @@ -1,9 +1,6 @@ NS_SWIFT_NAME(SettingsBridge) @interface MWMSettings : NSObject -+ (BOOL)buildings3dViewEnabled; -+ (void)setBuildings3dViewEnabled:(BOOL)buildings3dViewEnabled; - + (BOOL)perspectiveViewEnabled; + (void)setPerspectiveViewEnabled:(BOOL)perspectiveViewEnabled; @@ -22,6 +19,7 @@ NS_SWIFT_NAME(SettingsBridge) + (MWMTheme)theme; + (void)setTheme:(MWMTheme)theme; ++ (bool)powerManagementBuildings3d; + (NSInteger)powerManagement; + (void)setPowerManagement:(NSInteger)powerManagement; diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 40f92d59d..16c39ffaf 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -25,27 +25,6 @@ @implementation MWMSettings -+ (BOOL)buildings3dViewEnabled; -{ - bool _ = true, on = true; - GetFramework().Load3dMode(_, on); - if (GetFramework().GetPowerManager().GetScheme() == power_management::Scheme::EconomyMaximum) { - return false; - } else { - return on; - } -} - -+ (void)setBuildings3dViewEnabled:(BOOL)buildings3dViewEnabled; -{ - auto &f = GetFramework(); - bool _ = true, is3dBuildings = true; - f.Load3dMode(_, is3dBuildings); - is3dBuildings = static_cast(buildings3dViewEnabled); - f.Save3dMode(_, is3dBuildings); - f.Allow3dMode(_, is3dBuildings); -} - + (BOOL)perspectiveViewEnabled; { bool _ = true, on = true; @@ -103,7 +82,7 @@ + (void)setMeasurementUnits:(MWMUnits)measurementUnits + (BOOL)zoomButtonsEnabled { - bool enabled = true; + bool enabled = false; UNUSED_VALUE(settings::Get(kZoomButtonsEnabledKey, enabled)); return enabled; } @@ -111,7 +90,6 @@ + (BOOL)zoomButtonsEnabled + (void)setZoomButtonsEnabled:(BOOL)zoomButtonsEnabled { settings::Set(kZoomButtonsEnabledKey, static_cast(zoomButtonsEnabled)); - [MWMMapViewControlsManager manager].zoomHidden = !zoomButtonsEnabled; } + (MWMTheme)theme @@ -141,6 +119,11 @@ + (void)setTheme:(MWMTheme)theme [MWMThemeManager invalidate]; } ++ (bool)powerManagementBuildings3d +{ + return GetFramework().GetPowerManager().IsFacilityEnabled(Facility::Buildings3d); +} + + (NSInteger)powerManagement { Scheme scheme = GetFramework().GetPowerManager().GetScheme(); diff --git a/iphone/Maps/Core/Theme/Renderers/BottomMenuLayerButtonRenderer.swift b/iphone/Maps/Core/Theme/Renderers/BottomMenuLayerButtonRenderer.swift deleted file mode 100644 index 55ab563e3..000000000 --- a/iphone/Maps/Core/Theme/Renderers/BottomMenuLayerButtonRenderer.swift +++ /dev/null @@ -1,22 +0,0 @@ -extension BottomMenuLayerButton { - @objc override func applyTheme() { - for style in StyleManager.shared.getStyle(styleName) - where !style.isEmpty && !style.hasExclusion(view: self) { - BottomMenuLayerButtonRenderer.render(self, style: style) - } - } -} - -class BottomMenuLayerButtonRenderer { - class func render(_ control: BottomMenuLayerButton, style: Style) { - if let font = style.font { - control.titleLabel.font = font - } - - if let fontColor = style.fontColor { - control.titleLabel.textColor = fontColor - } - - UIImageViewRenderer.render(control.imageView, style: style) - } -} diff --git a/iphone/Maps/Core/Theme/Renderers/UISwitchRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UISwitchRenderer.swift index fca800c16..c9b12958b 100644 --- a/iphone/Maps/Core/Theme/Renderers/UISwitchRenderer.swift +++ b/iphone/Maps/Core/Theme/Renderers/UISwitchRenderer.swift @@ -13,8 +13,5 @@ extension UISwitch { class UISwitchRenderer: UIViewRenderer { class func render(_ control: UISwitch, style: Style) { super.render(control, style: style) - if let onTintColor = style.onTintColor { - control.onTintColor = onTintColor - } } } diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift index 2e1db76f1..fcaedd921 100644 --- a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift +++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift @@ -112,6 +112,18 @@ final class TrackRecordingManager: NSObject { recordingState == .active } + @objc + func start(mapViewController: MapViewController) { + start { result in + switch result { + case .success: + mapViewController.showTrackRecordingPlacePage(); + case .failure: + break + } + } + } + func start(completion: ((StartTrackRecordingResult) -> Void)? = nil) { do { switch recordingState { @@ -228,6 +240,7 @@ extension TrackRecordingManager: TrackRecordingObservable { @objc private func notifyObservers() { + NotificationCenter.default.post(name: MapControls.changeTrackRecordingNotificationName, object: nil) observations.removeAll { $0.observer == nil } observations.forEach { $0.recordingStateDidChangeHandler?(recordingState, trackRecordingInfo, { self.trackRecordingElevationProfileData }) diff --git a/iphone/Maps/Debug Icon.icon/icon.json b/iphone/Maps/Debug Icon.icon/icon.json index c77ae7df3..5e97522e8 100644 --- a/iphone/Maps/Debug Icon.icon/icon.json +++ b/iphone/Maps/Debug Icon.icon/icon.json @@ -1,4 +1,7 @@ { + "features" : [ + "specular-location" + ], "fill" : { "solid" : "srgb:0.97255,0.70588,0.18039,1.00000" }, @@ -25,10 +28,16 @@ } ], "lighting" : "combined", + "refractivity" : { + "depth" : 0, + "enabled" : false, + "strength" : 0.5 + }, "shadow" : { "kind" : "neutral", "opacity" : 0.5 }, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.5 @@ -65,7 +74,7 @@ "kind" : "neutral", "opacity" : 0.5 }, - "specular" : true, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.4 @@ -90,10 +99,16 @@ } ], "lighting" : "combined", + "refractivity" : { + "depth" : 0, + "enabled" : false, + "strength" : 0.5 + }, "shadow" : { "kind" : "neutral", "opacity" : 0.5 }, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.5 @@ -126,7 +141,7 @@ "kind" : "neutral", "opacity" : 0.5 }, - "specular" : true, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.3 diff --git a/iphone/Maps/Icon.icon/icon.json b/iphone/Maps/Icon.icon/icon.json index b14fa142e..c29fbf245 100644 --- a/iphone/Maps/Icon.icon/icon.json +++ b/iphone/Maps/Icon.icon/icon.json @@ -1,4 +1,7 @@ { + "features" : [ + "specular-location" + ], "fill" : { "solid" : "srgb:0.34510,0.50588,0.34118,1.00000" }, @@ -29,6 +32,7 @@ "kind" : "neutral", "opacity" : 0.5 }, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.5 @@ -65,7 +69,7 @@ "kind" : "neutral", "opacity" : 0.5 }, - "specular" : true, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.3 @@ -94,6 +98,7 @@ "kind" : "neutral", "opacity" : 0.5 }, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.5 @@ -122,11 +127,12 @@ } ], "lighting" : "combined", + "name" : "Group", "shadow" : { "kind" : "neutral", "opacity" : 0.5 }, - "specular" : true, + "specular" : "inside", "translucency" : { "enabled" : true, "value" : 0.3 diff --git a/iphone/Maps/Images.xcassets/3D touch/Contents.json b/iphone/Maps/Images.xcassets/3D touch/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/iphone/Maps/Images.xcassets/3D touch/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/Contents.json b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/Contents.json deleted file mode 100644 index 7fca9c5da..000000000 --- a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_3dtouch_bookmarks.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/ic_3dtouch_bookmarks.pdf b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/ic_3dtouch_bookmarks.pdf deleted file mode 100644 index 7c1bb5120..000000000 Binary files a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_bookmarks.imageset/ic_3dtouch_bookmarks.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/Contents.json b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/Contents.json deleted file mode 100644 index 8d0bd83ed..000000000 --- a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_3dtouch_planing_route.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/ic_3dtouch_planing_route.pdf b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/ic_3dtouch_planing_route.pdf deleted file mode 100644 index 682420a9d..000000000 Binary files a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_planing_route.imageset/ic_3dtouch_planing_route.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/Contents.json b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/Contents.json deleted file mode 100644 index 81b0a19bb..000000000 --- a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_3dtouch_search.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/ic_3dtouch_search.pdf b/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/ic_3dtouch_search.pdf deleted file mode 100644 index 424811e0a..000000000 Binary files a/iphone/Maps/Images.xcassets/3D touch/ic_3dtouch_search.imageset/ic_3dtouch_search.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Interface/Layer Colors/Buildings 3D.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Buildings 3D.colorset/Contents.json new file mode 100644 index 000000000..db1b3f258 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Buildings 3D.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x58", + "green" : "0x5D", + "red" : "0x5D" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x74", + "green" : "0x7C", + "red" : "0x7C" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Contents.json b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Contents.json similarity index 100% rename from iphone/Maps/Images.xcassets/Interface/Main Buttons/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Layer Colors/Contents.json diff --git a/iphone/Maps/Images.xcassets/Interface/Layer Colors/Contour Lines.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Contour Lines.colorset/Contents.json new file mode 100644 index 000000000..74634567c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Contour Lines.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x58", + "green" : "0x63", + "red" : "0x7F" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x59", + "green" : "0x62", + "red" : "0x72" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Layer Colors/Outdoor.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Outdoor.colorset/Contents.json new file mode 100644 index 000000000..a9d40c68c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Layer Colors/Outdoor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x49", + "green" : "0x61", + "red" : "0x49" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x78", + "green" : "0x81", + "red" : "0x78" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/Contents.json deleted file mode 100644 index 26a166d32..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "ic_track_recording_off.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/ic_track_recording_off.svg b/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/ic_track_recording_off.svg deleted file mode 100644 index b7429d9c3..000000000 --- a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Record Track.imageset/ic_track_recording_off.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Color.colorset/Contents.json new file mode 100644 index 000000000..85fc43698 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.940", + "blue" : "0xF4", + "green" : "0xF8", + "red" : "0xF9" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.940", + "blue" : "0x27", + "green" : "0x28", + "red" : "0x28" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Glow Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Glow Color.colorset/Contents.json new file mode 100644 index 000000000..c32090be1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Background Glow Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.900", + "blue" : "0xF9", + "green" : "0xFD", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.900", + "blue" : "0x22", + "green" : "0x23", + "red" : "0x23" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Map Buttons/Border Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Border Color.colorset/Contents.json new file mode 100644 index 000000000..d62ee1838 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Border Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.720", + "blue" : "0xEF", + "green" : "0xF3", + "red" : "0xF4" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.720", + "blue" : "0x31", + "green" : "0x32", + "red" : "0x33" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Contents.json b/iphone/Maps/Images.xcassets/Interface/Map Buttons/Contents.json similarity index 100% rename from iphone/Maps/Images.xcassets/Interface/Main Buttons/Left Button/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Map Buttons/Contents.json diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Contents.json similarity index 52% rename from iphone/Maps/Images.xcassets/Layers/Menu/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Mode Colors/Contents.json index 73c00596a..6e965652d 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Contents.json @@ -2,5 +2,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "provides-namespace" : true } } diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Color.colorset/Contents.json new file mode 100644 index 000000000..ac32c9301 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xAD", + "green" : "0x5C", + "red" : "0x68" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x99", + "green" : "0x53", + "red" : "0x53" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Color.colorset/Contents.json new file mode 100644 index 000000000..c5a44429c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x12", + "green" : "0x8C", + "red" : "0xE2" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x2E", + "green" : "0x7A", + "red" : "0xB4" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Color.colorset/Contents.json new file mode 100644 index 000000000..09ea50fd1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Color.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x7A", + "green" : "0x50", + "red" : "0x25" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Walking Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Walking Color.colorset/Contents.json new file mode 100644 index 000000000..9b7aff5fc --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Walking Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x44", + "green" : "0xA1", + "red" : "0x8C" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x43", + "green" : "0x79", + "red" : "0x6F" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/Contents.json similarity index 60% rename from iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/Contents.json index 207081e5c..8b43748ff 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "guides_default.pdf", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "cycling.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/cycling.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/cycling.svg new file mode 100644 index 000000000..12efe6ed2 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/cycling.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from cycling + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/Contents.json similarity index 60% rename from iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/Contents.json index cc95c70cf..ae3c457c2 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "traffic_default.pdf", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "download.badge.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/download.badge.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/download.badge.svg new file mode 100644 index 000000000..5f5f20a46 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/download.badge.symbolset/download.badge.svg @@ -0,0 +1,120 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/Contents.json similarity index 60% rename from iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/Contents.json index 195b8da6b..1060a8452 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "ic_layer_subway.svg", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "download.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/download.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/download.svg new file mode 100644 index 000000000..5bec254bf --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/download.symbolset/download.svg @@ -0,0 +1,108 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from download + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/Contents.json similarity index 59% rename from iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/Contents.json index ab4e30aad..1c00c9d88 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "ic_layer_contours.svg", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "driving.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/driving.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/driving.svg new file mode 100644 index 000000000..5a3a1ad2d --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/driving.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from driving + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/Contents.json new file mode 100644 index 000000000..82ab0a211 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "hiking.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/hiking.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/hiking.svg new file mode 100644 index 000000000..026c596f8 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/hiking.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from hiking + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/Contents.json new file mode 100644 index 000000000..2633cb238 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.buildings3d.badge.bolt.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/layer.buildings3d.badge.bolt.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/layer.buildings3d.badge.bolt.svg new file mode 100644 index 000000000..ad73f5445 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.bolt.symbolset/layer.buildings3d.badge.bolt.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from layer.buildings3d.badge.bolt + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/Contents.json new file mode 100644 index 000000000..0ffb449e6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.buildings3d.badge.checkmark.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/layer.buildings3d.badge.checkmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/layer.buildings3d.badge.checkmark.svg new file mode 100644 index 000000000..5f9bbb2c1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.checkmark.symbolset/layer.buildings3d.badge.checkmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/Contents.json new file mode 100644 index 000000000..67e1a96f6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.buildings3d.badge.xmark.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/layer.buildings3d.badge.xmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/layer.buildings3d.badge.xmark.svg new file mode 100644 index 000000000..71b0a4ef2 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.buildings3d.badge.xmark.symbolset/layer.buildings3d.badge.xmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/Contents.json new file mode 100644 index 000000000..1224365a2 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.contourlines.badge.checkmark.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/layer.contourlines.badge.checkmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/layer.contourlines.badge.checkmark.svg new file mode 100644 index 000000000..c688c99e9 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.checkmark.symbolset/layer.contourlines.badge.checkmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/Contents.json new file mode 100644 index 000000000..ec5d4bef7 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.contourlines.badge.xmark.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/layer.contourlines.badge.xmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/layer.contourlines.badge.xmark.svg new file mode 100644 index 000000000..67e450d4d --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.contourlines.badge.xmark.symbolset/layer.contourlines.badge.xmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/Contents.json new file mode 100644 index 000000000..d096e4542 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "layer.outdoor.badge.checkmark.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/layer.outdoor.badge.checkmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/layer.outdoor.badge.checkmark.svg new file mode 100644 index 000000000..f772908e1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.checkmark.symbolset/layer.outdoor.badge.checkmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/Contents.json similarity index 56% rename from iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/Contents.json index 8845a2562..4169f0bca 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "ic_layer_outdoor_lake.svg", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "layer.outdoor.badge.xmark.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/layer.outdoor.badge.xmark.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/layer.outdoor.badge.xmark.svg new file mode 100644 index 000000000..effdb6a0c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/layer.outdoor.badge.xmark.symbolset/layer.outdoor.badge.xmark.svg @@ -0,0 +1,121 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/Contents.json new file mode 100644 index 000000000..8b0d7b1e9 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "more.badge.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/more.badge.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/more.badge.svg new file mode 100644 index 000000000..7f6c87ce9 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/more.badge.symbolset/more.badge.svg @@ -0,0 +1,127 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/Contents.json new file mode 100644 index 000000000..3fda3cd17 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "more.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/more.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/more.svg new file mode 100644 index 000000000..de243a963 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/more.symbolset/more.svg @@ -0,0 +1,115 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from more + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/Contents.json new file mode 100644 index 000000000..eefbfae2a --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "publictransport.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/publictransport.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/publictransport.svg new file mode 100644 index 000000000..8c8921f51 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/publictransport.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from publictransport + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/Contents.json new file mode 100644 index 000000000..ac41a9f0c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/Contents.json @@ -0,0 +1,15 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "symbol-rendering-intent" : "multicolor" + }, + "symbols" : [ + { + "filename" : "track.badge.record.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/track.badge.record.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/track.badge.record.svg new file mode 100644 index 000000000..9fc79e079 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/track.badge.record.symbolset/track.badge.record.svg @@ -0,0 +1,115 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg index dedc393e5..e422923bf 100644 --- a/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/track.symbolset/track.svg @@ -4,14 +4,14 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - + @@ -59,7 +59,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" Symbols should be outlined when exporting to ensure the design is preserved when submitting to Xcode. Template v.7.0 - Requires Xcode 17 or greater + Requires Xcode 26 or greater Generated from track Typeset at 100.0 points Small @@ -83,7 +83,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" - + @@ -91,13 +91,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" - + - + - + diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/Contents.json new file mode 100644 index 000000000..9a538a6c2 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/Contents.json @@ -0,0 +1,12 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "walking.svg", + "idiom" : "universal" + } + ] +} diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/walking.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/walking.svg new file mode 100644 index 000000000..98bb205a6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/walking.symbolset/walking.svg @@ -0,0 +1,103 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.7.0 + Requires Xcode 26 or greater + Generated from walking + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/Layers/Contents.json b/iphone/Maps/Images.xcassets/Layers/Contents.json index da4a164c9..73c00596a 100644 --- a/iphone/Maps/Images.xcassets/Layers/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/Contents.json deleted file mode 100644 index d43d0a905..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/btn_isoMap_on_dark.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/btn_isoMap_on_dark.pdf deleted file mode 100644 index fd9d81489..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/btn_isoMap_on_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 9002a87f3..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_highlighted_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf deleted file mode 100644 index 30c9fbb59..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 606912c62..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf deleted file mode 100644 index 7e07c5c84..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json deleted file mode 100644 index d8aa72c11..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf deleted file mode 100644 index db501a2e2..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf deleted file mode 100644 index 05586fa7c..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/ic_layer_contours.svg b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/ic_layer_contours.svg deleted file mode 100644 index 5952761cb..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/ic_layer_contours.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - 1 - - - 5 - - - 0 - - - 0 - - - - - - - - - - diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/ic_layer_outdoor_lake.svg b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/ic_layer_outdoor_lake.svg deleted file mode 100644 index dc777524b..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/ic_layer_outdoor_lake.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/ic_layer_subway.svg b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/ic_layer_subway.svg deleted file mode 100644 index 5ca70e41b..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/ic_layer_subway.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/traffic_default.pdf b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/traffic_default.pdf deleted file mode 100644 index 0e39e5a02..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/traffic_default.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/Contents.json deleted file mode 100644 index db2e7e841..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/btn_subway_on_dark.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/btn_subway_on_dark.pdf deleted file mode 100644 index e97ff8e45..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/btn_subway_on_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index e534edfc2..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_highlighted_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf deleted file mode 100644 index 78fed7434..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 236598c31..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf deleted file mode 100644 index 96837c9d5..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json deleted file mode 100644 index ad690c8a7..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf deleted file mode 100644 index 0efeae5c8..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png deleted file mode 100644 index f99a2955f..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png deleted file mode 100644 index 4819ab6c0..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png deleted file mode 100644 index 0e83883b9..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 13cc4fdf7..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png deleted file mode 100644 index 84d9b74fb..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png deleted file mode 100644 index 5fd8d594e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png deleted file mode 100644 index 68593e5bd..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 8ef97ce1a..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png deleted file mode 100644 index 434d701d8..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png deleted file mode 100644 index 0b4169d0e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png deleted file mode 100644 index b42cc49dc..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png deleted file mode 100644 index 83f5e4e65..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png deleted file mode 100644 index 02c7e37cb..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png deleted file mode 100644 index 96b416c63..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json deleted file mode 100644 index 374ddef47..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png deleted file mode 100644 index 30d0cd817..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png deleted file mode 100644 index d73af0251..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png deleted file mode 100644 index 4757ee879..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json deleted file mode 100644 index efa4725ba..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png deleted file mode 100644 index c90e58328..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png deleted file mode 100644 index 0b3a086dd..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png deleted file mode 100644 index 08ac81ee7..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json deleted file mode 100644 index a7fa6310d..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png deleted file mode 100644 index 8482dac0c..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png deleted file mode 100644 index c1851c117..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png deleted file mode 100644 index 45edfd50f..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json deleted file mode 100644 index 473609383..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png deleted file mode 100644 index c2c8f269a..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png deleted file mode 100644 index f36b17a43..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png deleted file mode 100644 index d6d26905e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json deleted file mode 100644 index 23c99bb15..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png deleted file mode 100644 index 7e6e040ff..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png deleted file mode 100644 index ec58b09e7..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png deleted file mode 100644 index e263d0cf9..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json deleted file mode 100644 index bb2d9fac6..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png deleted file mode 100644 index 395f04184..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png deleted file mode 100644 index bd7a694d4..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png deleted file mode 100644 index ffbcd4585..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json deleted file mode 100644 index 6b6b68b0c..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png deleted file mode 100644 index 482730866..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png deleted file mode 100644 index 26868d0d4..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png deleted file mode 100644 index 17a360872..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json deleted file mode 100644 index 86654d291..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png deleted file mode 100644 index 7fe9f8634..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png deleted file mode 100644 index eea2a352b..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png deleted file mode 100644 index d5b50a0a5..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json deleted file mode 100644 index 06ba0b43d..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png deleted file mode 100644 index d2811b3de..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png deleted file mode 100644 index 9129e459b..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png deleted file mode 100644 index a00b5dc93..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json deleted file mode 100644 index 1d94d01d0..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png deleted file mode 100644 index b1b0a1d4c..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png deleted file mode 100644 index 56d12b051..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png deleted file mode 100644 index b21706482..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json similarity index 65% rename from iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json index 668fc54dd..a226cbfd6 100644 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_guides_off_dark.png", + "filename" : "btn_bg_dark.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_dark@2x.png", + "filename" : "btn_bg_dark@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_dark@3x.png", + "filename" : "btn_bg_dark@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png new file mode 100644 index 000000000..09d221d50 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png new file mode 100644 index 000000000..06e1c44ee Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png new file mode 100644 index 000000000..6d4f856e6 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json similarity index 63% rename from iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json index 7011bd6cb..17efe56c9 100644 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_guides_off_light.png", + "filename" : "btn_bg_highlighted_dark.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_light@2x.png", + "filename" : "btn_bg_highlighted_dark@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_light@3x.png", + "filename" : "btn_bg_highlighted_dark@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png new file mode 100644 index 000000000..55d1c528f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png new file mode 100644 index 000000000..2afebae3c Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png new file mode 100644 index 000000000..5df74ca01 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json similarity index 62% rename from iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json index 9ee20b8fc..f803618c4 100644 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_traffic_on_light.png", + "filename" : "btn_bg_highlighted_light.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_light@2x.png", + "filename" : "btn_bg_highlighted_light@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_light@3x.png", + "filename" : "btn_bg_highlighted_light@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png new file mode 100644 index 000000000..fd4a3d7a8 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png new file mode 100644 index 000000000..b2c2e153f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png new file mode 100644 index 000000000..6ebc332fe Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/Contents.json similarity index 65% rename from iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/Contents.json index 34383a88c..c3e3b9c0a 100644 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_traffic_on_dark.png", + "filename" : "btn_bg_light.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_dark@2x.png", + "filename" : "btn_bg_light@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_dark@3x.png", + "filename" : "btn_bg_light@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light.png new file mode 100644 index 000000000..2e67b722b Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png new file mode 100644 index 000000000..6307550e3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png new file mode 100644 index 000000000..ff3765d9f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json deleted file mode 100644 index 8db999d9f..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf deleted file mode 100644 index b4ff5eb01..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 76034bfcd..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_highdarked_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf deleted file mode 100644 index 98def3a12..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json deleted file mode 100644 index 032e4d735..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf deleted file mode 100644 index e64e1bd99..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json deleted file mode 100644 index 42290ee19..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf deleted file mode 100644 index 1cc9dea70..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png deleted file mode 100644 index 512ecc99d..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png deleted file mode 100644 index 97bc8f954..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png deleted file mode 100644 index f28145801..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png deleted file mode 100644 index c39094bce..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png deleted file mode 100644 index 1cca1196a..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png deleted file mode 100644 index 908c646af..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png and /dev/null differ diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index c77a5d8a8..eb881bf9c 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -4,6 +4,7 @@ "cancel_download" = "Herunterladen abbrechen"; /* Button which deletes downloaded country */ "delete" = "Löschen"; +"discard" = "Verwerfen"; "download_maps" = "Karten herunterladen"; /* Settings/Downloader - info for country which started downloading */ "downloading" = "Wird heruntergeladen …"; @@ -143,7 +144,7 @@ "share_my_location" = "Meinen Standort teilen"; "prefs_group_route" = "Navigation"; "pref_zoom_title" = "Zoom-Tasten"; -"pref_left_button_type" = "Linker Hauptbutton"; +"pref_custom_button_type" = "Anpassbarer Button"; /* Settings «Map» category: «Map Language» title */ "pref_maplanguage_title" = "Karten-Sprache"; /* Settings «Map» category: «Map Language» local value */ @@ -165,9 +166,7 @@ /* Generic «Auto» string */ "auto" = "Auto"; /* Settings «Map» category: «Perspective view» title */ -"pref_map_3d_title" = "3D-Ansicht"; -/* Settings «Map» category: «3D buildings» title */ -"pref_map_3d_buildings_title" = "3D-Gebäude"; +"pref_map_3d_title" = "Perspektivische Ansicht"; /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */ "pref_map_3d_buildings_disabled_summary" = "3D-Gebäude werden im Energiesparmodus ausgeschaltet"; /* Settings «Route» category: «Tts enabled» title */ @@ -407,6 +406,7 @@ "closed" = "Geschlossen"; "add_opening_hours" = "Öffnungszeiten hinzufügen"; /* OpenStreetMap */ +"osm" = "OpenStreetMap"; "osm_mapdata" = "Kartendaten von OpenStreetMap"; "osm_mapdata_explanation %@" = "Von der Community erstellte Kartendaten vom *%@*. Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter [OpenStreetMap.org](https://wiki.openstreetmap.org/wiki/DE:Map_Making_Overview)."; "osm_more_about" = "Mehr Infos über OpenStreetMap"; @@ -625,9 +625,7 @@ "restore" = "Wiederherstellen"; "privacy_policy" = "Datenschutzerklärung"; "terms_of_use" = "Nutzungsbedingungen"; -"button_layer_subway" = "U-Bahn"; -"layers_title" = "Kartenstile und Ebenen"; -"subway_data_unavailable" = "Die U-Bahn-Karte steht nicht zur Verfügung"; +"subway_data_unavailable" = "Subway map is unavailable"; "title_error_downloading_bookmarks" = "Es ist ein Fehler aufgetreten"; "popular_place" = "Beliebt"; "export_file" = "KMZ exportieren"; @@ -735,7 +733,6 @@ "transit_not_found" = "Die U-Bahn-Navigation ist in dieser Region noch nicht verfügbar"; "dialog_pedestrian_route_is_long_header" = "Keine U-Bahn-Route gefunden"; "dialog_pedestrian_route_is_long_message" = "Wähle einen Start- oder Endpunkt näher an einer U-Bahn-Station"; -"button_layer_isolines" = "Höhenlinien"; "isolines_activation_error_dialog" = "Um die Höhenlinien nutzen zu können, aktualisiere die Karte des betreffenden Gebiets oder lade diese herunter"; "isolines_location_error_dialog" = "Höhenlinien sind für dieses Gebiet noch nicht verfügbar"; "elevation_profile_diff_level" = "Schwierigkeitsgrad"; @@ -797,8 +794,44 @@ "car_continue_on_the_phone" = "Fortsetzen am Telefon"; /* Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! */ "car_continue_in_the_car" = "Zum Autobildschirm"; -/* Outdoors/hiking map style (activity) name in the Styles and Layers dialog */ -"button_layer_outdoor" = "Wandern"; +/* Usually invisible title for the mode picker */ +"mode" = "Modus"; +/* Label for the walking mode */ +"mode_walking" = "Gehen"; +/* Label for the cycling mode */ +"mode_cycling" = "Radfahren"; +/* Label for the driving mode */ +"mode_driving" = "Fahren"; +/* Label for the public transport mode */ +"mode_public-transport" = "Öffentlicher Verkehr"; +/* Label for the toggle to show the traffic in the driving mode */ +"mode_option_traffic" = "Verkehr anzeigen"; +/* Label for the toggle to show the transit lines in the public transport mode */ +"mode_option_transitlines" = "Verkehrslinien anzeigen"; +/* Placeholder for modes, which don't have options yet */ +"mode_option_comingsoon" = "Optionen bald verfügbar"; +/* Usually invisible title for the layer button */ +"layers" = "Ebenen"; +/* Usually invisible label for the contour lines layer */ +"layers_option_contour-lines" = "Höhenlinien"; +/* Usually invisible label for the outdoor layer */ +"layers_option_outdoor" = "Outdoor"; +/* Usually invisible label for the buildings 3D layer */ +"layers_option_buildings-3d" = "3D Gebäude"; +/* Alert explaining why the layer is disabled */ +"layers_power-saving" = "Diese Ebene ist momentan wegen deiner Stromsparmodus-Einstellung deaktiviert"; +/* Usually invisible label for the position mode button when the location hasn't been determined or isn't being followed */ +"postionmode_locate" = "Eigenen Standort finden"; +/* Usually invisible label for the position mode button when the location is still being determined */ +"postionmode_locating" = "Eigenen Standort finden..."; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards North */ +"postionmode_following" = "Standort mit nach Norden gedrehter Karte folgen"; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards the traveling direction */ +"postionmode_following-and-rotated" = "Standort mit in Reiserichtung gedrehter Karte folgen"; +/* Usually invisible title for the zoom in button */ +"zoom_in" = "Reinzoomen"; +/* Usually invisible title for the zoom out button */ +"zoom_out" = "Rauszoomen"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Alle Favoriten exportieren"; /* Text for the editing the Track's color button. */ @@ -848,10 +881,10 @@ "recover" = "Wiederherstellen"; /* Title for the "Recover All" button on the Recently Deleted Lists screen. */ "recover_all" = "Alles wiederherstellen"; -/* Prompt to start recording a track. */ -"start_track_recording" = "Track aufnehmen"; -/* Prompt for stopping a track recording. */ -"stop_track_recording" = "Aufnahme des Tracks stoppen"; +/* Title to start recording a track. */ +"record_track" = "Track aufnehmen"; +/* Title shown while track recording. */ +"recording_track" = "Trackaufnahme"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ "stop_without_saving" = "Ohne Speichern beenden"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 0c1f4b4e9..82c920eda 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -4,6 +4,7 @@ "cancel_download" = "Cancel Download"; /* Button which deletes downloaded country */ "delete" = "Delete"; +"discard" = "Discard"; "download_maps" = "Download Maps"; /* Settings/Downloader - info for country which started downloading */ "downloading" = "Downloading…"; @@ -143,7 +144,7 @@ "share_my_location" = "Share My Location"; "prefs_group_route" = "Navigation"; "pref_zoom_title" = "Zoom buttons"; -"pref_left_button_type" = "Left Main Button"; +"pref_custom_button_type" = "Customisable Button"; /* Settings «Map» category: «Map Language» title */ "pref_maplanguage_title" = "Map Language"; /* Settings «Map» category: «Map Language» local value */ @@ -166,8 +167,6 @@ "auto" = "Auto"; /* Settings «Map» category: «Perspective view» title */ "pref_map_3d_title" = "Perspective view"; -/* Settings «Map» category: «3D buildings» title */ -"pref_map_3d_buildings_title" = "3D buildings"; /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */ "pref_map_3d_buildings_disabled_summary" = "3D buildings are disabled in power saving mode"; /* Settings «Route» category: «Tts enabled» title */ @@ -407,6 +406,7 @@ "closed" = "Closed"; "add_opening_hours" = "Add opening hours"; /* OpenStreetMap */ +"osm" = "OpenStreetMap"; "osm_mapdata" = "Map data from OpenStreetMap"; "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org)."; "osm_more_about" = "More about OpenStreetMap"; @@ -625,8 +625,6 @@ "restore" = "Restore"; "privacy_policy" = "Privacy policy"; "terms_of_use" = "Terms of use"; -"button_layer_subway" = "Metro"; -"layers_title" = "Map Styles and Layers"; "subway_data_unavailable" = "Metro map is unavailable"; "title_error_downloading_bookmarks" = "An error occurred"; "popular_place" = "Popular"; @@ -735,7 +733,6 @@ "transit_not_found" = "Metro navigation in this region is not available yet"; "dialog_pedestrian_route_is_long_header" = "No metro route found"; "dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a metro station"; -"button_layer_isolines" = "Contour Lines"; "isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area"; "isolines_location_error_dialog" = "Contour lines are not yet available in this area"; "elevation_profile_diff_level" = "Difficulty level"; @@ -797,8 +794,44 @@ "car_continue_on_the_phone" = "Continue on the phone"; /* Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! */ "car_continue_in_the_car" = "To the car screen"; -/* Outdoors/hiking map style (activity) name in the Styles and Layers dialog */ -"button_layer_outdoor" = "Outdoors"; +/* Usually invisible title for the mode picker */ +"mode" = "Mode"; +/* Label for the walking mode */ +"mode_walking" = "Walking"; +/* Label for the cycling mode */ +"mode_cycling" = "Cycling"; +/* Label for the driving mode */ +"mode_driving" = "Driving"; +/* Label for the public transport mode */ +"mode_public-transport" = "Public Transport"; +/* Label for the toggle to show the traffic in the driving mode */ +"mode_option_traffic" = "Show Traffic"; +/* Label for the toggle to show the transit lines in the public transport mode */ +"mode_option_transitlines" = "Show Transit Lines"; +/* Placeholder for modes, which don't have options yet */ +"mode_option_comingsoon" = "Options coming soon"; +/* Usually invisible title for the layer button */ +"layers" = "Layers"; +/* Usually invisible label for the contour lines layer */ +"layers_option_contour-lines" = "Contour Lines"; +/* Usually invisible label for the outdoor layer */ +"layers_option_outdoor" = "Outdoor"; +/* Usually invisible label for the buildings 3D layer */ +"layers_option_buildings-3d" = "3D Buildings"; +/* Alert explaining why the layer is disabled */ +"layers_power-saving" = "This layer is currently automatically disabled due to your power saving mode setting"; +/* Usually invisible label for the position mode button when the location hasn't been determined or isn't being followed */ +"postionmode_locate" = "Find own location"; +/* Usually invisible label for the position mode button when the location is still being determined */ +"postionmode_locating" = "Finding own location..."; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards North */ +"postionmode_following" = "Following location with map roated towards North"; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards the traveling direction */ +"postionmode_following-and-rotated" = "Following location with map roated towards traveling direction"; +/* Usually invisible title for the zoom in button */ +"zoom_in" = "Zoom in"; +/* Usually invisible title for the zoom out button */ +"zoom_out" = "Zoom out"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Export all Favourites"; /* Text for the editing the Track's color button. */ @@ -848,10 +881,10 @@ "recover" = "Recover"; /* Title for the "Recover All" button on the Recently Deleted Lists screen. */ "recover_all" = "Recover All"; -/* Prompt to start recording a track. */ -"start_track_recording" = "Record Track"; -/* Prompt for stopping a track recording. */ -"stop_track_recording" = "Stop Track Recording"; +/* Title to start recording a track. */ +"record_track" = "Record Track"; +/* Title shown while track recording. */ +"recording_track" = "Recording Track"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ "stop_without_saving" = "Stop Without Saving"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index b14f6d3a7..9368de4f2 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -4,7 +4,7 @@ "cancel_download" = "Cancel Download"; /* Button which deletes downloaded country */ "delete" = "Delete"; -/* Download/update Maps page */ +"discard" = "Discard"; "download_maps" = "Download Maps"; "downloader_check_updates_button" = "Check for updates"; "downloader_check_updates_checking" = "Checking for updates..."; @@ -150,7 +150,7 @@ "share_my_location" = "Share My Location"; "prefs_group_route" = "Navigation"; "pref_zoom_title" = "Zoom buttons"; -"pref_left_button_type" = "Left Main Button"; +"pref_custom_button_type" = "Customizable Button"; /* Settings «Map» category: «Map Language» title */ "pref_maplanguage_title" = "Map Language"; /* Settings «Map» category: «Map Language» local value */ @@ -173,8 +173,6 @@ "auto" = "Auto"; /* Settings «Map» category: «Perspective view» title */ "pref_map_3d_title" = "Perspective view"; -/* Settings «Map» category: «3D buildings» title */ -"pref_map_3d_buildings_title" = "3D buildings"; /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */ "pref_map_3d_buildings_disabled_summary" = "3D buildings are disabled in power saving mode"; /* Settings «Route» category: «Tts enabled» title */ @@ -415,6 +413,7 @@ "closed" = "Closed"; "add_opening_hours" = "Add opening hours"; /* OpenStreetMap */ +"osm" = "OpenStreetMap"; "osm_mapdata" = "Map data from OpenStreetMap"; "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org)."; "osm_more_about" = "More about OpenStreetMap"; @@ -634,8 +633,6 @@ "restore" = "Restore"; "privacy_policy" = "Privacy policy"; "terms_of_use" = "Terms of use"; -"button_layer_subway" = "Subway"; -"layers_title" = "Map Styles and Layers"; "subway_data_unavailable" = "Subway map is unavailable"; "title_error_downloading_bookmarks" = "An error occurred"; "popular_place" = "Popular"; @@ -744,7 +741,6 @@ "transit_not_found" = "Subway navigation in this region is not available yet"; "dialog_pedestrian_route_is_long_header" = "No subway route found"; "dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a subway station"; -"button_layer_isolines" = "Contour Lines"; "isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area"; "isolines_location_error_dialog" = "Contour lines are not yet available in this area"; "elevation_profile_diff_level" = "Difficulty level"; @@ -806,8 +802,44 @@ "car_continue_on_the_phone" = "Continue on the phone"; /* Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! */ "car_continue_in_the_car" = "To the car screen"; -/* Outdoors/hiking map style (activity) name in the Styles and Layers dialog */ -"button_layer_outdoor" = "Outdoors"; +/* Usually invisible title for the mode picker */ +"mode" = "Mode"; +/* Label for the walking mode */ +"mode_walking" = "Walking"; +/* Label for the cycling mode */ +"mode_cycling" = "Cycling"; +/* Label for the driving mode */ +"mode_driving" = "Driving"; +/* Label for the public transport mode */ +"mode_public-transport" = "Public Transport"; +/* Label for the toggle to show the traffic in the driving mode */ +"mode_option_traffic" = "Show Traffic"; +/* Label for the toggle to show the transit lines in the public transport mode */ +"mode_option_transitlines" = "Show Transit Lines"; +/* Placeholder for modes, which don't have options yet */ +"mode_option_comingsoon" = "Options coming soon"; +/* Usually invisible title for the layer button */ +"layers" = "Layers"; +/* Usually invisible label for the contour lines layer */ +"layers_option_contour-lines" = "Contour Lines"; +/* Usually invisible label for the outdoor layer */ +"layers_option_outdoor" = "Outdoor"; +/* Usually invisible label for the buildings 3D layer */ +"layers_option_buildings-3d" = "3D Buildings"; +/* Alert explaining why the layer is disabled */ +"layers_power-saving" = "This layer is currently automatically disabled due to your power saving mode setting"; +/* Usually invisible label for the position mode button when the location hasn't been determined or isn't being followed */ +"postionmode_locate" = "Find own location"; +/* Usually invisible label for the position mode button when the location is still being determined */ +"postionmode_locating" = "Finding own location..."; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards North */ +"postionmode_following" = "Following location with map roated towards North"; +/* Usually invisible label for the position mode button when the location is being followed and the map rotated towards the traveling direction */ +"postionmode_following-and-rotated" = "Following location with map roated towards traveling direction"; +/* Usually invisible title for the zoom in button */ +"zoom_in" = "Zoom in"; +/* Usually invisible title for the zoom out button */ +"zoom_out" = "Zoom out"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Export all Favorites"; /* Text for the editing the Track's color button. */ @@ -857,10 +889,10 @@ "recover" = "Recover"; /* Title for the "Recover All" button on the Recently Deleted Lists screen. */ "recover_all" = "Recover All"; -/* Prompt to start recording a track. */ -"start_track_recording" = "Record Track"; -/* Prompt for stopping a track recording. */ -"stop_track_recording" = "Stop Track Recording"; +/* Title to start recording a track. */ +"record_track" = "Record Track"; +/* Title shown while track recording. */ +"recording_track" = "Recording Track"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ "stop_without_saving" = "Stop Without Saving"; /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 29ad79a24..53fc632be 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; }; 271186872F19467400FD7FF3 /* countries_meta.txt in Resources */ = {isa = PBXBuildFile; fileRef = 271186862F19467400FD7FF3 /* countries_meta.txt */; }; + 27172E492F447B420052A5A7 /* MapLayersButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27172E462F447B3A0052A5A7 /* MapLayersButton.swift */; }; + 27172E4D2F44A64E0052A5A7 /* MapLayersButtonLayerToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27172E4C2F44A6460052A5A7 /* MapLayersButtonLayerToggle.swift */; }; 27176A862E65B0150015F25F /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A852E65B0150015F25F /* Icon.icon */; }; 27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A892E65B01B0015F25F /* Debug Icon.icon */; }; 271DC5192F532C73006399DA /* RegionsUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271DC5162F532C68006399DA /* RegionsUpdater.swift */; }; @@ -21,11 +23,45 @@ 272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */; }; 272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */; }; 272F1F462E0EEF9400FA52EF /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F452E0EEF8B00FA52EF /* SafariView.swift */; }; + 27362B992F4240B500BCB1FB /* MapControls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362B982F4240B500BCB1FB /* MapControls.swift */; }; + 27362B9A2F4240B500BCB1FB /* MapControls.mm in Sources */ = {isa = PBXBuildFile; fileRef = 27362B972F4240B500BCB1FB /* MapControls.mm */; }; + 27362BAA2F4240CE00BCB1FB /* MapPositionButtonMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BA02F4240CE00BCB1FB /* MapPositionButtonMode.swift */; }; + 27362BAC2F4240CE00BCB1FB /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362B9B2F4240CE00BCB1FB /* MainView.swift */; }; + 27362BAE2F4240CE00BCB1FB /* MapZoomButtonKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BA32F4240CE00BCB1FB /* MapZoomButtonKind.swift */; }; + 27362BAF2F4240CE00BCB1FB /* MapZoomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BA22F4240CE00BCB1FB /* MapZoomButton.swift */; }; + 27362BB02F4240CE00BCB1FB /* MapButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BA52F4240CE00BCB1FB /* MapButtonStyle.swift */; }; + 27362BB12F4240CE00BCB1FB /* MapPositionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362B9F2F4240CE00BCB1FB /* MapPositionButton.swift */; }; + 27362BB22F4240CE00BCB1FB /* MapCustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362B9C2F4240CE00BCB1FB /* MapCustomButton.swift */; }; + 27362BB32F4240CE00BCB1FB /* MapCustomButtonKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362B9D2F4240CE00BCB1FB /* MapCustomButtonKind.swift */; }; + 27362BB42F4240CE00BCB1FB /* MapMoreButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BA72F4240CE00BCB1FB /* MapMoreButton.swift */; }; + 27362BB82F4258B900BCB1FB /* MapModePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BB72F4258B100BCB1FB /* MapModePicker.swift */; }; + 27362BBD2F4284BF00BCB1FB /* drules_proto_walking_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BB92F4284BF00BCB1FB /* drules_proto_walking_dark.bin */; }; + 27362BBE2F4284BF00BCB1FB /* drules_proto_walking_outdoor_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BBB2F4284BF00BCB1FB /* drules_proto_walking_outdoor_dark.bin */; }; + 27362BBF2F4284BF00BCB1FB /* drules_proto_walking_outdoor_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BBC2F4284BF00BCB1FB /* drules_proto_walking_outdoor_light.bin */; }; + 27362BC02F4284BF00BCB1FB /* drules_proto_walking_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BBA2F4284BF00BCB1FB /* drules_proto_walking_light.bin */; }; + 27362BCD2F4284FA00BCB1FB /* drules_proto_driving_outdoor_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC82F4284FA00BCB1FB /* drules_proto_driving_outdoor_light.bin */; }; + 27362BCE2F4284FA00BCB1FB /* drules_proto_cycling_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC12F4284FA00BCB1FB /* drules_proto_cycling_dark.bin */; }; + 27362BCF2F4284FA00BCB1FB /* drules_proto_cycling_outdoor_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC32F4284FA00BCB1FB /* drules_proto_cycling_outdoor_dark.bin */; }; + 27362BD02F4284FA00BCB1FB /* drules_proto_cycling_outdoor_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC42F4284FA00BCB1FB /* drules_proto_cycling_outdoor_light.bin */; }; + 27362BD12F4284FA00BCB1FB /* drules_proto_public-transport_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BCA2F4284FA00BCB1FB /* drules_proto_public-transport_light.bin */; }; + 27362BD22F4284FA00BCB1FB /* drules_proto_public-transport_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC92F4284FA00BCB1FB /* drules_proto_public-transport_dark.bin */; }; + 27362BD32F4284FA00BCB1FB /* drules_proto_driving_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC52F4284FA00BCB1FB /* drules_proto_driving_dark.bin */; }; + 27362BD42F4284FA00BCB1FB /* drules_proto_driving_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC62F4284FA00BCB1FB /* drules_proto_driving_light.bin */; }; + 27362BD52F4284FA00BCB1FB /* drules_proto_cycling_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC22F4284FA00BCB1FB /* drules_proto_cycling_light.bin */; }; + 27362BD62F4284FA00BCB1FB /* drules_proto_driving_outdoor_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BC72F4284FA00BCB1FB /* drules_proto_driving_outdoor_dark.bin */; }; + 27362BD72F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BCB2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_dark.bin */; }; + 27362BD82F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 27362BCC2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_light.bin */; }; + 27362BE42F43257A00BCB1FB /* MapSearchButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BE32F43257000BCB1FB /* MapSearchButton.swift */; }; + 27362BE62F434C9900BCB1FB /* MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BE52F434C9200BCB1FB /* MapView.swift */; }; + 27362BE82F434CA400BCB1FB /* MapOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27362BE72F434C9E00BCB1FB /* MapOverlayView.swift */; }; 2744A9912F23D86D00E7D02C /* AlternativeMapLanguageHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2744A98E2F23D86B00E7D02C /* AlternativeMapLanguageHandling.swift */; }; 2752B6CA2E31197500887CC4 /* MapLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2752B6C92E31197000887CC4 /* MapLanguage.swift */; }; 2752B6CE2E3121D900887CC4 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2752B6CD2E3121D800887CC4 /* Language.swift */; }; + 2754F5A12F6168010011B076 /* MapTrackRecordingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2754F59E2F6167F80011B076 /* MapTrackRecordingIndicator.swift */; }; + 2754F5AD2F61B32B0011B076 /* Layer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2754F5AA2F61B3260011B076 /* Layer.swift */; }; + 2765818F2F1E7F53002478CD /* Mode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765818E2F1E7F50002478CD /* Mode.swift */; }; 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */; }; - 27697F742E25177600FBD913 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F732E25177300FBD913 /* AboutView.swift */; }; + 27697F742E25177600FBD913 /* InformationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F732E25177300FBD913 /* InformationView.swift */; }; 27697F7F2E254A5500FBD913 /* CopyrightView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F7C2E254A5000FBD913 /* CopyrightView.swift */; }; 27697F812E254A6000FBD913 /* FaqView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F802E254A5800FBD913 /* FaqView.swift */; }; 27697F832E254AA100FBD913 /* EmbeddedSafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F822E254A9900FBD913 /* EmbeddedSafariView.swift */; }; @@ -34,7 +70,6 @@ 27697F902E257EDA00FBD913 /* AboutCoMapsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F8F2E257ED800FBD913 /* AboutCoMapsView.swift */; }; 27697F922E257EED00FBD913 /* ApoutOpenStreetMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F912E257EE600FBD913 /* ApoutOpenStreetMapView.swift */; }; 27768FDB2E20199A0086784A /* RoutingOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27768FD92E20199A0086784A /* RoutingOptionsView.swift */; }; - 27768FE02E201BE60086784A /* LeftButtonType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27768FDF2E201BE60086784A /* LeftButtonType.swift */; }; 279367562E1BE16300AA5C3D /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279367552E1BE16300AA5C3D /* Settings.swift */; }; 2793675A2E1BE17300AA5C3D /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279367592E1BE17300AA5C3D /* SettingsView.swift */; }; 27AF184C2E1D5B2D00CD41E2 /* SettingsNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF184B2E1D5A2700CD41E2 /* SettingsNavigationView.swift */; }; @@ -44,6 +79,8 @@ 27AF18562E1DB63000CD41E2 /* PowerSavingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */; }; 27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18572E1DB63900CD41E2 /* Appearance.swift */; }; 27AF185A2E1DB64500CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */; }; + 27AFB5402F4F083B007A63FB /* MapModePickerChoice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AFB53D2F4F0835007A63FB /* MapModePickerChoice.swift */; }; + 27E4952C2F606B7C00239433 /* MapZoomButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27E495292F606B7700239433 /* MapZoomButtons.swift */; }; 27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */ = {isa = PBXBuildFile; fileRef = 27FDBF202EEEFC830045621D /* mapcss-mapping.csv */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; }; @@ -97,8 +134,6 @@ 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.m */; }; 3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */; }; 3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3457C4241F680F1900028233 /* String+BoundingRect.swift */; }; - 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */; }; - 3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3463BA651DE81DB90082417F /* MWMTrafficButtonViewController.xib */; }; 3467CEB2202C6EEE00D3C670 /* BMCNotificationsHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3467CEB1202C6EEE00D3C670 /* BMCNotificationsHeader.swift */; }; 3467CEB6202C6FA900D3C670 /* BMCNotificationsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3467CEB4202C6FA900D3C670 /* BMCNotificationsCell.swift */; }; 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3467CEB5202C6FA900D3C670 /* BMCNotificationsCell.xib */; }; @@ -114,13 +149,8 @@ 3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */; }; 3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */; }; 348B926D1FF3B5E100379009 /* UIView+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348B926B1FF3B5E100379009 /* UIView+Animation.swift */; }; - 3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */; }; - 3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; }; - 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */; }; 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.m */; }; 349A13851DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */; }; - 349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */; }; - 349D1AE11E2E325C004A2006 /* BottomTabBarViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */; }; 349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; }; 34AB39C21D2BD8310021857D /* MWMStopButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.m */; }; 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */; }; @@ -205,7 +235,7 @@ 34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F73F611E082FF800AC1FD6 /* Localizable.strings */; }; 34F73FA31E08300E00AC1FD6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34F73FA11E08300E00AC1FD6 /* Images.xcassets */; }; 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */; }; - 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */; }; + 34FE5A6F1F18F30F00BCA729 /* ModeButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* ModeButtonArea.swift */; }; 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; 44360A0D2A7D34990016F412 /* TransportRuler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44360A0C2A7D34990016F412 /* TransportRuler.swift */; }; 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44360A102A7D35440016F412 /* TransportRuler.xib */; }; @@ -299,8 +329,6 @@ 6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; }; 6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; }; - 6741A97E1BF340DE002C974C /* drules_proto_default_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */; }; - 6741A9871BF340DE002C974C /* drules_proto_default_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */; }; 6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; }; 6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; }; 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; }; @@ -308,6 +336,7 @@ 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; 6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F198B1AB81A00006EAF7E /* MWMDefaultAlert.mm */; }; 6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; }; + AABC12340D0F684500AABB03 /* SceneDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AABC12340D0F684500AABB02 /* SceneDelegate.mm */; }; 6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; }; 6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; }; 6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.m */; }; @@ -330,11 +359,6 @@ 8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */; }; 8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */; }; 99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */; }; - 9901284F244732DB00C72B10 /* BottomTabBarPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012849244732DB00C72B10 /* BottomTabBarPresenter.swift */; }; - 99012851244732DB00C72B10 /* BottomTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284B244732DB00C72B10 /* BottomTabBarViewController.swift */; }; - 99012852244732DB00C72B10 /* BottomTabBarBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */; }; - 99012853244732DB00C72B10 /* BottomTabBarInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */; }; - 990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990128552449A82400C72B10 /* BottomTabBarView.swift */; }; 9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; }; 991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */; }; 993DF0B523F6B2EF00AC231A /* PlacePageTrackLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0B423F6B2EF00AC231A /* PlacePageTrackLayout.swift */; }; @@ -393,18 +417,8 @@ 995739062355CAC40019AEE7 /* ImageViewCrossDisolve.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995739052355CAC40019AEE7 /* ImageViewCrossDisolve.swift */; }; 9959C75624582DA2008FD4FD /* DirectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9959C75524582DA2008FD4FD /* DirectionView.xib */; }; 9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9959C75B24599CCC008FD4FD /* DirectionView.swift */; }; - 995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; }; - 995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; }; 996D108A24E3DBF2002DD0E2 /* BookmarksCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */; }; - 9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; }; - 9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; }; 998927302449DE1500260CE2 /* TabBarArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9989272F2449DE1500260CE2 /* TabBarArea.swift */; }; - 998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927322449E60200260CE2 /* BottomMenuPresenter.swift */; }; - 9989273A2449E60200260CE2 /* BottomMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927342449E60200260CE2 /* BottomMenuViewController.swift */; }; - 9989273B2449E60200260CE2 /* BottomMenuBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927352449E60200260CE2 /* BottomMenuBuilder.swift */; }; - 9989273C2449E60200260CE2 /* BottomMenuInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927362449E60200260CE2 /* BottomMenuInteractor.swift */; }; - 9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 998927372449E60200260CE2 /* BottomMenuViewController.xib */; }; - 998927402449ECC200260CE2 /* BottomMenuItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9989273F2449ECC200260CE2 /* BottomMenuItemCell.swift */; }; 999FC12023ABA9AD00B0E6F9 /* SearchStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999FC11F23ABA9AD00B0E6F9 /* SearchStyleSheet.swift */; }; 999FC12B23ABB4B800B0E6F9 /* FontStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999FC12A23ABB4B800B0E6F9 /* FontStyleSheet.swift */; }; 99A614E423CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A614E323CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m */; }; @@ -418,9 +432,6 @@ 99A906F123FA946E0005872B /* DifficultyViewRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A906F023FA946E0005872B /* DifficultyViewRenderer.swift */; }; 99A906F323FA95AB0005872B /* PlacePageStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A906F223FA95AB0005872B /* PlacePageStyleSheet.swift */; }; 99A906F623FA9C010005872B /* InsetsLabelRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A906F523FA9C010005872B /* InsetsLabelRenderer.swift */; }; - 99AAEA74244DA5ED0039D110 /* BottomMenuPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AAEA73244DA5ED0039D110 /* BottomMenuPresentationController.swift */; }; - 99AAEA76244DA7BF0039D110 /* BottomMenuTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AAEA75244DA7BF0039D110 /* BottomMenuTransitioning.swift */; }; - 99AAEA78244DA9810039D110 /* BottomMenuTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AAEA77244DA9810039D110 /* BottomMenuTransitioningManager.swift */; }; 99C6532223F2F506004322F3 /* IPlacePageLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C6532123F2F506004322F3 /* IPlacePageLayout.swift */; }; 99C964292428C0F700E41723 /* PlacePageHeaderPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C964232428C0F700E41723 /* PlacePageHeaderPresenter.swift */; }; 99C9642B2428C0F700E41723 /* PlacePageHeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C964252428C0F700E41723 /* PlacePageHeaderViewController.swift */; }; @@ -483,8 +494,6 @@ ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742D2D14337500660FBF /* LiveActivityManager.swift */; }; ED2E328E2D10500900807A08 /* TrackRecordingButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */; }; - ED2E32912D10501700807A08 /* TrackRecordingButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED49D76F2CF0E3A8004AF27E /* TrackRecordingButtonViewController.swift */; }; - ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */; }; ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */; }; ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */; }; ED46DDD02D098A0B007CACD6 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */; }; @@ -630,10 +639,6 @@ FA456C3E26BDC6C100B83C20 /* DatePicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BDC26BC58570026D455 /* DatePicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; FA456C3F26BDC6CF00B83C20 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BBE26BC3B8A0026D455 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; FA456C4F26BDCCCC00B83C20 /* shaders_metal.metallib in CopyFiles */ = {isa = PBXBuildFile; fileRef = FA456C4B26BDCC8E00B83C20 /* shaders_metal.metallib */; }; - FA637ED229A500BE00D8921A /* drules_proto_outdoors_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA637ECC29A500BE00D8921A /* drules_proto_outdoors_light.bin */; }; - FA637ED329A500BE00D8921A /* drules_proto_outdoors_light.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA637ECF29A500BE00D8921A /* drules_proto_outdoors_light.txt */; }; - FA637ED429A500BE00D8921A /* drules_proto_outdoors_dark.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA637ED029A500BE00D8921A /* drules_proto_outdoors_dark.txt */; }; - FA637ED529A500BE00D8921A /* drules_proto_outdoors_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA637ED129A500BE00D8921A /* drules_proto_outdoors_dark.bin */; }; FA853BA726BC3ACE0026D455 /* CoreApi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BA626BC3ACE0026D455 /* CoreApi.framework */; }; FA853BA926BC3B8A0026D455 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BA826BC3B8A0026D455 /* libbase.a */; }; FA853BAB26BC3B8A0026D455 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA853BAA26BC3B8A0026D455 /* libcoding.a */; }; @@ -763,11 +768,15 @@ 165953932CB44B3B00CFED7C /* symbols */ = {isa = PBXFileReference; lastKnownFileType = folder; name = symbols; path = ../../data/symbols; sourceTree = ""; }; 1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = ""; tabWidth = 2; }; 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + AABC12340D0F684500AABB01 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; tabWidth = 2; }; + AABC12340D0F684500AABB02 /* SceneDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = SceneDelegate.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = ""; tabWidth = 2; }; 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = "UIColor+PartnerColor.m"; sourceTree = ""; tabWidth = 2; }; 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = ""; tabWidth = 2; }; 270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = ""; }; 271186862F19467400FD7FF3 /* countries_meta.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = countries_meta.txt; path = ../../data/countries_meta.txt; sourceTree = SOURCE_ROOT; }; + 27172E462F447B3A0052A5A7 /* MapLayersButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayersButton.swift; sourceTree = ""; }; + 27172E4C2F44A6460052A5A7 /* MapLayersButtonLayerToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayersButtonLayerToggle.swift; sourceTree = ""; }; 27176A852E65B0150015F25F /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = ""; }; 27176A892E65B01B0015F25F /* Debug Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "Debug Icon.icon"; sourceTree = ""; }; 271DC5162F532C68006399DA /* RegionsUpdater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionsUpdater.swift; sourceTree = ""; }; @@ -776,11 +785,46 @@ 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoExistingProfileView.swift; sourceTree = ""; }; 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = ""; }; 272F1F452E0EEF8B00FA52EF /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = ""; }; + 27362B962F4240B500BCB1FB /* MapControls.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapControls.h; sourceTree = ""; }; + 27362B972F4240B500BCB1FB /* MapControls.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MapControls.mm; sourceTree = ""; }; + 27362B982F4240B500BCB1FB /* MapControls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapControls.swift; sourceTree = ""; }; + 27362B9B2F4240CE00BCB1FB /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; + 27362B9C2F4240CE00BCB1FB /* MapCustomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapCustomButton.swift; sourceTree = ""; }; + 27362B9D2F4240CE00BCB1FB /* MapCustomButtonKind.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapCustomButtonKind.swift; sourceTree = ""; }; + 27362B9F2F4240CE00BCB1FB /* MapPositionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPositionButton.swift; sourceTree = ""; }; + 27362BA02F4240CE00BCB1FB /* MapPositionButtonMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPositionButtonMode.swift; sourceTree = ""; }; + 27362BA22F4240CE00BCB1FB /* MapZoomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapZoomButton.swift; sourceTree = ""; }; + 27362BA32F4240CE00BCB1FB /* MapZoomButtonKind.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapZoomButtonKind.swift; sourceTree = ""; }; + 27362BA52F4240CE00BCB1FB /* MapButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapButtonStyle.swift; sourceTree = ""; }; + 27362BA72F4240CE00BCB1FB /* MapMoreButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapMoreButton.swift; sourceTree = ""; }; + 27362BB72F4258B100BCB1FB /* MapModePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapModePicker.swift; sourceTree = ""; }; + 27362BB92F4284BF00BCB1FB /* drules_proto_walking_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_walking_dark.bin; path = ../../data/drules_proto_walking_dark.bin; sourceTree = ""; }; + 27362BBA2F4284BF00BCB1FB /* drules_proto_walking_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_walking_light.bin; path = ../../data/drules_proto_walking_light.bin; sourceTree = ""; }; + 27362BBB2F4284BF00BCB1FB /* drules_proto_walking_outdoor_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_walking_outdoor_dark.bin; path = ../../data/drules_proto_walking_outdoor_dark.bin; sourceTree = ""; }; + 27362BBC2F4284BF00BCB1FB /* drules_proto_walking_outdoor_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_walking_outdoor_light.bin; path = ../../data/drules_proto_walking_outdoor_light.bin; sourceTree = ""; }; + 27362BC12F4284FA00BCB1FB /* drules_proto_cycling_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_dark.bin; path = ../../data/drules_proto_cycling_dark.bin; sourceTree = ""; }; + 27362BC22F4284FA00BCB1FB /* drules_proto_cycling_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_light.bin; path = ../../data/drules_proto_cycling_light.bin; sourceTree = ""; }; + 27362BC32F4284FA00BCB1FB /* drules_proto_cycling_outdoor_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_outdoor_dark.bin; path = ../../data/drules_proto_cycling_outdoor_dark.bin; sourceTree = ""; }; + 27362BC42F4284FA00BCB1FB /* drules_proto_cycling_outdoor_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_outdoor_light.bin; path = ../../data/drules_proto_cycling_outdoor_light.bin; sourceTree = ""; }; + 27362BC52F4284FA00BCB1FB /* drules_proto_driving_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_dark.bin; path = ../../data/drules_proto_driving_dark.bin; sourceTree = ""; }; + 27362BC62F4284FA00BCB1FB /* drules_proto_driving_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_light.bin; path = ../../data/drules_proto_driving_light.bin; sourceTree = ""; }; + 27362BC72F4284FA00BCB1FB /* drules_proto_driving_outdoor_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_outdoor_dark.bin; path = ../../data/drules_proto_driving_outdoor_dark.bin; sourceTree = ""; }; + 27362BC82F4284FA00BCB1FB /* drules_proto_driving_outdoor_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_outdoor_light.bin; path = ../../data/drules_proto_driving_outdoor_light.bin; sourceTree = ""; }; + 27362BC92F4284FA00BCB1FB /* drules_proto_public-transport_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto_public-transport_dark.bin"; path = "../../data/drules_proto_public-transport_dark.bin"; sourceTree = ""; }; + 27362BCA2F4284FA00BCB1FB /* drules_proto_public-transport_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto_public-transport_light.bin"; path = "../../data/drules_proto_public-transport_light.bin"; sourceTree = ""; }; + 27362BCB2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto_public-transport_outdoor_dark.bin"; path = "../../data/drules_proto_public-transport_outdoor_dark.bin"; sourceTree = ""; }; + 27362BCC2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "drules_proto_public-transport_outdoor_light.bin"; path = "../../data/drules_proto_public-transport_outdoor_light.bin"; sourceTree = ""; }; + 27362BE32F43257000BCB1FB /* MapSearchButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapSearchButton.swift; sourceTree = ""; }; + 27362BE52F434C9200BCB1FB /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = ""; }; + 27362BE72F434C9E00BCB1FB /* MapOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapOverlayView.swift; sourceTree = ""; }; 2744A98E2F23D86B00E7D02C /* AlternativeMapLanguageHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlternativeMapLanguageHandling.swift; sourceTree = ""; }; 2752B6C92E31197000887CC4 /* MapLanguage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLanguage.swift; sourceTree = ""; }; 2752B6CD2E3121D800887CC4 /* Language.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Language.swift; sourceTree = ""; }; + 2754F59E2F6167F80011B076 /* MapTrackRecordingIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTrackRecordingIndicator.swift; sourceTree = ""; }; + 2754F5AA2F61B3260011B076 /* Layer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Layer.swift; sourceTree = ""; }; + 2765818E2F1E7F50002478CD /* Mode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mode.swift; sourceTree = ""; }; 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgeControllers.swift; sourceTree = ""; }; - 27697F732E25177300FBD913 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = ""; }; + 27697F732E25177300FBD913 /* InformationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InformationView.swift; sourceTree = ""; }; 27697F7C2E254A5000FBD913 /* CopyrightView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyrightView.swift; sourceTree = ""; }; 27697F802E254A5800FBD913 /* FaqView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqView.swift; sourceTree = ""; }; 27697F822E254A9900FBD913 /* EmbeddedSafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmbeddedSafariView.swift; sourceTree = ""; }; @@ -789,7 +833,6 @@ 27697F8F2E257ED800FBD913 /* AboutCoMapsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutCoMapsView.swift; sourceTree = ""; }; 27697F912E257EE600FBD913 /* ApoutOpenStreetMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApoutOpenStreetMapView.swift; sourceTree = ""; }; 27768FD92E20199A0086784A /* RoutingOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoutingOptionsView.swift; sourceTree = ""; }; - 27768FDF2E201BE60086784A /* LeftButtonType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftButtonType.swift; sourceTree = ""; }; 279367552E1BE16300AA5C3D /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; 279367592E1BE17300AA5C3D /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SettingsView.swift; path = UI/Settings/SettingsView.swift; sourceTree = SOURCE_ROOT; }; 27AF184B2E1D5A2700CD41E2 /* SettingsNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsNavigationView.swift; sourceTree = ""; }; @@ -799,6 +842,8 @@ 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = ""; }; 27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = ""; }; 27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = ""; }; + 27AFB53D2F4F0835007A63FB /* MapModePickerChoice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapModePickerChoice.swift; sourceTree = ""; }; + 27E495292F606B7700239433 /* MapZoomButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapZoomButtons.swift; sourceTree = ""; }; 27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "../../data/mapcss-mapping.csv"; sourceTree = SOURCE_ROOT; }; 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = ""; tabWidth = 2; }; @@ -897,9 +942,6 @@ 3454D7B41E07F045004AF2AD /* UITextView+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "UITextView+RuntimeAttributes.h"; sourceTree = ""; tabWidth = 2; }; 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = "UITextView+RuntimeAttributes.m"; sourceTree = ""; tabWidth = 2; }; 3457C4241F680F1900028233 /* String+BoundingRect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+BoundingRect.swift"; sourceTree = ""; }; - 3463BA631DE81DB90082417F /* MWMTrafficButtonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMTrafficButtonViewController.h; sourceTree = ""; tabWidth = 2; }; - 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTrafficButtonViewController.mm; sourceTree = ""; tabWidth = 2; }; - 3463BA651DE81DB90082417F /* MWMTrafficButtonViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMTrafficButtonViewController.xib; sourceTree = ""; }; 3467CEB1202C6EEE00D3C670 /* BMCNotificationsHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCNotificationsHeader.swift; sourceTree = ""; }; 3467CEB4202C6FA900D3C670 /* BMCNotificationsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCNotificationsCell.swift; sourceTree = ""; }; 3467CEB5202C6FA900D3C670 /* BMCNotificationsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCNotificationsCell.xib; sourceTree = ""; }; @@ -926,11 +968,6 @@ 3486B5141E27AD3B0069C126 /* MWMFrameworkObservers.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObservers.h; sourceTree = ""; tabWidth = 2; }; 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Modifications.swift"; sourceTree = ""; }; 348B926B1FF3B5E100379009 /* UIView+Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Animation.swift"; sourceTree = ""; }; - 3490D2D91CE9DD2500D0B838 /* MWMSideButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMSideButtons.h; sourceTree = ""; tabWidth = 2; }; - 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtons.mm; sourceTree = ""; tabWidth = 2; }; - 3490D2DB1CE9DD2500D0B838 /* MWMSideButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMSideButtonsView.h; sourceTree = ""; tabWidth = 2; }; - 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtonsView.mm; sourceTree = ""; tabWidth = 2; }; - 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSideButtonsView.xib; sourceTree = ""; }; 349A137F1DEC138C00C7DB60 /* MWMMobileInternetAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMMobileInternetAlert.h; sourceTree = ""; tabWidth = 2; }; 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMMobileInternetAlert.m; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMobileInternetAlert.xib; sourceTree = ""; }; @@ -939,8 +976,6 @@ 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMCircularProgress.xib; sourceTree = ""; }; 349A35781B53D4C9009677EE /* MWMCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMCircularProgressView.h; sourceTree = ""; tabWidth = 2; }; 349A35791B53D4C9009677EE /* MWMCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = MWMCircularProgressView.m; sourceTree = ""; tabWidth = 2; }; - 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomMenuItemCell.xib; sourceTree = ""; }; - 349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomTabBarViewController.xib; sourceTree = ""; }; 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Hierarchy.swift"; sourceTree = ""; }; 34AB39BF1D2BD8310021857D /* MWMStopButton.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMStopButton.h; sourceTree = ""; tabWidth = 2; }; 34AB39C01D2BD8310021857D /* MWMStopButton.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = MWMStopButton.m; sourceTree = ""; tabWidth = 2; }; @@ -1117,7 +1152,7 @@ 34FB47581E3B928D00D94ED8 /* MWMCoreUnits.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMCoreUnits.h; sourceTree = ""; tabWidth = 2; }; 34FE4C431BCC013500066718 /* MWMMapWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMMapWidgets.h; sourceTree = ""; tabWidth = 2; }; 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgets.mm; sourceTree = ""; tabWidth = 2; }; - 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrafficButtonArea.swift; sourceTree = ""; }; + 34FE5A6D1F18F30F00BCA729 /* ModeButtonArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModeButtonArea.swift; sourceTree = ""; }; 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMObjectsCategorySelectorDataSource.mm; sourceTree = ""; tabWidth = 2; }; 3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = ""; tabWidth = 2; }; 44360A0C2A7D34990016F412 /* TransportRuler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransportRuler.swift; sourceTree = ""; }; @@ -1212,8 +1247,6 @@ 47F86CFE20C936FC00FEE291 /* TabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = ""; }; 47F86D0020C93D8D00FEE291 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = ""; }; 49AB95972CB2FE5300468EA2 /* UIButton+ImagePadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+ImagePadding.swift"; sourceTree = ""; }; - 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_dark.bin; path = ../../data/drules_proto_default_dark.bin; sourceTree = ""; }; - 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_light.bin; path = ../../data/drules_proto_default_light.bin; sourceTree = ""; }; 4A300ED31C6DCFD400140018 /* countries-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "countries-strings"; path = "../../data/countries-strings"; sourceTree = ""; }; 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeechTests.mm; sourceTree = ""; tabWidth = 2; }; 4B83AE472C2E59F800B0C3BC /* TTSTester.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = TTSTester.h; sourceTree = ""; tabWidth = 2; }; @@ -1228,11 +1261,6 @@ 978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = ""; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = ""; }; 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = ""; }; - 99012849244732DB00C72B10 /* BottomTabBarPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarPresenter.swift; sourceTree = ""; }; - 9901284B244732DB00C72B10 /* BottomTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarViewController.swift; sourceTree = ""; }; - 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarBuilder.swift; sourceTree = ""; }; - 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarInteractor.swift; sourceTree = ""; }; - 990128552449A82400C72B10 /* BottomTabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarView.swift; sourceTree = ""; }; 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = ""; }; 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksStyleSheet.swift; sourceTree = ""; }; 993DF0B423F6B2EF00AC231A /* PlacePageTrackLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageTrackLayout.swift; sourceTree = ""; }; @@ -1294,19 +1322,8 @@ 9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "MWMMapViewControlsManager+AddPlace.h"; sourceTree = ""; tabWidth = 2; }; 9959C75524582DA2008FD4FD /* DirectionView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DirectionView.xib; sourceTree = ""; }; 9959C75B24599CCC008FD4FD /* DirectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DirectionView.swift; sourceTree = ""; }; - 995F1610244F07F90060631D /* MWMBottomMenuState.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuState.h; sourceTree = ""; tabWidth = 2; }; - 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = ""; }; - 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = ""; }; 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCoordinator.swift; sourceTree = ""; }; - 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = ""; }; - 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = ""; }; 9989272F2449DE1500260CE2 /* TabBarArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarArea.swift; sourceTree = ""; }; - 998927322449E60200260CE2 /* BottomMenuPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuPresenter.swift; sourceTree = ""; }; - 998927342449E60200260CE2 /* BottomMenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuViewController.swift; sourceTree = ""; }; - 998927352449E60200260CE2 /* BottomMenuBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuBuilder.swift; sourceTree = ""; }; - 998927362449E60200260CE2 /* BottomMenuInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuInteractor.swift; sourceTree = ""; }; - 998927372449E60200260CE2 /* BottomMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuViewController.xib; sourceTree = ""; }; - 9989273F2449ECC200260CE2 /* BottomMenuItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuItemCell.swift; sourceTree = ""; }; 999FC11F23ABA9AD00B0E6F9 /* SearchStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchStyleSheet.swift; sourceTree = ""; }; 999FC12A23ABB4B800B0E6F9 /* FontStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontStyleSheet.swift; sourceTree = ""; }; 99A614E223CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "UIButton+RuntimeAttributes.h"; sourceTree = ""; tabWidth = 2; }; @@ -1321,9 +1338,6 @@ 99A906F023FA946E0005872B /* DifficultyViewRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DifficultyViewRenderer.swift; sourceTree = ""; }; 99A906F223FA95AB0005872B /* PlacePageStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageStyleSheet.swift; sourceTree = ""; }; 99A906F523FA9C010005872B /* InsetsLabelRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsetsLabelRenderer.swift; sourceTree = ""; }; - 99AAEA73244DA5ED0039D110 /* BottomMenuPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuPresentationController.swift; sourceTree = ""; }; - 99AAEA75244DA7BF0039D110 /* BottomMenuTransitioning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuTransitioning.swift; sourceTree = ""; }; - 99AAEA77244DA9810039D110 /* BottomMenuTransitioningManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuTransitioningManager.swift; sourceTree = ""; }; 99C6532123F2F506004322F3 /* IPlacePageLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPlacePageLayout.swift; sourceTree = ""; }; 99C964232428C0F700E41723 /* PlacePageHeaderPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageHeaderPresenter.swift; sourceTree = ""; }; 99C964252428C0F700E41723 /* PlacePageHeaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageHeaderViewController.swift; sourceTree = ""; }; @@ -1432,7 +1446,6 @@ ED2D74352D14337500660FBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoMapsWidgetExtensionBundle.swift; sourceTree = ""; }; ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingActivityManager.swift; sourceTree = ""; }; - ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = ""; }; ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = ""; }; ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonArea.swift; sourceTree = ""; }; ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = CoMapsWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1440,7 +1453,6 @@ ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; tabWidth = 2; }; ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = ""; tabWidth = 2; }; - ED49D76F2CF0E3A8004AF27E /* TrackRecordingButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonViewController.swift; sourceTree = ""; }; ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapHeaderView.swift; sourceTree = ""; }; ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalPresentationStepsController.swift; sourceTree = ""; }; ED70D5582D5396F300738C1E /* SearchItemType.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SearchItemType.h; sourceTree = ""; tabWidth = 2; }; @@ -1718,10 +1730,6 @@ FA4F29DE28BC1B35001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = ""; }; FA4F29DF28BC1B36001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; FA4F29E028BC1B36001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ca; path = ca.lproj/Localizable.stringsdict; sourceTree = ""; }; - FA637ECC29A500BE00D8921A /* drules_proto_outdoors_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_outdoors_light.bin; path = ../../data/drules_proto_outdoors_light.bin; sourceTree = ""; }; - FA637ECF29A500BE00D8921A /* drules_proto_outdoors_light.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = drules_proto_outdoors_light.txt; path = ../../data/drules_proto_outdoors_light.txt; sourceTree = ""; }; - FA637ED029A500BE00D8921A /* drules_proto_outdoors_dark.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = drules_proto_outdoors_dark.txt; path = ../../data/drules_proto_outdoors_dark.txt; sourceTree = ""; }; - FA637ED129A500BE00D8921A /* drules_proto_outdoors_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_outdoors_dark.bin; path = ../../data/drules_proto_outdoors_dark.bin; sourceTree = ""; }; FA64D9A813F975AD00350ECF /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = types.txt; path = ../../data/types.txt; sourceTree = SOURCE_ROOT; }; FA853BA626BC3ACE0026D455 /* CoreApi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreApi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FA853BA826BC3B8A0026D455 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1887,6 +1895,8 @@ BB8123D52130427E00ADE512 /* MetalContextFactory.mm */, 1D3623240D0F684500981E51 /* MapsAppDelegate.h */, 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */, + AABC12340D0F684500AABB01 /* SceneDelegate.h */, + AABC12340D0F684500AABB02 /* SceneDelegate.mm */, F613FA741AB330AF002394D4 /* MapViewController */, F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */, F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.m */, @@ -1909,10 +1919,38 @@ name = Products; sourceTree = ""; }; + 271146C02F4C966100D982DA /* Layers Button */ = { + isa = PBXGroup; + children = ( + 27172E462F447B3A0052A5A7 /* MapLayersButton.swift */, + 27172E4C2F44A6460052A5A7 /* MapLayersButtonLayerToggle.swift */, + ); + path = "Layers Button"; + sourceTree = ""; + }; + 272C75C62F4F6835009DC357 /* Controls */ = { + isa = PBXGroup; + children = ( + 27362BA72F4240CE00BCB1FB /* MapMoreButton.swift */, + 27AFB5432F4F1D2F007A63FB /* Mode Picker */, + 2754F59E2F6167F80011B076 /* MapTrackRecordingIndicator.swift */, + 271146C02F4C966100D982DA /* Layers Button */, + 27362B9E2F4240CE00BCB1FB /* Custom Button */, + 27362BE32F43257000BCB1FB /* MapSearchButton.swift */, + 27362BA12F4240CE00BCB1FB /* Position Button */, + 27362BA42F4240CE00BCB1FB /* Zoom Buttons */, + 27362BA52F4240CE00BCB1FB /* MapButtonStyle.swift */, + ); + path = Controls; + sourceTree = ""; + }; 272F1F342E0ED92E00FA52EF /* Bridging */ = { isa = PBXGroup; children = ( 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */, + 27362B962F4240B500BCB1FB /* MapControls.h */, + 27362B972F4240B500BCB1FB /* MapControls.mm */, + 27362B982F4240B500BCB1FB /* MapControls.swift */, 272F1F452E0EEF8B00FA52EF /* SafariView.swift */, 27697F822E254A9900FBD913 /* EmbeddedSafariView.swift */, 27697F842E255B6300FBD913 /* EmbeddedSafariViewCoordinator.swift */, @@ -1931,9 +1969,58 @@ path = Profile; sourceTree = ""; }; + 27362B9E2F4240CE00BCB1FB /* Custom Button */ = { + isa = PBXGroup; + children = ( + 27362B9C2F4240CE00BCB1FB /* MapCustomButton.swift */, + 27362B9D2F4240CE00BCB1FB /* MapCustomButtonKind.swift */, + ); + path = "Custom Button"; + sourceTree = ""; + }; + 27362BA12F4240CE00BCB1FB /* Position Button */ = { + isa = PBXGroup; + children = ( + 27362B9F2F4240CE00BCB1FB /* MapPositionButton.swift */, + 27362BA02F4240CE00BCB1FB /* MapPositionButtonMode.swift */, + ); + path = "Position Button"; + sourceTree = ""; + }; + 27362BA42F4240CE00BCB1FB /* Zoom Buttons */ = { + isa = PBXGroup; + children = ( + 27E495292F606B7700239433 /* MapZoomButtons.swift */, + 27362BA22F4240CE00BCB1FB /* MapZoomButton.swift */, + 27362BA32F4240CE00BCB1FB /* MapZoomButtonKind.swift */, + ); + path = "Zoom Buttons"; + sourceTree = ""; + }; + 27362BA92F4240CE00BCB1FB /* Map */ = { + isa = PBXGroup; + children = ( + 27362BE52F434C9200BCB1FB /* MapView.swift */, + 27362BE72F434C9E00BCB1FB /* MapOverlayView.swift */, + 272C75C62F4F6835009DC357 /* Controls */, + ); + path = Map; + sourceTree = ""; + }; + 273B6A042F4F5D2F00273B17 /* About */ = { + isa = PBXGroup; + children = ( + 27697F8F2E257ED800FBD913 /* AboutCoMapsView.swift */, + 27697F912E257EE600FBD913 /* ApoutOpenStreetMapView.swift */, + ); + path = About; + sourceTree = ""; + }; 2749E5C32E17F736006E73EC /* Model */ = { isa = PBXGroup; children = ( + 2765818E2F1E7F50002478CD /* Mode.swift */, + 2754F5AA2F61B3260011B076 /* Layer.swift */, 279367552E1BE16300AA5C3D /* Settings.swift */, 27AF185B2E1DB64B00CD41E2 /* Settings Types */, 270C9C252E16AB6300ABA688 /* Profile.swift */, @@ -1943,24 +2030,15 @@ path = Model; sourceTree = ""; }; - 27697F882E255D3F00FBD913 /* Help */ = { + 27697F882E255D3F00FBD913 /* Information */ = { isa = PBXGroup; children = ( - 27697F8E2E257ECB00FBD913 /* About */, + 27697F732E25177300FBD913 /* InformationView.swift */, + 273B6A042F4F5D2F00273B17 /* About */, 27697F802E254A5800FBD913 /* FaqView.swift */, 27697F7C2E254A5000FBD913 /* CopyrightView.swift */, ); - path = Help; - sourceTree = ""; - }; - 27697F8E2E257ECB00FBD913 /* About */ = { - isa = PBXGroup; - children = ( - 27697F732E25177300FBD913 /* AboutView.swift */, - 27697F8F2E257ED800FBD913 /* AboutCoMapsView.swift */, - 27697F912E257EE600FBD913 /* ApoutOpenStreetMapView.swift */, - ); - path = About; + path = Information; sourceTree = ""; }; 27768FDA2E20199A0086784A /* Routing */ = { @@ -1978,7 +2056,6 @@ 2752B6C92E31197000887CC4 /* MapLanguage.swift */, 2744A98E2F23D86B00E7D02C /* AlternativeMapLanguageHandling.swift */, 27AF184F2E1DB61500CD41E2 /* VoiceRoutingLanguage.swift */, - 27768FDF2E201BE60086784A /* LeftButtonType.swift */, 27AF18512E1DB61F00CD41E2 /* DistanceUnit.swift */, 27AF18532E1DB62600CD41E2 /* MobileDataPolicy.swift */, 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */, @@ -1988,6 +2065,15 @@ path = "Settings Types"; sourceTree = ""; }; + 27AFB5432F4F1D2F007A63FB /* Mode Picker */ = { + isa = PBXGroup; + children = ( + 27362BB72F4258B100BCB1FB /* MapModePicker.swift */, + 27AFB53D2F4F0835007A63FB /* MapModePickerChoice.swift */, + ); + path = "Mode Picker"; + sourceTree = ""; + }; 29B97314FDCFA39411CA2CEA /* Maps */ = { isa = PBXGroup; children = ( @@ -2366,28 +2452,6 @@ path = Categories; sourceTree = ""; }; - 345C34661CE9D32500BB2224 /* SideButtons */ = { - isa = PBXGroup; - children = ( - 3490D2D91CE9DD2500D0B838 /* MWMSideButtons.h */, - 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */, - 3490D2DB1CE9DD2500D0B838 /* MWMSideButtonsView.h */, - 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */, - 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */, - ); - path = SideButtons; - sourceTree = ""; - }; - 3463BA621DE81D760082417F /* TrafficButton */ = { - isa = PBXGroup; - children = ( - 3463BA631DE81DB90082417F /* MWMTrafficButtonViewController.h */, - 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */, - 3463BA651DE81DB90082417F /* MWMTrafficButtonViewController.xib */, - ); - path = TrafficButton; - sourceTree = ""; - }; 3467CEB3202C6F7F00D3C670 /* Notifications */ = { isa = PBXGroup; children = ( @@ -2516,17 +2580,6 @@ path = Toast; sourceTree = ""; }; - 349D1AC21E2E325B004A2006 /* BottomMenu */ = { - isa = PBXGroup; - children = ( - 99AAEA72244DA59E0039D110 /* Presentation */, - 998927312449E5ED00260CE2 /* Menu */, - 99012848244732C200C72B10 /* TabBar */, - 995F1610244F07F90060631D /* MWMBottomMenuState.h */, - ); - path = BottomMenu; - sourceTree = ""; - }; 34AB65C41FC5AA320078E451 /* NavigationDashboard */ = { isa = PBXGroup; children = ( @@ -2628,12 +2681,9 @@ 34BC72091B0DECAE0012A34B /* MapViewControls */ = { isa = PBXGroup; children = ( - ED49D76F2CF0E3A8004AF27E /* TrackRecordingButtonViewController.swift */, 340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */, 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */, 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */, - 345C34661CE9D32500BB2224 /* SideButtons */, - 3463BA621DE81D760082417F /* TrafficButton */, ); name = MapViewControls; path = CustomViews/MapViewControls; @@ -2684,7 +2734,7 @@ 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */, 3444DFCB1F1760B900E73099 /* WidgetsArea.swift */, 3444DFDC1F18A5AF00E73099 /* SideButtonsArea.swift */, - 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */, + 34FE5A6D1F18F30F00BCA729 /* ModeButtonArea.swift */, 340708631F2905A500029ECC /* NavigationInfoArea.swift */, 9989272F2449DE1500260CE2 /* TabBarArea.swift */, ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */, @@ -2863,20 +2913,6 @@ name = "Custom Views"; sourceTree = ""; }; - 99012848244732C200C72B10 /* TabBar */ = { - isa = PBXGroup; - children = ( - 99012849244732DB00C72B10 /* BottomTabBarPresenter.swift */, - 9901284B244732DB00C72B10 /* BottomTabBarViewController.swift */, - 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */, - 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */, - 349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */, - 990128552449A82400C72B10 /* BottomTabBarView.swift */, - ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */, - ); - path = TabBar; - sourceTree = ""; - }; 993DF0C223F6BD0600AC231A /* ElevationDetails */ = { isa = PBXGroup; children = ( @@ -2941,7 +2977,6 @@ 993DF0EF23F6BDB100AC231A /* UIViewControllerRenderer.swift */, 993DF0F023F6BDB100AC231A /* UINavigationItemRenderer.swift */, 47D48BF42432A7C900FEFB1F /* ChartViewRenderer.swift */, - 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */, 47A13CAC24BE9AA500027D4F /* DatePickerViewRenderer.swift */, 475ED78524C7C72F0063ADC7 /* ValueStepperViewRenderer.swift */, ); @@ -3021,41 +3056,6 @@ path = Pages; sourceTree = ""; }; - 998927312449E5ED00260CE2 /* Menu */ = { - isa = PBXGroup; - children = ( - 9989273E2449EC5B00260CE2 /* Cells */, - 998927322449E60200260CE2 /* BottomMenuPresenter.swift */, - 998927342449E60200260CE2 /* BottomMenuViewController.swift */, - 998927352449E60200260CE2 /* BottomMenuBuilder.swift */, - 998927362449E60200260CE2 /* BottomMenuInteractor.swift */, - 998927372449E60200260CE2 /* BottomMenuViewController.xib */, - ); - path = Menu; - sourceTree = ""; - }; - 9989273E2449EC5B00260CE2 /* Cells */ = { - isa = PBXGroup; - children = ( - 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */, - 9989273F2449ECC200260CE2 /* BottomMenuItemCell.swift */, - 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */, - 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */, - 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */, - ); - path = Cells; - sourceTree = ""; - }; - 99AAEA72244DA59E0039D110 /* Presentation */ = { - isa = PBXGroup; - children = ( - 99AAEA73244DA5ED0039D110 /* BottomMenuPresentationController.swift */, - 99AAEA75244DA7BF0039D110 /* BottomMenuTransitioning.swift */, - 99AAEA77244DA9810039D110 /* BottomMenuTransitioningManager.swift */, - ); - path = Presentation; - sourceTree = ""; - }; 99C6531F23F2F178004322F3 /* Components */ = { isa = PBXGroup; children = ( @@ -3600,21 +3600,22 @@ F6E2FBFB1E097B9F0083EBEC /* UI */ = { isa = PBXGroup; children = ( + 27362B9B2F4240CE00BCB1FB /* MainView.swift */, + 27362BA92F4240CE00BCB1FB /* Map */, 27768FDA2E20199A0086784A /* Routing */, ED9857022C4ECFFC00694F6C /* MailComposer */, ED43B8B92C12061600D07BAA /* DocumentPicker */, ED99667C2B94FBC20083CE55 /* ColorPicker */, F69018B51E9E5FEB00B3C10B /* Autoupdate */, 34E7760D1F14B165003040B3 /* AvailableArea */, - 349D1AC21E2E325B004A2006 /* BottomMenu */, CDB4D4DA222D24EE00104869 /* CarPlay */, F6E2FBFC1E097B9F0083EBEC /* Downloader */, F6E2FC291E097B9F0083EBEC /* EditBookmark */, F6E2FC321E097B9F0083EBEC /* Editor */, F6E2FC8F1E097B9F0083EBEC /* PlacePage */, F6E2FCE11E097B9F0083EBEC /* Search */, - 27697F882E255D3F00FBD913 /* Help */, F6E2FD361E097BA00083EBEC /* Settings */, + 27697F882E255D3F00FBD913 /* Information */, 340E1EE31E2F614400CE49BF /* Storyboard */, ); path = UI; @@ -3954,12 +3955,22 @@ 97A5967E19B9CD47007A963F /* copyright.html */, FA46DA2B12D4166E00968C36 /* countries.txt */, 271186862F19467400FD7FF3 /* countries_meta.txt */, - 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */, - 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */, - FA637ECC29A500BE00D8921A /* drules_proto_outdoors_light.bin */, - FA637ECF29A500BE00D8921A /* drules_proto_outdoors_light.txt */, - FA637ED129A500BE00D8921A /* drules_proto_outdoors_dark.bin */, - FA637ED029A500BE00D8921A /* drules_proto_outdoors_dark.txt */, + 27362BBA2F4284BF00BCB1FB /* drules_proto_walking_light.bin */, + 27362BBC2F4284BF00BCB1FB /* drules_proto_walking_outdoor_light.bin */, + 27362BB92F4284BF00BCB1FB /* drules_proto_walking_dark.bin */, + 27362BBB2F4284BF00BCB1FB /* drules_proto_walking_outdoor_dark.bin */, + 27362BC22F4284FA00BCB1FB /* drules_proto_cycling_light.bin */, + 27362BC42F4284FA00BCB1FB /* drules_proto_cycling_outdoor_light.bin */, + 27362BC12F4284FA00BCB1FB /* drules_proto_cycling_dark.bin */, + 27362BC32F4284FA00BCB1FB /* drules_proto_cycling_outdoor_dark.bin */, + 27362BC62F4284FA00BCB1FB /* drules_proto_driving_light.bin */, + 27362BC52F4284FA00BCB1FB /* drules_proto_driving_dark.bin */, + 27362BC82F4284FA00BCB1FB /* drules_proto_driving_outdoor_light.bin */, + 27362BC72F4284FA00BCB1FB /* drules_proto_driving_outdoor_dark.bin */, + 27362BCA2F4284FA00BCB1FB /* drules_proto_public-transport_light.bin */, + 27362BCC2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_light.bin */, + 27362BC92F4284FA00BCB1FB /* drules_proto_public-transport_dark.bin */, + 27362BCB2F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_dark.bin */, 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */, 4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */, 6B9978341C89A316003B8AA0 /* editor.config */, @@ -4070,7 +4081,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; ORGANIZATIONNAME = CoMaps; TargetAttributes = { 6741A93D1BF340DE002C974C = { @@ -4195,10 +4206,13 @@ 271186872F19467400FD7FF3 /* countries_meta.txt in Resources */, 47AEF8402231249E00D20538 /* categories_brands.txt in Resources */, F6C3A1B221AC22810060EEC8 /* Alert 5.m4a in Resources */, + 27362BBD2F4284BF00BCB1FB /* drules_proto_walking_dark.bin in Resources */, + 27362BBE2F4284BF00BCB1FB /* drules_proto_walking_outdoor_dark.bin in Resources */, + 27362BBF2F4284BF00BCB1FB /* drules_proto_walking_outdoor_light.bin in Resources */, + 27362BC02F4284BF00BCB1FB /* drules_proto_walking_light.bin in Resources */, 3404F49A2028A20D0090E401 /* BMCCategoryCell.xib in Resources */, 34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */, 471A7BC22481D44B00A0D4C1 /* BookmarkTitleCell.xib in Resources */, - FA637ED329A500BE00D8921A /* drules_proto_outdoors_light.txt in Resources */, F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */, 27176A862E65B0150015F25F /* Icon.icon in Resources */, F6E2FE701E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */, @@ -4211,10 +4225,20 @@ 6741A9711BF340DE002C974C /* copyright.html in Resources */, 4A300ED51C6DCFD400140018 /* countries-strings in Resources */, 6741A9491BF340DE002C974C /* countries.txt in Resources */, - 6741A9871BF340DE002C974C /* drules_proto_default_light.bin in Resources */, - 6741A97E1BF340DE002C974C /* drules_proto_default_dark.bin in Resources */, 6B9978361C89A316003B8AA0 /* editor.config in Resources */, 6741A9681BF340DE002C974C /* faq.html in Resources */, + 27362BCD2F4284FA00BCB1FB /* drules_proto_driving_outdoor_light.bin in Resources */, + 27362BCE2F4284FA00BCB1FB /* drules_proto_cycling_dark.bin in Resources */, + 27362BCF2F4284FA00BCB1FB /* drules_proto_cycling_outdoor_dark.bin in Resources */, + 27362BD02F4284FA00BCB1FB /* drules_proto_cycling_outdoor_light.bin in Resources */, + 27362BD12F4284FA00BCB1FB /* drules_proto_public-transport_light.bin in Resources */, + 27362BD22F4284FA00BCB1FB /* drules_proto_public-transport_dark.bin in Resources */, + 27362BD32F4284FA00BCB1FB /* drules_proto_driving_dark.bin in Resources */, + 27362BD42F4284FA00BCB1FB /* drules_proto_driving_light.bin in Resources */, + 27362BD52F4284FA00BCB1FB /* drules_proto_cycling_light.bin in Resources */, + 27362BD62F4284FA00BCB1FB /* drules_proto_driving_outdoor_dark.bin in Resources */, + 27362BD72F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_dark.bin in Resources */, + 27362BD82F4284FA00BCB1FB /* drules_proto_public-transport_outdoor_light.bin in Resources */, 34F73FA31E08300E00AC1FD6 /* Images.xcassets in Resources */, 34F73F9C1E082FF800AC1FD6 /* InfoPlist.strings in Resources */, 340E1EEF1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */, @@ -4229,8 +4253,6 @@ 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */, 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */, 99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */, - 349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */, - 349D1AE11E2E325C004A2006 /* BottomTabBarViewController.xib in Resources */, 34D3B01E1E389D05004100F9 /* MWMButtonCell.xib in Resources */, 9959C75624582DA2008FD4FD /* DirectionView.xib in Resources */, 6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */, @@ -4256,10 +4278,8 @@ F6E2FD591E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.xib in Resources */, F62607FF207B83C400176C5A /* MWMSpinnerAlert.xib in Resources */, F6E2FD621E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib in Resources */, - 995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */, 3404F48C202894EA0090E401 /* BMCViewController.xib in Resources */, F6E2FD681E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.xib in Resources */, - FA637ED429A500BE00D8921A /* drules_proto_outdoors_dark.txt in Resources */, F6E2FD6E1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */, 47CA68FA250F8AD100671019 /* BookmarksListSectionHeader.xib in Resources */, F6E2FD741E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */, @@ -4268,7 +4288,6 @@ F6E2FDEF1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */, F6E2FDF51E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */, F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, - FA637ED529A500BE00D8921A /* drules_proto_outdoors_dark.bin in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_light.bin in Resources */, 47CA68F2250B54AF00671019 /* BookmarksListCell.xib in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, @@ -4296,15 +4315,11 @@ BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */, 34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */, F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */, - 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */, 272CA4492F127221005A3F5B /* subtypes.csv in Resources */, F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */, - 3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */, F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */, 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */, 676507601C10559800830BB3 /* patterns.txt in Resources */, - 9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */, - FA637ED229A500BE00D8921A /* drules_proto_outdoors_light.bin in Resources */, 3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */, 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */, 6741A9421BF340DE002C974C /* sound-strings in Resources */, @@ -4369,7 +4384,6 @@ 34845DB71E166084003D55B9 /* Common.swift in Sources */, 47F4F21323A6EC420022FD56 /* DownloadMapsViewController.swift in Sources */, 99A906F623FA9C010005872B /* InsetsLabelRenderer.swift in Sources */, - 99012853244732DB00C72B10 /* BottomTabBarInteractor.swift in Sources */, 6741A9A31BF340DE002C974C /* main.mm in Sources */, 34D3B04F1E38A20C004100F9 /* Bundle+Init.swift in Sources */, 34AB666E1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */, @@ -4395,8 +4409,6 @@ 6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */, 99514BBA23E82B450085D3A7 /* ElevationProfileViewController.swift in Sources */, 340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */, - 3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */, - 99AAEA76244DA7BF0039D110 /* BottomMenuTransitioning.swift in Sources */, F6E2FDF81E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, 340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */, F6E2FE191E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */, @@ -4405,6 +4417,7 @@ 99C964292428C0F700E41723 /* PlacePageHeaderPresenter.swift in Sources */, F6E2FE101E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */, 6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */, + AABC12340D0F684500AABB03 /* SceneDelegate.mm in Sources */, 993DF12723F6BDB100AC231A /* Fonts.swift in Sources */, 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */, 340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */, @@ -4432,17 +4445,14 @@ 993DF0CC23F6BD0600AC231A /* ElevationDetailsPresenter.swift in Sources */, EDFE1A4A2DF1989700FDEA38 /* UIAlertController+UnknownCurrentPosition.swift in Sources */, 34AB666B1FC5AA330078E451 /* TransportTransitCell.swift in Sources */, - ED2E32912D10501700807A08 /* TrackRecordingButtonViewController.swift in Sources */, 47E8163323B17734008FD836 /* MWMStorage+UI.m in Sources */, 993DF11123F6BDB100AC231A /* UILabelRenderer.swift in Sources */, 34AB66471FC5AA330078E451 /* RouteManagerTableView.swift in Sources */, - 9989273C2449E60200260CE2 /* BottomMenuInteractor.swift in Sources */, 47DF72B922520CE20004AB10 /* MWMRoutingOptions.mm in Sources */, 27697F812E254A6000FBD913 /* FaqView.swift in Sources */, 999FC12023ABA9AD00B0E6F9 /* SearchStyleSheet.swift in Sources */, ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */, 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */, - 9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */, 272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */, 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.m in Sources */, 6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */, @@ -4462,6 +4472,7 @@ 3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */, 993F5513237C622700545511 /* DeepLinkHandler.swift in Sources */, 993DF11223F6BDB100AC231A /* UIImageRenderer.swift in Sources */, + 27362BE62F434C9900BCB1FB /* MapView.swift in Sources */, F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.m in Sources */, CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */, 34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */, @@ -4476,7 +4487,6 @@ 34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */, 993DF11B23F6BDB100AC231A /* UIViewRenderer.swift in Sources */, 99C964302428C27A00E41723 /* PlacePageHeaderView.swift in Sources */, - 9989273A2449E60200260CE2 /* BottomMenuViewController.swift in Sources */, 47E3C72D2111E6A2008B3B27 /* FadeTransitioning.swift in Sources */, 34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */, EDFDFB482B7139670013A44C /* Social Media.swift in Sources */, @@ -4485,8 +4495,9 @@ CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */, 99A906DE23F6F7030005872B /* PlacePageEditBookmarkOrTrackViewController.swift in Sources */, F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */, - 9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */, 471527372491C20500E91BBA /* SelectBookmarkGroupViewController.swift in Sources */, + 27362B992F4240B500BCB1FB /* MapControls.swift in Sources */, + 27362B9A2F4240B500BCB1FB /* MapControls.mm in Sources */, 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */, CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */, 99A906F323FA95AB0005872B /* PlacePageStyleSheet.swift in Sources */, @@ -4498,9 +4509,9 @@ 99A906E923F6F7030005872B /* WikiDescriptionViewController.swift in Sources */, ED79A5D62BDF8D6100952D1F /* CloudDirectoryMonitor.swift in Sources */, 993DF11023F6BDB100AC231A /* MWMButtonRenderer.swift in Sources */, - 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */, ED79A5D52BDF8D6100952D1F /* SynchronizationError.swift in Sources */, 993DF10323F6BDB100AC231A /* MainTheme.swift in Sources */, + 27E4952C2F606B7C00239433 /* MapZoomButtons.swift in Sources */, EDC4E34D2C5D1BEF009286A2 /* RecentlyDeletedTableViewCell.swift in Sources */, 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */, 993DF12A23F6BDB100AC231A /* Style.swift in Sources */, @@ -4524,6 +4535,7 @@ 27AF18522E1DB62000CD41E2 /* DistanceUnit.swift in Sources */, 27697F7F2E254A5500FBD913 /* CopyrightView.swift in Sources */, 993DF10A23F6BDB100AC231A /* UISwitchRenderer.swift in Sources */, + 2754F5A12F6168010011B076 /* MapTrackRecordingIndicator.swift in Sources */, 99C9642C2428C0F700E41723 /* PlacePageHeaderBuilder.swift in Sources */, 99C9642B2428C0F700E41723 /* PlacePageHeaderViewController.swift in Sources */, F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m in Sources */, @@ -4542,13 +4554,12 @@ 340416481E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */, F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */, ED77556E2C2C490B0051E656 /* UIAlertController+openInAppActionSheet.swift in Sources */, - 99AAEA74244DA5ED0039D110 /* BottomMenuPresentationController.swift in Sources */, 99514BB823E82B450085D3A7 /* ElevationProfilePresenter.swift in Sources */, 34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */, EDB71E002D8B0338004A6A7F /* ModalPresentationAnimator.swift in Sources */, F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */, 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */, - 990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */, + 2765818F2F1E7F53002478CD /* Mode.swift in Sources */, F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.m in Sources */, F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.m in Sources */, 47F86CFF20C936FC00FEE291 /* TabView.swift in Sources */, @@ -4564,10 +4575,8 @@ CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */, 475ED78824C7D0F30063ADC7 /* ValueStepperView.swift in Sources */, 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.m in Sources */, - 99AAEA78244DA9810039D110 /* BottomMenuTransitioningManager.swift in Sources */, 4761BE2A252D3DB900EE2DE4 /* SubgroupCell.swift in Sources */, 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */, - 9989273B2449E60200260CE2 /* BottomMenuBuilder.swift in Sources */, 993DF10F23F6BDB100AC231A /* UIActivityIndicatorRenderer.swift in Sources */, ED9DDF882D6F151000645BC8 /* PlacePageTrackRecordingLayout.swift in Sources */, ED0B1FEF2CAA9A25006E31A4 /* UIView+Highlight.swift in Sources */, @@ -4577,7 +4586,6 @@ 34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */, 3404F490202898CC0090E401 /* BMCModels.swift in Sources */, F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.m in Sources */, - 9901284F244732DB00C72B10 /* BottomTabBarPresenter.swift in Sources */, CDB4D5002231412900104869 /* MapTemplateBuilder.swift in Sources */, 34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.m in Sources */, 99A906EA23F6F7030005872B /* PlacePageInfoViewController.swift in Sources */, @@ -4629,9 +4637,7 @@ ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */, 34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */, 475ED78624C7C7300063ADC7 /* ValueStepperViewRenderer.swift in Sources */, - 3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */, 47F4F21523A6F06F0022FD56 /* AvailableMapsDataSource.swift in Sources */, - 99012852244732DB00C72B10 /* BottomTabBarBuilder.swift in Sources */, 99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */, 995739062355CAC40019AEE7 /* ImageViewCrossDisolve.swift in Sources */, ED83880F2D54DEB3002A0536 /* UIImage+FilledWithColor.swift in Sources */, @@ -4644,7 +4650,7 @@ 462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */, 993DF12D23F6BDB100AC231A /* GlobalStyleSheet.swift in Sources */, F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */, - 27697F742E25177600FBD913 /* AboutView.swift in Sources */, + 27697F742E25177600FBD913 /* InformationView.swift in Sources */, 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */, CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */, 3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */, @@ -4665,7 +4671,6 @@ 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.m in Sources */, 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */, 99A906E123F6F7030005872B /* PlacePageOSMContributionViewController.swift in Sources */, - 998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */, 27697F832E254AA100FBD913 /* EmbeddedSafariView.swift in Sources */, F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */, F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */, @@ -4673,11 +4678,13 @@ 27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */, 47E3C7252111E41B008B3B27 /* DimmedModalPresentationController.swift in Sources */, 3472B5CB200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift in Sources */, - 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */, + 34FE5A6F1F18F30F00BCA729 /* ModeButtonArea.swift in Sources */, 993DF10D23F6BDB100AC231A /* UIPageControlRenderer.swift in Sources */, FA8E808925F412E2002A1434 /* FirstSession.mm in Sources */, + 2754F5AD2F61B32B0011B076 /* Layer.swift in Sources */, 2793675A2E1BE17300AA5C3D /* SettingsView.swift in Sources */, 6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */, + 27172E492F447B420052A5A7 /* MapLayersButton.swift in Sources */, ED808D0F2C38407800D52585 /* CircleImageButton.swift in Sources */, CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */, 993DF11A23F6BDB100AC231A /* UIBarButtonItemRenderer.swift in Sources */, @@ -4715,6 +4722,7 @@ 34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */, 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */, 47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */, + 27172E4D2F44A64E0052A5A7 /* MapLayersButtonLayerToggle.swift in Sources */, 47CF2E6323BA0DD500D11C30 /* CopyLabel.swift in Sources */, 47CA68D12500435E00671019 /* BookmarksListViewController.swift in Sources */, 34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */, @@ -4737,7 +4745,6 @@ ED7CCC4F2C1362E300E2A737 /* FileType.swift in Sources */, 4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */, 34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */, - 998927402449ECC200260CE2 /* BottomMenuItemCell.swift in Sources */, F6E2FE221E097BA00083EBEC /* MWMOpeningHoursEditorViewController.mm in Sources */, ED79A5D72BDF8D6100952D1F /* SynchronizationStateResolver.swift in Sources */, 999FC12B23ABB4B800B0E6F9 /* FontStyleSheet.swift in Sources */, @@ -4749,7 +4756,6 @@ 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */, ED9857082C4ED02D00694F6C /* MailComposer.swift in Sources */, 99F8B4C623B644A6009FF0B4 /* MapStyleSheet.swift in Sources */, - 99012851244732DB00C72B10 /* BottomTabBarViewController.swift in Sources */, 993DF10623F6BDB100AC231A /* UIColor+rgba.swift in Sources */, EDC3573B2B7B5029001AE9CA /* CALayer+SetCorner.swift in Sources */, ED914AB22D35063A00973C45 /* TextColorStyleSheet.swift in Sources */, @@ -4767,11 +4773,13 @@ 993DF10523F6BDB100AC231A /* UINavigationItem+StyleStyle.swift in Sources */, 4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */, 039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */, + 27362BE82F434CA400BCB1FB /* MapOverlayView.swift in Sources */, 340475711E081A4600C92850 /* MWMSettings.mm in Sources */, 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */, 3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */, EDF838842C00B640007E4E67 /* SynchronizationFileWriter.swift in Sources */, 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.m in Sources */, + 27362BE42F43257A00BCB1FB /* MapSearchButton.swift in Sources */, 993DF10823F6BDB100AC231A /* IColors.swift in Sources */, 4707E4B12372FE860017DF6E /* PlacePageViewController.swift in Sources */, 34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */, @@ -4787,11 +4795,20 @@ 471A7BBE2481A3D000A0D4C1 /* EditBookmarkViewController.swift in Sources */, 993DF0C923F6BD0600AC231A /* ElevationDetailsBuilder.swift in Sources */, 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */, - 27768FE02E201BE60086784A /* LeftButtonType.swift in Sources */, 34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */, 3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */, 993DF10C23F6BDB100AC231A /* MWMTableViewCellRenderer.swift in Sources */, 27697F922E257EED00FBD913 /* ApoutOpenStreetMapView.swift in Sources */, + 27362BB82F4258B900BCB1FB /* MapModePicker.swift in Sources */, + 27362BAA2F4240CE00BCB1FB /* MapPositionButtonMode.swift in Sources */, + 27362BAC2F4240CE00BCB1FB /* MainView.swift in Sources */, + 27362BAE2F4240CE00BCB1FB /* MapZoomButtonKind.swift in Sources */, + 27362BAF2F4240CE00BCB1FB /* MapZoomButton.swift in Sources */, + 27362BB02F4240CE00BCB1FB /* MapButtonStyle.swift in Sources */, + 27362BB12F4240CE00BCB1FB /* MapPositionButton.swift in Sources */, + 27362BB22F4240CE00BCB1FB /* MapCustomButton.swift in Sources */, + 27362BB32F4240CE00BCB1FB /* MapCustomButtonKind.swift in Sources */, + 27362BB42F4240CE00BCB1FB /* MapMoreButton.swift in Sources */, 3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */, 34EF94291C05A6F30050B714 /* MWMSegue.m in Sources */, 47E3C7312111F4C2008B3B27 /* CoverVerticalPresentationAnimator.swift in Sources */, @@ -4799,16 +4816,15 @@ F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */, F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.m in Sources */, 34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */, + 27AFB5402F4F083B007A63FB /* MapModePickerChoice.swift in Sources */, 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */, 27697F872E255B8500FBD913 /* EmbeddedSafariViewContent.swift in Sources */, - ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */, 47B9065321C7FA400079C85E /* MWMImageCache.m in Sources */, F6FEA82E1C58F108007223CC /* MWMButton.m in Sources */, 34B924431DC8A29C0008D971 /* MWMMailViewController.m in Sources */, 340475651E081A4600C92850 /* MWMRouter.mm in Sources */, 47E3C72F2111F472008B3B27 /* CoverVerticalModalTransitioning.swift in Sources */, 34E776101F14B165003040B3 /* VisibleArea.swift in Sources */, - 995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */, ED0C54992C6E6AF000253A5F /* TrackRecordingManager.swift in Sources */, 993DF10723F6BDB100AC231A /* UIColor+image.swift in Sources */, 3454D7D71E07F045004AF2AD /* UIKitCategories.m in Sources */, @@ -5135,6 +5151,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -5170,6 +5187,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme index 8c7b41208..b9f57c06e 100644 --- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme +++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme @@ -1,6 +1,6 @@ String { + if isDisabledForPowerSaving { + return "\(imageName).badge.bolt" + } else { + return isVisible ? "\(imageName).badge.checkmark" : "\(imageName).badge.xmark" + } + } +} diff --git a/iphone/Maps/Model/Mode.swift b/iphone/Maps/Model/Mode.swift new file mode 100644 index 000000000..e8ccea814 --- /dev/null +++ b/iphone/Maps/Model/Mode.swift @@ -0,0 +1,74 @@ +import SwiftUI + +@objc enum Mode: Int, Identifiable, CaseIterable { + case walking + case cycling + case driving + case publicTransport + + + + // MARK: Properties + + /// The id + public var id: Int { + return Int(self.rawValue) + } + + + /// The description text + var description: String { + switch self { + case .walking: + return String(localized: "mode_walking") + case .cycling: + return String(localized: "mode_cycling") + case .driving: + return String(localized: "mode_driving") + case .publicTransport: + return String(localized: "mode_public-transport") + @unknown default: + fatalError() + } + } + + + /// The color + var color: Color { + switch self { + case .walking: + return .ModeColors.walking + case .cycling: + return .ModeColors.cycling + case .driving: + return .ModeColors.driving + case .publicTransport: + return .ModeColors.publicTransport + @unknown default: + fatalError() + } + } + + + /// The image + var image: Image { + return Image(imageName) + } + + + /// The image name + var imageName: String { + switch self { + case .walking: + return "walking" + case .cycling: + return "cycling" + case .driving: + return "driving" + case .publicTransport: + return "publictransport" + @unknown default: + fatalError() + } + } +} diff --git a/iphone/Maps/Model/Settings Types/LeftButtonType.swift b/iphone/Maps/Model/Settings Types/LeftButtonType.swift deleted file mode 100644 index 11f32d348..000000000 --- a/iphone/Maps/Model/Settings Types/LeftButtonType.swift +++ /dev/null @@ -1,52 +0,0 @@ -extension Settings { - /// The type of the left bottom bar button - enum LeftButtonType: String, Codable, CaseIterable, Identifiable { - case hidden = "Hidden" - case addPlace = "AddPlace" - case recordTrack = "RecordTrack" - case settings = "Settings" - case help = "Help" - - - - // MARK: Properties - - /// The id - var id: Self { self } - - - /// The description text - var description: String { - switch self { - case .hidden: - return String(localized: "disabled") - case .addPlace: - return String(localized: "placepage_add_place_button") - case .recordTrack: - return String(localized: "start_track_recording") - case .settings: - return String(localized: "settings") - case .help: - return String(localized: "help") - } - } - - - /// The image - var image: UIImage { - let configuration = UIImage.SymbolConfiguration(pointSize: 24, weight: .semibold) - switch self { - case .addPlace: - return UIImage(systemName: "plus", withConfiguration: configuration)! - case .recordTrack: - return UIImage(named: "track", in: nil, with: configuration)! - case .settings: - return UIImage(systemName: "gearshape.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 22, weight: .semibold))! - case .help: - return UIImage(systemName: "info.circle", withConfiguration: configuration)! - default: - return UIImage() - } - } - } -} diff --git a/iphone/Maps/Model/Settings.swift b/iphone/Maps/Model/Settings.swift index b5207571a..b6b51d792 100644 --- a/iphone/Maps/Model/Settings.swift +++ b/iphone/Maps/Model/Settings.swift @@ -14,13 +14,17 @@ import Combine /// Key for storing the type of action used for the bottom left main interface button in the user defaults - static private let userDefaultsKeyLeftButtonType = "LeftButtonType" + static let userDefaultsKeyMapCustomButtonKind = "LeftButtonType" /// Key for storing the map appearance in the user defaults static private let userDefaultsKeyMapAppearance = "MapAppearance" + /// The notification name for changing the power saving adjustments + @objc static let changePowerSavingAdjustmentsNotificationName: Notification.Name = Notification.Name(rawValue: "ChangePowerSavingAdjustments") + + /// The current distance unit static var distanceUnit: DistanceUnit { get { @@ -52,27 +56,16 @@ import Combine /// The type of action used for the bottom left main interface button - static var leftButtonType: LeftButtonType { + static var customButtonKind: MapCustomButton.Kind { get { - if let leftButtonTypeRawValue = UserDefaults.standard.string(forKey: userDefaultsKeyLeftButtonType), let leftButtonType = LeftButtonType(rawValue: leftButtonTypeRawValue) { - return leftButtonType + if let customButtonKindRawValue = UserDefaults.standard.string(forKey: userDefaultsKeyMapCustomButtonKind), let customButtonKind = MapCustomButton.Kind(rawValue: customButtonKindRawValue) { + return customButtonKind } - return .help - } - set { - UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyLeftButtonType) - } - } - - - /// If 3D buildings should be displayed - @objc static var has3dBuildings: Bool { - get { - return SettingsBridge.buildings3dViewEnabled() + return .favourites } set { - SettingsBridge.setBuildings3dViewEnabled(newValue) + UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapCustomButtonKind) } } @@ -123,6 +116,14 @@ import Combine } + /// If the current power saving mode has deactivated 3d buldings + static var powerSavingBlocksBuildings3dLayer: Bool { + get { + return !SettingsBridge.powerManagementBuildings3d() + } + } + + /// If an increased font size should be used for map labels @objc static var hasIncreasedFontsize: Bool { get { diff --git a/iphone/Maps/Model/Social Media.swift b/iphone/Maps/Model/Social Media.swift index 897dfe3e4..2888986b0 100644 --- a/iphone/Maps/Model/Social Media.swift +++ b/iphone/Maps/Model/Social Media.swift @@ -17,7 +17,7 @@ enum SocialMedia: CaseIterable, Identifiable { static let emailAddress: String = "ios@comaps.app" - //// The id + /// The id var id: Self { self } diff --git a/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift b/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift new file mode 100644 index 000000000..a939bd053 --- /dev/null +++ b/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift @@ -0,0 +1,17 @@ +final class ModeButtonArea: AvailableArea { + override func isAreaAffectingView(_ other: UIView) -> Bool { + return !other.modeButtonAreaAffectDirections.isEmpty + } + + override func addAffectingView(_ other: UIView) { + let ov = other.modeButtonAreaAffectView + let directions = ov.modeButtonAreaAffectDirections + addConstraints(otherView: ov, directions: directions) + } +} + +extension UIView { + @objc var modeButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] } + + var modeButtonAreaAffectView: UIView { return self } +} diff --git a/iphone/Maps/UI/AvailableArea/SideButtonsArea.swift b/iphone/Maps/UI/AvailableArea/SideButtonsArea.swift index b9a55b31a..ee35f1554 100644 --- a/iphone/Maps/UI/AvailableArea/SideButtonsArea.swift +++ b/iphone/Maps/UI/AvailableArea/SideButtonsArea.swift @@ -10,10 +10,6 @@ final class SideButtonsArea: AvailableArea { let directions = ov.sideButtonsAreaAffectDirections addConstraints(otherView: ov, directions: directions) } - - override func notifyObserver() { - MWMSideButtons.updateAvailableArea(areaFrame) - } } extension UIView { diff --git a/iphone/Maps/UI/AvailableArea/TabBarArea.swift b/iphone/Maps/UI/AvailableArea/TabBarArea.swift index 38d902ad1..b0cf24b03 100644 --- a/iphone/Maps/UI/AvailableArea/TabBarArea.swift +++ b/iphone/Maps/UI/AvailableArea/TabBarArea.swift @@ -16,10 +16,6 @@ final class TabBarArea: AvailableArea { let directions = ov.tabBarAreaAffectDirections addConstraints(otherView: ov, directions: directions) } - - override func notifyObserver() { - BottomTabBarViewController.updateAvailableArea(areaFrame) - } } extension UIView { diff --git a/iphone/Maps/UI/AvailableArea/TrackRecordingButtonArea.swift b/iphone/Maps/UI/AvailableArea/TrackRecordingButtonArea.swift index 9f1ca5e4a..e7311ae86 100644 --- a/iphone/Maps/UI/AvailableArea/TrackRecordingButtonArea.swift +++ b/iphone/Maps/UI/AvailableArea/TrackRecordingButtonArea.swift @@ -8,10 +8,6 @@ final class TrackRecordingButtonArea: AvailableArea { let directions = ov.trackRecordingButtonAreaAffectDirections addConstraints(otherView: ov, directions: directions) } - - override func notifyObserver() { - TrackRecordingButtonViewController.updateAvailableArea(areaFrame) - } } extension UIView { diff --git a/iphone/Maps/UI/AvailableArea/TrafficButtonArea.swift b/iphone/Maps/UI/AvailableArea/TrafficButtonArea.swift deleted file mode 100644 index 8747e23f4..000000000 --- a/iphone/Maps/UI/AvailableArea/TrafficButtonArea.swift +++ /dev/null @@ -1,21 +0,0 @@ -final class TrafficButtonArea: AvailableArea { - override func isAreaAffectingView(_ other: UIView) -> Bool { - return !other.trafficButtonAreaAffectDirections.isEmpty - } - - override func addAffectingView(_ other: UIView) { - let ov = other.trafficButtonAreaAffectView - let directions = ov.trafficButtonAreaAffectDirections - addConstraints(otherView: ov, directions: directions) - } - - override func notifyObserver() { - MWMTrafficButtonViewController.updateAvailableArea(areaFrame) - } -} - -extension UIView { - @objc var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] } - - var trafficButtonAreaAffectView: UIView { return self } -} diff --git a/iphone/Maps/UI/AvailableArea/WidgetsArea.swift b/iphone/Maps/UI/AvailableArea/WidgetsArea.swift index 2caa47f13..624ad3635 100644 --- a/iphone/Maps/UI/AvailableArea/WidgetsArea.swift +++ b/iphone/Maps/UI/AvailableArea/WidgetsArea.swift @@ -17,10 +17,6 @@ final class WidgetsArea: AvailableArea { let directions = ov.widgetsAreaAffectDirections addConstraints(otherView: ov, directions: directions) } - - override func notifyObserver() { - MWMMapWidgetsHelper.updateAvailableArea(areaFrame) - } } extension UIView { diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuState.h b/iphone/Maps/UI/BottomMenu/MWMBottomMenuState.h deleted file mode 100644 index 4fe78c430..000000000 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuState.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef MWMBottomMenuState_h -#define MWMBottomMenuState_h - -typedef NS_ENUM(NSUInteger, MWMBottomMenuState) { - MWMBottomMenuStateHidden, - MWMBottomMenuStateInactive, - MWMBottomMenuStateActive, - MWMBottomMenuStateLayers -}; - -#endif /* MWMBottomMenuState_h */ diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuBuilder.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuBuilder.swift deleted file mode 100644 index ff82a37bb..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuBuilder.swift +++ /dev/null @@ -1,36 +0,0 @@ -@objc class BottomMenuBuilder: NSObject { - @objc static func buildMenu(mapViewController: MapViewController, - controlsManager: MWMMapViewControlsManager, - delegate: BottomMenuDelegate) -> UIViewController { - return BottomMenuBuilder.build(mapViewController: mapViewController, - controlsManager: controlsManager, - delegate: delegate, - sections: [.layers, .items]) - } - - @objc static func buildLayers(mapViewController: MapViewController, - controlsManager: MWMMapViewControlsManager, - delegate: BottomMenuDelegate) -> UIViewController { - return BottomMenuBuilder.build(mapViewController: mapViewController, - controlsManager: controlsManager, - delegate: delegate, - sections: [.layers]) - } - - private static func build(mapViewController: MapViewController, - controlsManager: MWMMapViewControlsManager, - delegate: BottomMenuDelegate, - sections: [BottomMenuPresenter.Sections]) -> UIViewController { - let viewController = BottomMenuViewController(nibName: nil, bundle: nil) - let interactor = BottomMenuInteractor(viewController: viewController, - mapViewController: mapViewController, - controlsManager: controlsManager, - delegate: delegate) - let presenter = BottomMenuPresenter(view: viewController, interactor: interactor, sections: sections) - - interactor.presenter = presenter - viewController.presenter = presenter - - return viewController - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift deleted file mode 100644 index 50fe82aa6..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift +++ /dev/null @@ -1,118 +0,0 @@ -protocol BottomMenuInteractorProtocol: AnyObject { - func close() - func addPlace() - func downloadMaps() - func startDownloadingMapForCountry(_ countryId: String) - func donate() - func openHelp() - func openSettings() - func shareLocation(cell: BottomMenuItemCell) - func toggleTrackRecording() -} - -@objc protocol BottomMenuDelegate { - func actionDownloadMaps(_ mode: MWMMapDownloaderMode) - func addPlace() - func didFinishAddingPlace() -} - -class BottomMenuInteractor { - weak var presenter: BottomMenuPresenterProtocol? - private weak var viewController: UIViewController? - private weak var mapViewController: MapViewController? - private weak var delegate: BottomMenuDelegate? - private weak var controlsManager: MWMMapViewControlsManager? - - private let mapsStorage = Storage.shared() - private let trackRecorder: TrackRecordingManager = .shared - - init(viewController: UIViewController, - mapViewController: MapViewController, - controlsManager: MWMMapViewControlsManager, - delegate: BottomMenuDelegate) { - self.viewController = viewController - self.mapViewController = mapViewController - self.delegate = delegate - self.controlsManager = controlsManager - } -} - -extension BottomMenuInteractor: BottomMenuInteractorProtocol { - func close() { - guard let controlsManager = controlsManager else { - fatalError() - } - controlsManager.menuState = controlsManager.menuRestoreState - } - - func addPlace() { - delegate?.addPlace() - } - - func donate() { - close() - guard var url = SettingsBridge.donateUrl() else { return } - if url == "https://www.comaps.app/donate/" { - url = L("translated_om_site_url") + "donate/" - } - viewController?.openUrl(url, externally: true) - } - - func downloadMaps() { - close() - delegate?.actionDownloadMaps(.downloaded) - } - - func openHelp() { - close() - mapViewController?.openAbout() - } - - func openSettings() { - close() - mapViewController?.openSettings() - } - - func startDownloadingMapForCountry(_ countryId: String) { - let mapNodeAttributes = mapsStorage.attributes(forCountry: countryId) - switch mapNodeAttributes.nodeStatus { - case .downloading, .inQueue, .applying: - break - case .notDownloaded, .partly, .onDiskOutOfDate, .error: - mapsStorage.downloadNode(countryId) - case .undefined, .onDisk: - fatalError("Download button shouldn't be displayed when node is in these states") - @unknown default: - fatalError() - } - downloadMaps() - } - - func shareLocation(cell: BottomMenuItemCell) { - guard let coordinates = LocationManager.lastLocation()?.coordinate else { - viewController?.present(UIAlertController.unknownCurrentPosition(), animated: true, completion: nil) - return - } - guard let viewController = viewController else { return } - let vc = ActivityViewController.share(forMyPosition: coordinates) - vc.present(inParentViewController: viewController, anchorView: cell.anchorView) - } - - func toggleTrackRecording() { - close() - let mapViewController = MapViewController.shared()! - switch trackRecorder.recordingState { - case .active: - mapViewController.showTrackRecordingPlacePage() - case .inactive: - trackRecorder.start { result in - switch result { - case .success: - mapViewController.showTrackRecordingPlacePage() - case .failure: - break - } - } - } - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift deleted file mode 100644 index 53453f349..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift +++ /dev/null @@ -1,202 +0,0 @@ -protocol BottomMenuPresenterProtocol: UITableViewDelegate, UITableViewDataSource { - func onClosePressed() - func cellToHighlightIndexPath() -> IndexPath? - func setCellHighlighted(_ highlighted: Bool) -} - -class BottomMenuPresenter: NSObject { - enum CellType: Int, CaseIterable { - case addPlace - case recordTrack - case share - case donate - case downloadMaps - case settings - case help - } - - enum Sections: Int { - case layers - case items - } - - private weak var view: BottomMenuViewProtocol? - private let interactor: BottomMenuInteractorProtocol - private let sections: [Sections] - private var menuCells: [CellType] - private let trackRecorder = TrackRecordingManager.shared - private var cellToHighlight: CellType? - private let mapsStorage: Storage - private let countryId: String? - private let shouldUpdateMapToContribute: Bool - - init(view: BottomMenuViewProtocol, - interactor: BottomMenuInteractorProtocol, - sections: [Sections]) { - self.view = view - self.interactor = interactor - self.sections = sections - self.menuCells = [] - self.cellToHighlight = Self.getCellToHighlight() - let mapsStorage = Storage.shared() - self.mapsStorage = mapsStorage - self.countryId = mapsStorage.countryForViewportCenter() - self.shouldUpdateMapToContribute = - !(MWMNavigationDashboardManager.shared().state == .hidden && - FrameworkHelper.canEditMapAtViewportCenter() && - self.countryId != nil) - super.init() - } - - private static func getCellToHighlight() -> CellType? { - let featureToHighlightData = DeepLinkHandler.shared.getInAppFeatureHighlightData() - guard let featureToHighlightData, featureToHighlightData.urlType == .menu else { return nil } - switch featureToHighlightData.feature { - case .trackRecorder: return .recordTrack - default: return nil - } - } -} - -extension BottomMenuPresenter: BottomMenuPresenterProtocol { - func onClosePressed() { - interactor.close() - } - - func cellToHighlightIndexPath() -> IndexPath? { - // Highlighting is enabled only for the .items section. - guard let cellToHighlight, - let sectionIndex = sections.firstIndex(of: .items), - let cellIndex = menuCells.firstIndex(of: cellToHighlight) else { return nil } - return IndexPath(row: cellIndex, section: sectionIndex) - } - - func setCellHighlighted(_ highlighted: Bool) { - cellToHighlight = nil - } -} - -//MARK: -- UITableViewDataSource - -extension BottomMenuPresenter { - func numberOfSections(in tableView: UITableView) -> Int { - sections.count - } - - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - switch sections[section] { - case .layers: - return 1 - case .items: - let leftButtonType = Settings.leftButtonType - menuCells = CellType.allCases.filter { cell in - if cell == .donate { - return false - } else if leftButtonType == .addPlace, cell == .addPlace { - return false - } else if leftButtonType == .recordTrack, cell == .recordTrack { - return false - } else if leftButtonType == .help, cell == .help { - return false - } else if leftButtonType == .settings, cell == .settings { - return false - } - - return true - } - return menuCells.count - } - } - - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - switch sections[indexPath.section] { - case .layers: - let cell = tableView.dequeueReusableCell(cell: BottomMenuLayersCell.self)! - cell.onClose = { [weak self] in self?.onClosePressed() } - if sections.count > 1 { - cell.addSeparator(.bottom) - } - return cell - case .items: - let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! - switch menuCells[indexPath.row] { - case .addPlace: - cell.configure(imageName: "plus", - title: L("placepage_add_place_button"), - enabled: countryId != nil) - case .recordTrack: - cell.configure(imageName: "track", title: L("start_track_recording")) - case .downloadMaps: - cell.configure(imageName: "ic_menu_download", - title: L("download_maps"), - badgeCount: MapsAppDelegate.theApp().badgeNumber()) - case .donate: - cell.configure(imageName: "ic_menu_donate", - title: L("donate")) - case .help: - cell.configure(imageName: "help", - title: L("help")) - case .settings: - cell.configure(imageName: "gearshape.fill", - title: L("settings")) - case .share: - cell.configure(imageName: "square.and.arrow.up", - title: L("share_my_location")) - } - return cell - } - } -} - -//MARK: -- UITableViewDelegate - -extension BottomMenuPresenter { - func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? { - if let cell = tableView.cellForRow(at: indexPath) as? BottomMenuItemCell { - return cell.isEnabled ? indexPath : nil - } - return indexPath - } - - func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - tableView.deselectRow(at: indexPath, animated: true) - switch sections[indexPath.section] { - case .layers: - return; - case .items: - switch menuCells[indexPath.row] { - case .addPlace: - if shouldUpdateMapToContribute { - guard let countryId else { - fatalError("Add place button should be disabled when there is no country") - } - let countryName = mapsStorage.name(forCountry: countryId) - MWMAlertViewController.activeAlert().presentDefaultAlert( - withTitle: L("contribute_to_osm_update_map"), - message: String(format: L("contribute_to_osm_update_map_description"), countryName), - rightButtonTitle: L("download_button"), - leftButtonTitle: L("cancel") - ) { [weak self] in - self?.interactor.startDownloadingMapForCountry(countryId) - } - } else { - interactor.addPlace() - } - case .recordTrack: - interactor.toggleTrackRecording() - case .downloadMaps: - interactor.downloadMaps() - case .donate: - interactor.donate() - case .help: - interactor.openHelp() - case .settings: - interactor.openSettings() - case .share: - if let cell = tableView.cellForRow(at: indexPath) as? BottomMenuItemCell { - interactor.shareLocation(cell: cell) - } - } - } - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift deleted file mode 100644 index a13a32122..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift +++ /dev/null @@ -1,100 +0,0 @@ -protocol BottomMenuViewProtocol: AnyObject { - var presenter: BottomMenuPresenterProtocol? { get set } -} - -class BottomMenuViewController: MWMViewController { - var presenter: BottomMenuPresenterProtocol? - private let transitioningManager = BottomMenuTransitioningManager() - - @IBOutlet var tableView: UITableView! - @IBOutlet var heightConstraint: NSLayoutConstraint! - @IBOutlet var bottomConstraint: NSLayoutConstraint! - - lazy var chromeView: UIView = { - let view = UIView() - view.setStyle(.presentationBackground) - return view - }() - - weak var containerView: UIView! { - didSet { - containerView.insertSubview(chromeView, at: 0) - } - } - - override func viewDidLoad() { - super.viewDidLoad() - - tableView.layer.setCornerRadius(.buttonDefault, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner]) - tableView.sectionFooterHeight = 0 - - tableView.dataSource = presenter - tableView.delegate = presenter - tableView.registerNib(cell: BottomMenuItemCell.self) - tableView.registerNib(cell: BottomMenuLayersCell.self) - - NotificationCenter.default.addObserver(forName: UserDefaults.didChangeNotification, object: nil, queue: nil) { _ in - DispatchQueue.main.async { - self.tableView.reloadData() - } - } - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - if let cellToHighlight = presenter?.cellToHighlightIndexPath() { - tableView.cellForRow(at: cellToHighlight)?.highlight() - } - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - tableView.setNeedsLayout() - tableView.layoutIfNeeded() - heightConstraint.constant = min(tableView.contentSize.height, view.height) - tableView.isScrollEnabled = tableView.contentSize.height > heightConstraint.constant; - } - - @IBAction func onClosePressed(_ sender: Any) { - presenter?.onClosePressed() - } - - @IBAction func onPan(_ sender: UIPanGestureRecognizer) { - let yOffset = sender.translation(in: view.superview).y - let yVelocity = sender.velocity(in: view.superview).y - sender.setTranslation(CGPoint.zero, in: view.superview) - bottomConstraint.constant = min(bottomConstraint.constant - yOffset, 0); - - let alpha = 1.0 - abs(bottomConstraint.constant / tableView.height) - self.chromeView.alpha = alpha - - let state = sender.state - if state == .ended || state == .cancelled { - if yVelocity > 0 || (yVelocity == 0 && alpha < 0.8) { - presenter?.onClosePressed() - } else { - let duration = min(kDefaultAnimationDuration, TimeInterval(self.bottomConstraint.constant / yVelocity)) - self.view.layoutIfNeeded() - UIView.animate(withDuration: duration) { - self.chromeView.alpha = 1 - self.bottomConstraint.constant = 0 - self.view.layoutIfNeeded() - } - } - } - } - - override var transitioningDelegate: UIViewControllerTransitioningDelegate? { - get { return transitioningManager } - set { } - } - - override var modalPresentationStyle: UIModalPresentationStyle { - get { return .custom } - set { } - } -} - -extension BottomMenuViewController: BottomMenuViewProtocol { - -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.xib b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.xib deleted file mode 100644 index fe924da2a..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift deleted file mode 100644 index 9fc40c6f6..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.swift +++ /dev/null @@ -1,53 +0,0 @@ -import UIKit - -class BottomMenuItemCell: UITableViewCell { - - private enum Constants { - static let badgeSpacing: CGFloat = 8 - static let badgeBackgroundWidth: CGFloat = 32 - } - - @IBOutlet private var label: UILabel! - @IBOutlet private var badgeBackground: UIView! - @IBOutlet private var badgeCountLabel: UILabel! - @IBOutlet private var separator: UIView! - @IBOutlet private var icon: UIImageView! - @IBOutlet private var badgeSpacingConstraint: NSLayoutConstraint! - @IBOutlet private var badgeBackgroundWidthConstraint: NSLayoutConstraint! - var anchorView: UIView { - get { - return icon - } - } - - private(set) var isEnabled: Bool = true - - func configure(imageName: String, title: String, badgeCount: UInt = .zero, enabled: Bool = true) { - if imageName == "help" { - icon.image = Settings.LeftButtonType.help.image - } else if imageName == "plus" { - icon.image = Settings.LeftButtonType.addPlace.image - } else if imageName == "track" { - icon.image = Settings.LeftButtonType.recordTrack.image - } else if imageName == "ic_menu_download" || imageName == "ic_menu_donate" { - icon.image = UIImage(named: imageName) - } else { - let configuration = UIImage.SymbolConfiguration(pointSize: 22, weight: .semibold) - icon.image = UIImage(systemName: imageName, withConfiguration: configuration)! - } - - label.text = title - badgeBackground.isHidden = badgeCount == 0 - badgeCountLabel.text = "\(badgeCount)" - if badgeCount == 0 { - badgeSpacingConstraint.constant = 0 - badgeBackgroundWidthConstraint.constant = 0 - } else { - badgeSpacingConstraint.constant = Constants.badgeSpacing - badgeBackgroundWidthConstraint.constant = Constants.badgeBackgroundWidth - } - isEnabled = enabled - icon.setStyleAndApply(isEnabled ? .black : .gray) - label.setFontStyleAndApply(isEnabled ? .blackPrimary : .blackHint) - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.xib b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.xib deleted file mode 100644 index a716abb56..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuItemCell.xib +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayerButton.swift b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayerButton.swift deleted file mode 100644 index fd3c8d198..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayerButton.swift +++ /dev/null @@ -1,37 +0,0 @@ -final class BottomMenuLayerButton: VerticallyAlignedButton { - private var badgeView: UIView? - private let badgeSize = CGSize(width: 12, height: 12) - private let badgeOffset = CGPoint(x: -3, y: 3) - - var isBadgeHidden: Bool = true{ - didSet { - if oldValue != isBadgeHidden { - updateBadge() - } - } - } - - override func layoutSubviews() { - super.layoutSubviews() - imageView.layer.masksToBounds = true - updateBadge() - } - - private func updateBadge() { - if isBadgeHidden { - badgeView?.removeFromSuperview() - badgeView = nil - } else { - if badgeView == nil { - badgeView = UIView() - badgeView?.setStyle(.badge) - addSubview(badgeView!) - } - let imageFrame = imageView.frame - badgeView?.frame = CGRect(x:imageFrame.minX + imageFrame.width - badgeSize.width / 2 + badgeOffset.x, - y:imageFrame.minY - badgeSize.height/2 + badgeOffset.y, - width: badgeSize.width, - height: badgeSize.height) - } - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.swift b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.swift deleted file mode 100644 index 704445eda..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.swift +++ /dev/null @@ -1,107 +0,0 @@ -import UIKit - -class BottomMenuLayersCell: UITableViewCell { - @IBOutlet weak var closeButton: CircleImageButton! - - @IBOutlet private var subwayButton: BottomMenuLayerButton! { - didSet { - updateSubwayButton() - } - } - @IBOutlet private var isoLinesButton: BottomMenuLayerButton! { - didSet { - updateIsoLinesButton() - } - } - @IBOutlet private var outdoorButton: BottomMenuLayerButton! { - didSet { - updateOutdoorButton() - } - } - - var onClose: (()->())? - - override func awakeFromNib() { - super.awakeFromNib() - MapOverlayManager.add(self) - closeButton.setImage(UIImage(named: "ic_close")) - setupButtons() - } - - private func setupButtons() { - outdoorButton.setupWith(image: UIImage(resource: .btnMenuOutdoors), text: L("button_layer_outdoor")) - isoLinesButton.setupWith(image: UIImage(resource: .btnMenuIsomaps), text: L("button_layer_isolines")) - subwayButton.setupWith(image: UIImage(resource: .btnMenuSubway), text: L("button_layer_subway")) - } - - deinit { - MapOverlayManager.remove(self) - } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - } - - private func updateSubwayButton() { - let enabled = MapOverlayManager.transitEnabled() - subwayButton.setStyleAndApply(styleFor(enabled)) - } - - private func updateIsoLinesButton() { - let enabled = MapOverlayManager.isoLinesEnabled() - isoLinesButton.setStyleAndApply(styleFor(enabled)) - } - - private func updateOutdoorButton() { - let enabled = MapOverlayManager.outdoorEnabled() - outdoorButton.setStyleAndApply(styleFor(enabled)) - } - - @IBAction func onCloseButtonPressed(_ sender: Any) { - onClose?() - } - - @IBAction func onSubwayButton(_ sender: Any) { - let enable = !MapOverlayManager.transitEnabled() - MapOverlayManager.setTransitEnabled(enable) - } - - @IBAction func onIsoLinesButton(_ sender: Any) { - let enable = !MapOverlayManager.isoLinesEnabled() - MapOverlayManager.setIsoLinesEnabled(enable) - } - - @IBAction func onOutdoorButton(_ sender: Any) { - let enable = !MapOverlayManager.outdoorEnabled() - MapOverlayManager.setOutdoorEnabled(enable) - } -} - -extension BottomMenuLayersCell: MapOverlayManagerObserver { - func onTransitStateUpdated() { - updateSubwayButton() - } - - func onIsoLinesStateUpdated() { - updateIsoLinesButton() - } - - func onOutdoorStateUpdated() { - updateOutdoorButton() - } -} - -private extension BottomMenuLayersCell { - func styleFor(_ enabled: Bool) -> MapStyleSheet { - enabled ? .mapMenuButtonEnabled : .mapMenuButtonDisabled - } -} - -private extension BottomMenuLayerButton { - func setupWith(image: UIImage, text: String) { - self.image = image - spacing = 10 - numberOfLines = 2 - localizedText = text - } -} diff --git a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.xib b/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.xib deleted file mode 100644 index 2261721f3..000000000 --- a/iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.xib +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuPresentationController.swift b/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuPresentationController.swift deleted file mode 100644 index 5bfd0a344..000000000 --- a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuPresentationController.swift +++ /dev/null @@ -1,36 +0,0 @@ -final class BottomMenuPresentationController: UIPresentationController { - override func containerViewWillLayoutSubviews() { - super.containerViewWillLayoutSubviews() - (presentedViewController as? BottomMenuViewController)?.chromeView.frame = containerView!.bounds - presentedView?.frame = frameOfPresentedViewInContainerView - } - - override func presentationTransitionWillBegin() { - super.presentationTransitionWillBegin() - guard let presentedViewController = presentedViewController as? BottomMenuViewController, - let coordinator = presentedViewController.transitionCoordinator, - let containerView = containerView else { return } - - containerView.addSubview(presentedView!) - presentedViewController.containerView = containerView - presentedViewController.chromeView.frame = containerView.bounds - presentedViewController.chromeView.alpha = 0 - - coordinator.animate(alongsideTransition: { _ in - presentedViewController.chromeView.alpha = 1 - }, completion: nil) - } - - override func dismissalTransitionWillBegin() { - super.dismissalTransitionWillBegin() - guard let presentedViewController = presentedViewController as? BottomMenuViewController, - let coordinator = presentedViewController.transitionCoordinator, - let presentedView = presentedView else { return } - - coordinator.animate(alongsideTransition: { _ in - presentedViewController.chromeView.alpha = 0 - }, completion: { _ in - presentedView.removeFromSuperview() - }) - } -} diff --git a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioning.swift b/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioning.swift deleted file mode 100644 index eea1d5a7a..000000000 --- a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioning.swift +++ /dev/null @@ -1,35 +0,0 @@ -final class BottomMenuTransitioning: NSObject, UIViewControllerAnimatedTransitioning { - private let isPresentation: Bool - - init(isPresentation: Bool) { - self.isPresentation = isPresentation - super.init() - } - - func transitionDuration(using _: UIViewControllerContextTransitioning?) -> TimeInterval { - return kDefaultAnimationDuration - } - - func animateTransition(using transitionContext: UIViewControllerContextTransitioning) { - guard let fromVC = transitionContext.viewController(forKey: .from), - let toVC = transitionContext.viewController(forKey: .to) else { return } - - let animatingVC = isPresentation ? toVC : fromVC - guard let animatingView = animatingVC.view else { return } - - let finalFrameForVC = transitionContext.finalFrame(for: animatingVC) - var initialFrameForVC = finalFrameForVC - initialFrameForVC.origin.y += initialFrameForVC.size.height - - let initialFrame = isPresentation ? initialFrameForVC : finalFrameForVC - let finalFrame = isPresentation ? finalFrameForVC : initialFrameForVC - - animatingView.frame = initialFrame - - UIView.animate(withDuration: transitionDuration(using: transitionContext), - animations: { animatingView.frame = finalFrame }, - completion: { _ in - transitionContext.completeTransition(true) - }) - } -} diff --git a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioningManager.swift b/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioningManager.swift deleted file mode 100644 index ef7c9b44c..000000000 --- a/iphone/Maps/UI/BottomMenu/Presentation/BottomMenuTransitioningManager.swift +++ /dev/null @@ -1,14 +0,0 @@ -final class BottomMenuTransitioningManager: NSObject, UIViewControllerTransitioningDelegate { - func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source _: UIViewController) -> UIPresentationController? { - BottomMenuPresentationController(presentedViewController: presented, - presenting: presenting) - } - - func animationController(forPresented _: UIViewController, presenting _: UIViewController, source _: UIViewController) -> UIViewControllerAnimatedTransitioning? { - return BottomMenuTransitioning(isPresentation: true) - } - - func animationController(forDismissed _: UIViewController) -> UIViewControllerAnimatedTransitioning? { - return BottomMenuTransitioning(isPresentation: false) - } -} diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarBuilder.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarBuilder.swift deleted file mode 100644 index 493db1ff9..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarBuilder.swift +++ /dev/null @@ -1,14 +0,0 @@ -@objc class BottomTabBarBuilder: NSObject { - @objc static func build(mapViewController: MapViewController, controlsManager: MWMMapViewControlsManager) -> BottomTabBarViewController { - let viewController = BottomTabBarViewController(nibName: nil, bundle: nil) - let interactor = BottomTabBarInteractor(viewController: viewController, - mapViewController: mapViewController, - controlsManager: controlsManager) - let presenter = BottomTabBarPresenter(interactor: interactor) - - interactor.presenter = presenter - viewController.presenter = presenter - - return viewController - } -} diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarButton.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarButton.swift deleted file mode 100644 index 18fb21e61..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarButton.swift +++ /dev/null @@ -1,32 +0,0 @@ -import UIKit - -class BottomTabBarButton: MWMButton { - @objc override func applyTheme() { - if styleName.isEmpty { - setStyle(.bottomTabBarButton) - } - - for style in StyleManager.shared.getStyle(styleName) where !style.isEmpty && !style.hasExclusion(view: self) { - BottomTabBarButtonRenderer.render(self, style: style) - } - } - - override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - return bounds.insetBy(dx: kExtendedTabBarTappableMargin, dy: kExtendedTabBarTappableMargin).contains(point) - } -} - -class BottomTabBarButtonRenderer { - class func render(_ control: BottomTabBarButton, style: Style) { - UIViewRenderer.renderShadow(control, style: style) - UIViewRenderer.renderBorder(control, style: style) - - if let coloring = style.coloring { - control.coloring = coloring - } - if let backgroundColor = style.backgroundColor { - control.backgroundColor = backgroundColor - } - } -} - diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift deleted file mode 100644 index 36d001298..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift +++ /dev/null @@ -1,75 +0,0 @@ -protocol BottomTabBarInteractorProtocol: AnyObject { - func openSearch() - func openLeftButton() - func openBookmarks() - func openMenu() -} - -class BottomTabBarInteractor { - weak var presenter: BottomTabBarPresenterProtocol? - private weak var viewController: UIViewController? - private weak var mapViewController: MapViewController? - private weak var controlsManager: MWMMapViewControlsManager? - private let searchManager: SearchOnMapManager - - init(viewController: UIViewController, mapViewController: MapViewController, controlsManager: MWMMapViewControlsManager) { - self.viewController = viewController - self.mapViewController = mapViewController - self.controlsManager = controlsManager - self.searchManager = mapViewController.searchManager - } -} - -extension BottomTabBarInteractor: BottomTabBarInteractorProtocol { - func openSearch() { - searchManager.isSearching ? searchManager.close() : searchManager.startSearching(isRouting: false) - } - - func openLeftButton() { - switch Settings.leftButtonType { - case .addPlace: - if let delegate = controlsManager as? BottomMenuDelegate { - delegate.addPlace() - } - case .settings: - mapViewController?.openSettings() - case .recordTrack: - let mapViewController = MapViewController.shared()! - let trackRecorder: TrackRecordingManager = .shared - switch trackRecorder.recordingState { - case .active: - mapViewController.showTrackRecordingPlacePage() - case .inactive: - trackRecorder.start { result in - switch result { - case .success: - mapViewController.showTrackRecordingPlacePage() - case .failure: - break - } - } - } - default: - mapViewController?.openAbout() - } - } - - func openBookmarks() { - mapViewController?.bookmarksCoordinator.open() - } - - func openMenu() { - guard let state = controlsManager?.menuState else { - fatalError("ERROR: Failed to retrieve the current MapViewControlsManager's state.") - } - switch state { - case .inactive: controlsManager?.menuState = .active - case .active: controlsManager?.menuState = .inactive - case .hidden: - // When the current controls manager's state is hidden, accidental taps on the menu button during the hiding animation should be skipped. - break; - case .layers: fallthrough - @unknown default: fatalError("ERROR: Unexpected MapViewControlsManager's state: \(state)") - } - } -} diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarPresenter.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarPresenter.swift deleted file mode 100644 index 0785b144b..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarPresenter.swift +++ /dev/null @@ -1,37 +0,0 @@ -protocol BottomTabBarPresenterProtocol: AnyObject { - func configure() - func onLeftButtonPressed() - func onSearchButtonPressed() - func onBookmarksButtonPressed() - func onMenuButtonPressed() -} - -class BottomTabBarPresenter: NSObject { - private let interactor: BottomTabBarInteractorProtocol - - init(interactor: BottomTabBarInteractorProtocol) { - self.interactor = interactor - } -} - -extension BottomTabBarPresenter: BottomTabBarPresenterProtocol { - func configure() { - } - - func onLeftButtonPressed() { - interactor.openLeftButton() - } - - func onSearchButtonPressed() { - interactor.openSearch() - } - - func onBookmarksButtonPressed() { - interactor.openBookmarks() - } - - func onMenuButtonPressed() { - interactor.openMenu() - } -} - diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarView.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarView.swift deleted file mode 100644 index c4e79daaf..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarView.swift +++ /dev/null @@ -1,28 +0,0 @@ -let kExtendedTabBarTappableMargin: CGFloat = -15 - -final class BottomTabBarView: SolidTouchView { - - @IBOutlet var mainButtonsView: ExtendedBottomTabBarContainerView! - - override var placePageAreaAffectDirections: MWMAvailableAreaAffectDirections { - return alternative(iPhone: [], iPad: [.bottom]) - } - - override var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections { - return [.bottom] - } - - override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections { - return [.bottom] - } - - override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - return bounds.insetBy(dx: kExtendedTabBarTappableMargin, dy: kExtendedTabBarTappableMargin).contains(point) - } -} - -final class ExtendedBottomTabBarContainerView: UIView { - override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { - return bounds.insetBy(dx: kExtendedTabBarTappableMargin, dy: kExtendedTabBarTappableMargin).contains(point) - } -} diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift deleted file mode 100644 index 0c586f5e2..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift +++ /dev/null @@ -1,131 +0,0 @@ - -class BottomTabBarViewController: UIViewController { - var presenter: BottomTabBarPresenterProtocol! - - @IBOutlet var leftButton: MWMButton? - @IBOutlet var searchButton: MWMButton? - @IBOutlet var searchConstraintWithLeftButton: NSLayoutConstraint? - @IBOutlet var searchConstraintWithoutLeftButton: NSLayoutConstraint? - @IBOutlet var bookmarksButton: MWMButton? - @IBOutlet var bookmarksConstraintWithLeftButton: NSLayoutConstraint? - @IBOutlet var bookmarksConstraintWithoutLeftButton: NSLayoutConstraint? - @IBOutlet var moreButton: MWMButton? - @IBOutlet var downloadBadge: UIView? - - private var avaliableArea = CGRect.zero - @objc var isHidden: Bool = false { - didSet { - updateFrame(animated: true) - } - } - @objc var isApplicationBadgeHidden: Bool = true { - didSet { - updateBadge() - } - } - var tabBarView: BottomTabBarView { - return view as! BottomTabBarView - } - @objc static var controller: BottomTabBarViewController? { - return MWMMapViewControlsManager.manager()?.tabBarController - } - - override func viewDidLoad() { - super.viewDidLoad() - presenter.configure() - - NotificationCenter.default.addObserver(forName: UserDefaults.didChangeNotification, object: nil, queue: nil) { _ in - DispatchQueue.main.async { - self.updateLeftButton() - } - } - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - leftButton?.imageView?.contentMode = .scaleAspectFit - updateBadge() - } - - override func viewWillLayoutSubviews() { - super.viewWillLayoutSubviews() - updateLeftButton() - } - - static func updateAvailableArea(_ frame: CGRect) { - BottomTabBarViewController.controller?.updateAvailableArea(frame) - } - - @IBAction func onSearchButtonPressed(_ sender: Any) { - presenter.onSearchButtonPressed() - } - - @IBAction func onLeftButtonPressed(_ sender: Any) { - presenter.onLeftButtonPressed() - } - - @IBAction func onBookmarksButtonPressed(_ sender: Any) { - presenter.onBookmarksButtonPressed() - } - - @IBAction func onMenuButtonPressed(_ sender: Any) { - presenter.onMenuButtonPressed() - } - - private func updateAvailableArea(_ frame:CGRect) { - avaliableArea = frame - updateFrame(animated: false) - self.view.layoutIfNeeded() - } - - private func updateFrame(animated: Bool) { - if avaliableArea == .zero { - return - } - let newFrame = CGRect(x: avaliableArea.minX, - y: isHidden ? avaliableArea.minY + avaliableArea.height : avaliableArea.minY, - width: avaliableArea.width, - height: avaliableArea.height) - let alpha:CGFloat = isHidden ? 0 : 1 - if animated { - UIView.animate(withDuration: kDefaultAnimationDuration, - delay: 0, - options: [.beginFromCurrentState], - animations: { - self.view.frame = newFrame - self.view.alpha = alpha - }, completion: nil) - } else { - self.view.frame = newFrame - self.view.alpha = alpha - } - } - - private func updateLeftButton() { - let leftButtonType = Settings.leftButtonType - if leftButtonType == .hidden { - leftButton?.isHidden = true - - if let searchConstraintWithLeftButton, let searchConstraintWithoutLeftButton, let bookmarksConstraintWithLeftButton, let bookmarksConstraintWithoutLeftButton { - NSLayoutConstraint.activate([searchConstraintWithoutLeftButton, bookmarksConstraintWithoutLeftButton]) - NSLayoutConstraint.deactivate([searchConstraintWithLeftButton, bookmarksConstraintWithLeftButton]) - } - } else { - leftButton?.isHidden = false - - leftButton?.setTitle(nil, for: .normal) - leftButton?.setImage(leftButtonType.image, for: .normal) - leftButton?.accessibilityLabel = leftButtonType.description; - - if let searchConstraintWithLeftButton, let searchConstraintWithoutLeftButton, let bookmarksConstraintWithLeftButton, let bookmarksConstraintWithoutLeftButton { - NSLayoutConstraint.activate([searchConstraintWithLeftButton, bookmarksConstraintWithLeftButton]) - NSLayoutConstraint.deactivate([searchConstraintWithoutLeftButton, bookmarksConstraintWithoutLeftButton]) - } - } - } - - private func updateBadge() { - downloadBadge?.isHidden = isApplicationBadgeHidden - } -} diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib deleted file mode 100644 index 2a76e2c30..000000000 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Help/About/AboutCoMapsView.swift b/iphone/Maps/UI/Information/About/AboutCoMapsView.swift similarity index 100% rename from iphone/Maps/UI/Help/About/AboutCoMapsView.swift rename to iphone/Maps/UI/Information/About/AboutCoMapsView.swift diff --git a/iphone/Maps/UI/Help/About/ApoutOpenStreetMapView.swift b/iphone/Maps/UI/Information/About/ApoutOpenStreetMapView.swift similarity index 100% rename from iphone/Maps/UI/Help/About/ApoutOpenStreetMapView.swift rename to iphone/Maps/UI/Information/About/ApoutOpenStreetMapView.swift diff --git a/iphone/Maps/UI/Help/CopyrightView.swift b/iphone/Maps/UI/Information/CopyrightView.swift similarity index 100% rename from iphone/Maps/UI/Help/CopyrightView.swift rename to iphone/Maps/UI/Information/CopyrightView.swift diff --git a/iphone/Maps/UI/Help/FaqView.swift b/iphone/Maps/UI/Information/FaqView.swift similarity index 100% rename from iphone/Maps/UI/Help/FaqView.swift rename to iphone/Maps/UI/Information/FaqView.swift diff --git a/iphone/Maps/UI/Help/About/AboutView.swift b/iphone/Maps/UI/Information/InformationView.swift similarity index 99% rename from iphone/Maps/UI/Help/About/AboutView.swift rename to iphone/Maps/UI/Information/InformationView.swift index 7ac058e3f..dd76a3862 100644 --- a/iphone/Maps/UI/Help/About/AboutView.swift +++ b/iphone/Maps/UI/Information/InformationView.swift @@ -1,7 +1,7 @@ import SwiftUI /// View for the about information -struct AboutView: View { +struct InformationView: View { // MARK: Properties /// The dismiss action of the environment diff --git a/iphone/Maps/UI/MainView.swift b/iphone/Maps/UI/MainView.swift new file mode 100644 index 000000000..fc5bf1e4e --- /dev/null +++ b/iphone/Maps/UI/MainView.swift @@ -0,0 +1,41 @@ +import SwiftUI + +/// The main view of the app +struct MainView: View { + // MARK: Properties + + /// If the settings are being presented + @State private var isPresentingSettings: Bool = false + + + /// If the app information is being presented + @State private var isPresentingInformation: Bool = false + + + /// The publisher for receiving the request to present the settings + private let presentSettingsPublisher = NotificationCenter.default.publisher(for: MapControls.presentSettingsNotificationName) + + + /// The publisher for receiving the request to present the app information + private let presentHelpPublisher = NotificationCenter.default.publisher(for: MapControls.presentInformationNotificationName) + + + /// The actual view + var body: some View { + MapView(isPresentingSettings: $isPresentingSettings, isPresentingInformation: $isPresentingInformation) + .sheet(isPresented: $isPresentingSettings) { + SettingsView() + } + .sheet(isPresented: $isPresentingInformation) { + InformationView() + } + .onReceive(presentSettingsPublisher) { _ in + isPresentingSettings = true + isPresentingInformation = false + } + .onReceive(presentHelpPublisher) { _ in + isPresentingSettings = false + isPresentingInformation = true + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButton.swift b/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButton.swift new file mode 100644 index 000000000..8de826575 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButton.swift @@ -0,0 +1,66 @@ +import SwiftUI + +/// View for a custom map button +struct MapCustomButton: View { + // MARK: Properties + + /// The custom button kind + @AppStorage(Settings.userDefaultsKeyMapCustomButtonKind) private var kind: MapCustomButton.Kind = .favourites + + + /// If a badge is being shown + @State private var hasBadge: Bool = false + + + /// If a record badge is being shown + @State private var hasRecordBadge: Bool = false + + + /// The publisher for receiving map updates + private let mapUpdatesPublisher = NotificationCenter.default.publisher(for: MapControls.mapUpdatesNotificationName) + + + /// The publisher for receiving the updates on the track recording state + private let changeChangeTrackRecordingPublisher = NotificationCenter.default.publisher(for: MapControls.changeTrackRecordingNotificationName) + + + /// The actual view + var body: some View { + Button { + kind.action + } label: { + Label { + Text(kind.description) + } icon: { + kind.image + .symbolRenderingMode(hasBadge ? .palette : .monochrome) + .foregroundStyle((hasBadge ? Color.BaseColors.red : Color.primary), Color.primary) + .padding(.top, hasRecordBadge ? 3 : 0) + } + } + .buttonStyle(MapButtonStyle()) + .contentShape(Rectangle()) + .onAppear { + updateBadges() + } + .onChange(of: kind) { changedKind in + updateBadges() + } + .onReceive(mapUpdatesPublisher) { _ in + updateBadges() + } + .onReceive(changeChangeTrackRecordingPublisher) { _ in + updateBadges() + } + } + + + + // MARK: Methods + + /// Update the badges + func updateBadges() { + hasBadge = kind.hasBadge + hasRecordBadge = (kind == .recordTrack) && hasBadge + } +} diff --git a/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButtonKind.swift b/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButtonKind.swift new file mode 100644 index 000000000..db5971b65 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Custom Button/MapCustomButtonKind.swift @@ -0,0 +1,90 @@ +import SwiftUI + +extension MapCustomButton { + /// The kind of the custom map button + enum Kind: String, Codable, CaseIterable, Identifiable { + case addPlace = "AddPlace" + case recordTrack = "RecordTrack" + case shareLocation = "ShareLocation" + case favourites = "Favourites" + case downloadMaps = "DownloadMaps" + case settings = "Settings" + case information = "Information" + + + + // MARK: Properties + + /// The id + var id: Self { self } + + + /// The description text + var description: String { + switch self { + case .addPlace: + return String(localized: "placepage_add_place_button") + case .recordTrack: + return MapControls.isRecordingTrack ? String(localized: "recording_track") : String(localized: "record_track") + case .shareLocation: + return String(localized: "share_my_location") + case .favourites: + return String(localized: "bookmarks_and_tracks") + case .downloadMaps: + return String(localized: "download_maps") + case .settings: + return String(localized: "settings") + case .information: + return String(localized: "help") + } + } + + + /// The image + var image: Image { + switch self { + case .addPlace: + return Image(systemName: "plus") + case .recordTrack: + return MapControls.isRecordingTrack ? Image("track.badge.record") : Image("track") + case .shareLocation: + return Image(systemName: "square.and.arrow.up") + case .favourites: + return Image(systemName: "star.fill") + case .downloadMaps: + return MapControls.hasMapUpdates ? Image("download.badge") : Image("download") + case .settings: + return Image(systemName: "gearshape.fill") + case .information: + return Image(systemName: "info.circle") + } + } + + + /// The action + var action: () { + switch self { + case .addPlace: + return NotificationCenter.default.post(Notification(name: MapControls.presentAddPlaceNotificationName)) + case .recordTrack: + return NotificationCenter.default.post(Notification(name: MapControls.presentRecordTrackNotificationName)) + case .shareLocation: + return NotificationCenter.default.post(Notification(name: MapControls.presentShareLocationNotificationName)) + case .favourites: + return NotificationCenter.default.post(Notification(name: MapControls.presentFavouritesNotificationName)) + case .downloadMaps: + return NotificationCenter.default.post(Notification(name: MapControls.presentMapDownloadsNotificationName)) + case .settings: + return NotificationCenter.default.post(Notification(name: MapControls.presentSettingsNotificationName)) + case .information: + return NotificationCenter.default.post(Notification(name: MapControls.presentInformationNotificationName)) + } + } + + + /// If a badge is being shown + var hasBadge: Bool { + return (self == .downloadMaps && MapControls.hasMapUpdates) || (self == .recordTrack && MapControls.isRecordingTrack) + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButton.swift b/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButton.swift new file mode 100644 index 000000000..a6cd13982 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButton.swift @@ -0,0 +1,188 @@ +import SwiftUI + +/// View for a map layers button +struct MapLayersButton: View { + // MARK: Properties + + /// The width + @State private var width: CGFloat = 0 + + + /// The height + @State private var height: CGFloat = 0 + + + /// The height for animations + @State private var heightForAnimations: CGFloat = 0 + + + /// The options height + @State private var optionsHeight: CGFloat = 0 + + + /// The options height for animations + @State private var optionsHeightForAnimations: CGFloat = 0 + + + /// If the layer options are being presented horizontally instead of vertically + var isHorizontal: Bool = false + + + /// If the layer options are being presented via the extended layers button + @Binding var isPresentingLayers: Bool + + + /// If the layers options, that might being presented via the extended layers button, should be temporarily hidden to not be weirdly overlapped by for example the mode options + var shouldTemporarilyHideLayers: Bool + + + /// The actual view + var body: some View { + ZStack { + Button { + isPresentingLayers.toggle() + } label: { + Label { + Text("layers") + } icon: { + Image(systemName: "square.stack.3d.up.fill") + .padding(.bottom, 1) + } + } + .buttonStyle(MapButtonStyle(isClear: isPresentingLayers)) + .background { + GeometryReader { geometry in + if #available(iOS 16.0, *) { + Color.clear + .onAppear { + if isHorizontal { + height = geometry.size.width + width = geometry.size.height + } else { + height = geometry.size.height + width = geometry.size.width + } + } + .onGeometryChange(for: CGRect.self) { changedGeometry in + changedGeometry.frame(in: .global) + } action: { _ in + if isHorizontal { + height = geometry.size.width + width = geometry.size.height + } else { + height = geometry.size.height + width = geometry.size.width + } + } + } else { + Color.clear + .onAppear { + if isHorizontal { + height = geometry.size.width + width = geometry.size.height + } else { + height = geometry.size.height + width = geometry.size.width + } + } + } + } + } + } + .background(alignment: isHorizontal ? .trailing : .top) { + ZStack(alignment: isHorizontal ? .trailing : .top) { + if isPresentingLayers, !shouldTemporarilyHideLayers { + if isHorizontal { + HStack(spacing: 12) { + ForEach(Layer.allCases.reversed()) { layer in + MapLayersButton.LayerToggle(layer: layer) + .frame(height: max(0, width - 8)) + } + } + .padding(4) + .padding(.horizontal, 6) + } else { + VStack(spacing: 8) { + ForEach(Layer.allCases) { layer in + MapLayersButton.LayerToggle(layer: layer) + .frame(width: max(0, width - 8)) + } + } + .padding(4) + .padding(.vertical, 6) + } + } + } + .background { + GeometryReader { optionsGeometry in + if #available(iOS 16.0, *) { + Color.clear + .onAppear { + if isHorizontal { + optionsHeight = optionsGeometry.size.width + } else { + optionsHeight = optionsGeometry.size.height + } + } + .onGeometryChange(for: CGRect.self) { changedContentGeometry in + changedContentGeometry.frame(in: .global) + } action: { _ in + if isHorizontal { + optionsHeight = optionsGeometry.size.width + } else { + optionsHeight = optionsGeometry.size.height + } + } + } else { + Color.clear + .onAppear { + if isHorizontal { + optionsHeight = optionsGeometry.size.width + } else { + optionsHeight = optionsGeometry.size.height + } + } + } + } + } + .frame(width: isHorizontal ? (optionsHeightForAnimations) : (width + 2), height: isHorizontal ? (width + 2) : (optionsHeightForAnimations), alignment: isHorizontal ? .trailing : .top) + .padding(isHorizontal ? .trailing : .top, heightForAnimations) + .frame(width: (isHorizontal ? height + optionsHeightForAnimations : nil), height: (isHorizontal ? nil : height + optionsHeightForAnimations), alignment: isHorizontal ? .trailing : .top) + .background(alignment: isHorizontal ? .trailing : .top) { + if isPresentingLayers, !shouldTemporarilyHideLayers { + if #unavailable(iOS 27, macOS 27) { + Capsule() + .stroke(Color.MapButtons.border, lineWidth: 1) + .background(alignment: .top) { + Capsule() + .fill(EllipticalGradient(colors: [Color.MapButtons.backgroundGlow, Color.MapButtons.background])) + } + .shadow(radius: 2) + .foregroundStyle(Color.primary) + .compositingGroup() + } else { + Capsule() + .fill(Color.MapButtons.background.opacity(0.3)) + .glassEffect(.regular, in: RoundedRectangle(cornerRadius: 28)) + .shadow(radius: 2) + } + } + } + .compositingGroup() + .padding(4) + .onTapGesture { + // Trick to extend the safe area around it + } + .padding(-4) + .contentShape(Rectangle()) + .onChange(of: optionsHeight) { changedOptionsHeight in + withAnimation(.spring.speed(4)) { + optionsHeightForAnimations = changedOptionsHeight + } + withAnimation(.spring.speed(2.1)) { + heightForAnimations = (changedOptionsHeight == 0 ? 0 : height) + } + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButtonLayerToggle.swift b/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButtonLayerToggle.swift new file mode 100644 index 000000000..ecb807d23 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Layers Button/MapLayersButtonLayerToggle.swift @@ -0,0 +1,68 @@ +import SwiftUI + +extension MapLayersButton { + /// View for a toogle of an extended map layers button + struct LayerToggle: View { + // MARK: Properties + + /// If the layer is visible + @State private var isVisible: Bool = false + + + /// If the layer is currently disabled for power saving + @State private var isDisabledForPowerSaving: Bool = false + + + /// The layer + @State var layer: Layer + + + /// If the power saving hint is being presented + @State private var isPresentingPowerSavingHint: Bool = false + + + /// The publisher for receiving the updates on the power saving adjustments + private let changePowerSavingAdjustmentsPublisher = NotificationCenter.default.publisher(for: Settings.changePowerSavingAdjustmentsNotificationName) + + + /// The actual view + var body: some View { + Button { + if isDisabledForPowerSaving { + isPresentingPowerSavingHint = true + } else { + withAnimation(.none) { + isVisible.toggle() + } + } + } label: { + Label { + Text(layer.description) + } icon: { + Image(layer.badgedImageName(isVisible: isVisible)) + } + } + .labelStyle(.iconOnly) + .font(.title2) + .symbolRenderingMode(.palette) + .foregroundStyle((isVisible ? Color.BaseColors.green : Color.BaseColors.red), (isDisabledForPowerSaving ? .secondary.opacity(0.5) : layer.color)) + .contentShape(Rectangle()) + .id(layer.id) + .alert("layers_power-saving", isPresented: $isPresentingPowerSavingHint, actions: { + Button("ok") { + isPresentingPowerSavingHint = false + } + }) + .onAppear { + isVisible = layer.isVisible + isDisabledForPowerSaving = layer.isDisabledForPowerSaving + } + .onChange(of: isVisible) { changedIsVisible in + layer.isVisible = changedIsVisible + } + .onReceive(changePowerSavingAdjustmentsPublisher) { _ in + isDisabledForPowerSaving = layer.isDisabledForPowerSaving + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/MapButtonStyle.swift b/iphone/Maps/UI/Map/Controls/MapButtonStyle.swift new file mode 100644 index 000000000..b8cd8f384 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/MapButtonStyle.swift @@ -0,0 +1,42 @@ +import SwiftUI + +/// The floating button style used for map buttons +struct MapButtonStyle: ButtonStyle { + var isClear = false + + func makeBody(configuration: Configuration) -> some View { + GeometryReader { geometry in + configuration.label + .labelStyle(.iconOnly) + .font(.title2) + .scaleEffect(1.1) + .aspectRatio(1, contentMode: .fill) + .frame(width: geometry.size.width, height: geometry.size.width) + .background { + if #unavailable(iOS 27, macOS 27) { + RoundedRectangle(cornerRadius: 28) + .stroke(Color.MapButtons.border, lineWidth: 1) + .background { + RoundedRectangle(cornerRadius: 28) + .fill(EllipticalGradient(colors: [Color.MapButtons.backgroundGlow, Color.MapButtons.background])) + .opacity(configuration.isPressed ? 0.9 : 1) + } + .aspectRatio(1, contentMode: .fill) + .shadow(radius: 2) + .compositingGroup() + } else { + RoundedRectangle(cornerRadius: 28) + .fill(Color.MapButtons.background.opacity(isClear ? 0 : 0.3)) + .glassEffect(isClear ? .clear : .regular, in: RoundedRectangle(cornerRadius: 28)) + .aspectRatio(1, contentMode: .fill) + .shadow(radius: 2) + .opacity(configuration.isPressed ? 0.9 : 1) + } + } + .foregroundStyle(configuration.role == .destructive ? Color(.BaseColors.red) : Color.primary) + .scaleEffect(configuration.isPressed ? 0.96 : 1) + .contentShape(Rectangle()) + .animation(.smooth, value: configuration.isPressed) + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/MapMoreButton.swift b/iphone/Maps/UI/Map/Controls/MapMoreButton.swift new file mode 100644 index 000000000..d727a701f --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/MapMoreButton.swift @@ -0,0 +1,89 @@ +import SwiftUI + +/// View for a button with all other map actions +struct MapMoreButton: View { + // MARK: Properties + + /// The color scheme of the environment + @Environment(\.colorScheme) private var colorScheme + + + /// The custom button kind + @AppStorage(Settings.userDefaultsKeyMapCustomButtonKind) private var customButtonKind: MapCustomButton.Kind = .favourites + + + /// If a badge is being shown + @State private var hasBadge: Bool = false + + + /// The publisher for receiving map updates + private let mapUpdatesPublisher = NotificationCenter.default.publisher(for: MapControls.mapUpdatesNotificationName) + + + /// The actual view + var body: some View { + Button { + // Do nothing + } label: { + Label("more", image: (hasBadge ? "more.badge" : "more")) + .hidden() + } + .buttonStyle(MapButtonStyle()) + .compositingGroup() + .accessibilityHidden(true) + .overlay { + Menu { + ForEach(MapCustomButton.Kind.allCases) { kind in + if kind != customButtonKind { + Button { + kind.action + } label: { + Label { + Text(kind.description) + } icon: { + kind.image + .symbolRenderingMode(kind.hasBadge ? .palette : .monochrome) + .foregroundStyle((kind.hasBadge ? Color.BaseColors.red : (colorScheme == .dark ? .white : .primary)), (colorScheme == .dark ? .white : .primary)) + // The use of explicitly setting the colour to white based on the color scheme above is to work around a weird case where the download map icons in the palette rendering mode isn't coloured white + } + .labelStyle(.titleAndIcon) + } + } + } + } label: { + Label { + Text("more") + } icon: { + Image(hasBadge ? "more.badge" : "more") + .padding(.top, hasBadge ? 10 : 0) + } + .labelStyle(.iconOnly) + .font(.title2) + .scaleEffect(1.1) + .padding(12) + .aspectRatio(1, contentMode: .fill) + .symbolRenderingMode(hasBadge ? .palette : .monochrome) + .foregroundStyle((hasBadge ? Color.BaseColors.red : Color.primary), Color.primary) + } + } + .contentShape(Rectangle()) + .onAppear { + updateBadge() + } + .onChange(of: customButtonKind) { _ in + updateBadge() + } + .onReceive(mapUpdatesPublisher) { _ in + updateBadge() + } + } + + + + // MARK: Methods + + /// Update the badge + func updateBadge() { + hasBadge = (customButtonKind != .downloadMaps && MapControls.hasMapUpdates) + } +} diff --git a/iphone/Maps/UI/Map/Controls/MapSearchButton.swift b/iphone/Maps/UI/Map/Controls/MapSearchButton.swift new file mode 100644 index 000000000..1c179bb4c --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/MapSearchButton.swift @@ -0,0 +1,69 @@ +import SwiftUI + +/// View for a map search button (later to be replaced by an actual textfield) +struct MapSearchButton: View { + // MARK: Properties + + /// The vertical size class of the environment + @Environment(\.verticalSizeClass) private var verticalSizeClass + + + /// The color scheme of the environment + @Environment(\.colorScheme) private var colorScheme + + + /// The default height of a map control + var controlHeight: CGFloat + + + /// The actual view + var body: some View { + HStack(spacing: 0) { + if verticalSizeClass != .compact { + Spacer(minLength: 0) + } + + HStack(spacing: 0) { + ForEach(Mode.allCases) { mode in + Circle() + .fill(.clear) + } + } + .padding(4) + .accessibilityHidden(true) + .overlay { + Button { + NotificationCenter.default.post(Notification(name: MapControls.presentSearchNotificationName)) + } label: { + Label("search", systemImage: "magnifyingglass") + .foregroundStyle(.secondary) + .padding(.leading) + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading) + .compositingGroup() + .background(.white.opacity(0.01)) + } + .buttonStyle(.plain) + } + .background { + RoundedRectangle(cornerRadius: 28) + .stroke(Color.MapButtons.border, lineWidth: 1) + .background { + if colorScheme == .dark { + RoundedRectangle(cornerRadius: 28) + .fill(Color.black) + } + + RoundedRectangle(cornerRadius: 28) + .fill(Color.white.opacity(colorScheme == .dark ? 0.25 : 1)) + } + .shadow(radius: 2) + .foregroundStyle(Color.secondary) + .compositingGroup() + } + .contentShape(Rectangle()) + .padding(.leading, verticalSizeClass == .compact ? (controlHeight + 24) : 0) + + Spacer(minLength: 0) + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/MapTrackRecordingIndicator.swift b/iphone/Maps/UI/Map/Controls/MapTrackRecordingIndicator.swift new file mode 100644 index 000000000..ca9932d37 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/MapTrackRecordingIndicator.swift @@ -0,0 +1,82 @@ +import SwiftUI + +/// View for a map track recording indicator +struct MapTrackRecordingIndicator: View { + // MARK: Properties + + /// The vertical size class of the environment + @Environment(\.verticalSizeClass) private var verticalSizeClass + + + /// The custom button kind + @AppStorage(Settings.userDefaultsKeyMapCustomButtonKind) private var customButtonKind: MapCustomButton.Kind = .favourites + + + /// If the track is currently being recorded + @State private var isRecording: Bool = (TrackRecordingManager.shared.recordingState == .active) + + + /// The publisher for receiving the updates on the track recording state + private let changeChangeTrackRecordingPublisher = NotificationCenter.default.publisher(for: MapControls.changeTrackRecordingNotificationName) + + + /// The default height of a map control + var controlHeight: CGFloat + + + /// The actual view + var body: some View { + GeometryReader { geometry in + HStack(spacing: 0) { + if customButtonKind != .recordTrack, isRecording { + if verticalSizeClass != .compact { + Spacer(minLength: 0) + } + + HStack(spacing: 0) { + ForEach(Mode.allCases) { mode in + Circle() + .fill(.clear) + } + } + .padding(4) + .accessibilityHidden(true) + .overlay { + Button(role: .destructive) { + MapCustomButton.Kind.recordTrack.action + } label: { + HStack(spacing: 4) { + Image(systemName: "inset.filled.circle") + + Text(MapCustomButton.Kind.recordTrack.description) + } + .font(.callout) + .foregroundStyle(.white) + } + .buttonStyle(.plain) + .frame(height: geometry.size.height / 1.8) + } + .background { + RoundedRectangle(cornerRadius: 28) + .stroke(Color.black.opacity(0.1), lineWidth: 1) + .background { + Capsule() + .fill(Color.BaseColors.red) + .opacity(0.9) + } + .shadow(radius: 2) + .compositingGroup() + .frame(height: geometry.size.height / 1.8) + } + .contentShape(Rectangle()) + + Spacer(minLength: 0) + } + } + .padding(.leading, verticalSizeClass == .compact ? (controlHeight + 24) : 0) + .onReceive(changeChangeTrackRecordingPublisher) { _ in + isRecording = (TrackRecordingManager.shared.recordingState == .active) + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePicker.swift b/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePicker.swift new file mode 100644 index 000000000..4c311bea9 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePicker.swift @@ -0,0 +1,250 @@ +import SwiftUI + +/// View for a map mode picker +struct MapModePicker: View { + // MARK: Properties + + /// The horizontal size class of the environment + @Environment(\.horizontalSizeClass) private var horizontalSizeClass + + + /// The vertical size class of the environment + @Environment(\.verticalSizeClass) private var verticalSizeClass + + + /// The default height of a map control + var controlHeight: CGFloat + + + /// The selected mode + @State private var selectedMode: Mode = MapControls.mode + + + /// If the mode options are being presented + @State private var isPresentingModeOptions: Bool = false + + + /// If the public transport mode has transit lines + @State private var hasTransitLinesForPublicTransportMode: Bool = true + + + /// If the layers options, that might being presented via the extended layers button, should be temporarily hidden to not be weirdly overlapped by for example the mode options + @Binding var shouldTemporarilyHideLayersIfNecessary: Bool + + + /// If the dragging should be prevented, because it didn't start at the selected mode + @State private var preventDraging: Bool = false + + + /// If a mode is currently being dragged + @State private var isDragging: Bool = false + + + /// The dragged mode to not have too quick mode changes when dragging + @State private var draggedMode: Mode = MapControls.mode + + + /// The actual view + var body: some View { + GeometryReader { geometry in + VStack(spacing: 0) { + HStack(spacing: 0) { + ForEach(Mode.allCases) { mode in + if !isPresentingModeOptions || mode == selectedMode { + MapModePicker.Choice(selectedMode: $selectedMode, mode: mode, isDragging: $isDragging, draggedMode: $draggedMode) + .simultaneousGesture( + LongPressGesture().onEnded { _ in + if !isDragging { + selectedMode = mode + shouldTemporarilyHideLayersIfNecessary = true + isPresentingModeOptions.toggle() + } + } + ) + } + } + + if isPresentingModeOptions { + Text(selectedMode.description) + .font(.title2) + .bold() + .foregroundStyle(Color.white) + + Spacer(minLength: 0) + + Button { + isPresentingModeOptions.toggle() + shouldTemporarilyHideLayersIfNecessary = false + } label: { + Label("close", systemImage: "xmark.circle.fill") + .labelStyle(.iconOnly) + .imageScale(.large) + .padding(.horizontal, 8) + } + .buttonStyle(.plain) + .font(.title2) + .foregroundStyle(Color.white.opacity(0.5)) + } + } + .padding(isPresentingModeOptions ? 4 : 0) + .background(alignment: .leading) { + HStack(spacing: 0) { + if !isPresentingModeOptions { + ForEach(0.. 7 { + isDragging = true + } + } else { + preventDraging = true + } + } + }).onEnded({ _ in + Task { + isDragging = false + preventDraging = false + } + }) + ) + .padding(isPresentingModeOptions ? 0 : 4) + .background { + if isPresentingModeOptions { + ZStack { + RoundedRectangle(cornerRadius: 28) + .fill(selectedMode.color) + + VStack { + Color.black + .hidden() + + selectedMode.color + } + } + .compositingGroup() + } + } + .frame(height: geometry.size.height) + + if isPresentingModeOptions { + VStack { + if selectedMode == .publicTransport { + Toggle("mode_option_transitlines", isOn: $hasTransitLinesForPublicTransportMode) + .tint(selectedMode.color) + } else { + Toggle("mode_option_comingsoon", isOn: .constant(false)) + .hidden() + .overlay { + Label("mode_option_comingsoon", systemImage: "clock") + } + } + } + .padding() + } + } + .background { + if isPresentingModeOptions { + if #unavailable(iOS 27, macOS 27) { + RoundedRectangle(cornerRadius: 25) + .stroke(selectedMode.color, lineWidth: 1) + .background { + RoundedRectangle(cornerRadius: 25) + .fill(Color.MapButtons.background) + } + .shadow(radius: 2) + .foregroundStyle(Color.primary) + .compositingGroup() + } else { + RoundedRectangle(cornerRadius: 25) + .stroke(selectedMode.color, lineWidth: 1) + .background { + RoundedRectangle(cornerRadius: 25) + .fill(Color.MapButtons.background.opacity(0.5)) + .glassEffect(.regular, in: RoundedRectangle(cornerRadius: 25)) + } + .shadow(radius: 2) + .foregroundStyle(Color.primary) + .compositingGroup() + } + } else { + if #unavailable(iOS 27, macOS 27) { + RoundedRectangle(cornerRadius: 28) + .stroke(Color.MapButtons.border, lineWidth: 1) + .background { + RoundedRectangle(cornerRadius: 28) + .fill(EllipticalGradient(colors: [Color.MapButtons.backgroundGlow, Color.MapButtons.background])) + } + .shadow(radius: 2) + .foregroundStyle(Color.secondary) + .compositingGroup() + } else { + RoundedRectangle(cornerRadius: 28) + .fill(Color.MapButtons.background.opacity(0.3)) + .glassEffect(.regular, in: RoundedRectangle(cornerRadius: 28)) + .shadow(radius: 2) + } + } + } + .padding(4) + .onTapGesture { + // Trick to extend the safe area around it + } + .padding(-4) + .contentShape(Rectangle()) + .padding(.leading, verticalSizeClass == .compact && !isPresentingModeOptions ? (controlHeight + 24) : 0) + .accessibilityRepresentation { + Picker("mode", selection: $selectedMode) { + ForEach(Mode.allCases) { mode in + Text(mode.description) + } + } + } + .frame(maxWidth: !isPresentingModeOptions || (horizontalSizeClass == .compact && verticalSizeClass != .compact) ? .infinity : 320, alignment: verticalSizeClass == .compact ? .leading : .center) + .frame(maxWidth: .infinity, alignment: verticalSizeClass == .compact ? .leading : .center) + .animation(.spring.speed(2), value: isPresentingModeOptions) + .onChange(of: selectedMode) { changedSelectedMode in + draggedMode = changedSelectedMode + selectedMode = changedSelectedMode + MapControls.mode = changedSelectedMode + } + } + .onAppear { + hasTransitLinesForPublicTransportMode = MapControls.publicTransportModeHasTransitLines() + } + .onChange(of: hasTransitLinesForPublicTransportMode) { changedHasTransitLinesForPublicTransport in + hasTransitLinesForPublicTransportMode = changedHasTransitLinesForPublicTransport + MapControls.publicTransportModeSetTransitLines(changedHasTransitLinesForPublicTransport) + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePickerChoice.swift b/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePickerChoice.swift new file mode 100644 index 000000000..5b53a7673 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Mode Picker/MapModePickerChoice.swift @@ -0,0 +1,63 @@ +import SwiftUI + +extension MapModePicker { + /// View for a choice in a map mode picker + struct Choice: View { + // MARK: Properties + + /// The selected mode + @Binding var selectedMode: Mode + + + /// The mode + var mode: Mode = .walking + + + /// If a mode is currently being dragged + @Binding var isDragging: Bool + + + /// The dragged mode to not have too quick mode changes when dragging + @Binding var draggedMode: Mode + + + /// The foreground color (for animations) + @State private var foregroundColor: Color = .primary + + + /// The actual view + var body: some View { + Circle() + .fill(.clear) + .overlay { + mode.image + .resizable() + .aspectRatio(contentMode: .fit) + .padding(mode == .cycling ? 8 : (mode == .walking ? 9 : 10)) + } + .foregroundStyle(foregroundColor) + .contentShape(Rectangle()) + .onTapGesture { + if !isDragging { + selectedMode = mode + } + } + .onAppear { + foregroundColor = (draggedMode == mode ? .white : .primary) + } + .onChange(of: draggedMode) { changedDraggedMode in + if changedDraggedMode == mode, foregroundColor == .primary { + withAnimation(.spring.speed(3.2).delay(0.1)) { + foregroundColor = .white + } + } else if changedDraggedMode != mode, foregroundColor == .white { + withAnimation(.spring.speed(4)) { + foregroundColor = .primary + } + } else { + foregroundColor = (changedDraggedMode == mode ? .white : .primary) + } + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButton.swift b/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButton.swift new file mode 100644 index 000000000..04763fbda --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButton.swift @@ -0,0 +1,37 @@ +import SwiftUI + +/// View for a map position button +struct MapPositionButton: View { + // MARK: Properties + + /// The position mode + @State private var positionMode: MapPositionButton.Mode = .locate + + + /// The publisher for receiving the updates on the position mode + private let switchPositionModePublisher = NotificationCenter.default.publisher(for: MapControls.switchPositionModeNotificationName) + + + /// The actual view + var body: some View { + Button { + MapControls.switchToNextPositionMode() + } label: { + Label { + Text(positionMode.description) + } icon: { + positionMode.image + .foregroundStyle(positionMode == .following || positionMode == .followingAndRotated ? Color.BaseColors.blue : Color.primary) + .padding(.top, positionMode == .locate || positionMode == .following ? 1 : 0) + } + } + .buttonStyle(MapButtonStyle()) + .contentShape(Rectangle()) + .onAppear { + positionMode = MapControls.positionMode + } + .onReceive(switchPositionModePublisher) { _ in + positionMode = MapControls.positionMode + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButtonMode.swift b/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButtonMode.swift new file mode 100644 index 000000000..73c303547 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Position Button/MapPositionButtonMode.swift @@ -0,0 +1,48 @@ +import SwiftUI + +extension MapPositionButton { + /// The mode of the map position button + enum Mode: String, Codable, CaseIterable, Identifiable { + case locate = "Locate" + case locating = "Locating" + case following = "Following" + case followingAndRotated = "FollowingAndRotated" + + + + // MARK: Properties + + /// The id + var id: Self { self } + + + /// The description text + var description: String { + switch self { + case .locate: + return String(localized: "postionmode_locate") + case .locating: + return String(localized: "postionmode_locating") + case .following: + return String(localized: "postionmode_following") + case .followingAndRotated: + return String(localized: "postionmode_following-and-rotated") + } + } + + + /// The image + var image: Image { + switch self { + case .locate: + return Image(systemName: "location") + case .locating: + return Image(systemName: "progress.indicator") + case .following: + return Image(systemName: "location.fill") + case .followingAndRotated: + return Image(systemName: "location.north.line.fill") + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButton.swift b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButton.swift new file mode 100644 index 000000000..c4bb96ba8 --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButton.swift @@ -0,0 +1,29 @@ +import SwiftUI + +/// View for a map zoom button +struct MapZoomButton: View { + // MARK: Properties + + /// The kind + var kind: MapZoomButton.Kind + + + /// The actual view + var body: some View { + Button { + if kind == .in { + MapControls.zoomIn() + } else if kind == .out { + MapControls.zoomOut() + } + } label: { + Label { + Text(kind.description) + } icon: { + kind.image + } + } + .buttonStyle(MapButtonStyle()) + .contentShape(Rectangle()) + } +} diff --git a/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtonKind.swift b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtonKind.swift new file mode 100644 index 000000000..343f36f7b --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtonKind.swift @@ -0,0 +1,38 @@ +import SwiftUI + +extension MapZoomButton { + /// The kind of the map zoom button + enum Kind: String, Codable, CaseIterable, Identifiable { + case `in` = "In" + case out = "Out" + + + + // MARK: Properties + + /// The id + var id: Self { self } + + + /// The description text + var description: String { + switch self { + case .in: + return String(localized: "zoom_in") + case .out: + return String(localized: "zoom_out") + } + } + + + /// The image + var image: Image { + switch self { + case .in: + return Image(systemName: "plus") + case .out: + return Image(systemName: "minus") + } + } + } +} diff --git a/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtons.swift b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtons.swift new file mode 100644 index 000000000..cb1e253ff --- /dev/null +++ b/iphone/Maps/UI/Map/Controls/Zoom Buttons/MapZoomButtons.swift @@ -0,0 +1,143 @@ +import SwiftUI + +/// View for the map zoom buttons +struct MapZoomButtons: View { + // MARK: Properties + + /// The maximum drag height + var maxDragHeight: CGFloat + + + /// If it is allowed to drag + @State private var isAllowedToDrag: Bool = false + + + /// The current drag distance + @State private var dragDistance: CGFloat = 0 + + + /// If a drag currently is being detected + @GestureState private var isDetectingDrag = false + + + /// The actual view + var body: some View { + GeometryReader { geometry in + VStack(spacing: 24) { + MapZoomButton(kind: .in) + .frame(height: geometry.size.width) + + MapZoomButton(kind: .out) + .frame(height: geometry.size.width) + } + .opacity(isAllowedToDrag ? 0 : 1) + .accessibilityHidden(isAllowedToDrag) + .disabled(isAllowedToDrag) + .background { + if isAllowedToDrag { + if #unavailable(iOS 27, macOS 27) { + RoundedRectangle(cornerRadius: 28) + .stroke(Color.MapButtons.border, lineWidth: 1) + .background { + RoundedRectangle(cornerRadius: 28) + .fill(EllipticalGradient(colors: [Color.MapButtons.backgroundGlow, Color.MapButtons.background])) + .opacity(0.9) + } + .shadow(radius: 2) + .overlay(content: { + VStack(spacing: 0) { + MapZoomButton.Kind.in.image + .font(.title2) + .scaleEffect(1.1) + .foregroundStyle(Color.primary) + .scaleEffect(0.96) + .padding(.top, 15) + + Spacer(minLength: 0) + + MapZoomButton.Kind.out.image + .font(.title2) + .scaleEffect(1.1) + .foregroundStyle(Color.primary) + .scaleEffect(0.96) + .padding(.bottom, 23) + } + }) + .compositingGroup() + } else { + RoundedRectangle(cornerRadius: 28) + .fill(Color.MapButtons.background.opacity(0.3)) + .glassEffect(.regular, in: RoundedRectangle(cornerRadius: 28)) + .shadow(radius: 2) + .overlay(content: { + VStack(spacing: 0) { + MapZoomButton.Kind.in.image + .font(.title2) + .scaleEffect(1.1) + .foregroundStyle(Color.primary) + .scaleEffect(0.96) + .padding(.top, 15) + + Spacer(minLength: 0) + + MapZoomButton.Kind.out.image + .font(.title2) + .scaleEffect(1.1) + .foregroundStyle(Color.primary) + .scaleEffect(0.96) + .padding(.bottom, 23) + } + }) + .compositingGroup() + } + } + } + .animation(.spring.speed(5), value: isAllowedToDrag) + .simultaneousGesture( + LongPressGesture(minimumDuration: 0.3) + .onEnded({ _ in + isAllowedToDrag = true + }).sequenced( + before: DragGesture() + .updating($isDetectingDrag) { currentState, state, transaction in + state = true + } + .onChanged({ value in + if isAllowedToDrag { + if abs(value.translation.width) < 100 { + let changedDragDistance = (-20 * value.translation.height) / maxDragHeight + let dragDifference = dragDistance - changedDragDistance + if abs(dragDifference) > 0.3 { + dragDistance = changedDragDistance + let scale: CGFloat + if dragDifference > 0 { + scale = 1.1 * abs(dragDifference) + } else { + scale = 10 * abs(dragDifference) + } + + if scale != 0 { + MapControls.zoom(scale: scale) + } + } + } else { + isAllowedToDrag = false + dragDistance = 0 + } + } + }) + ).updating( + $isDetectingDrag, + body: { _, state, _ in + state = true + }) + ) + .onChange(of: isDetectingDrag) { changedIsDetectingDrag in + if !changedIsDetectingDrag { + isAllowedToDrag = false + dragDistance = 0 + } + } + } + } +} diff --git a/iphone/Maps/UI/Map/MapOverlayView.swift b/iphone/Maps/UI/Map/MapOverlayView.swift new file mode 100644 index 000000000..ec4aacd69 --- /dev/null +++ b/iphone/Maps/UI/Map/MapOverlayView.swift @@ -0,0 +1,332 @@ +import SwiftUI + +/// The view for all the map overlays +struct MapOverlayView: View { + // MARK: Properties + + /// The horizontal size class of the environment + @Environment(\.horizontalSizeClass) private var horizontalSizeClass + + + /// The vertical size class of the environment + @Environment(\.verticalSizeClass) private var verticalSizeClass + + + /// The width + @State private var width: CGFloat = 0 + + + /// The height + @State private var height: CGFloat = 0 + + + /// The height used by the window controls + @State private var windowControlsHeight: CGFloat = 0 + + + /// The default height of a map control + @State private var controlHeight: CGFloat = 0 + + + /// If the top map controls are being displayed + @State private var hasTopControls: Bool = false + + + /// The height of the top map controls + @State private var topControlsHeight: CGFloat = 0 + + + /// If the bottom map controls are being displayed + @State private var hasBottomControls: Bool = false + + + /// The height of the bottom map controls + @State private var bottomControlsHeight: CGFloat = 0 + + + /// If the zoom buttons are being displayed + @State private var hasZoomButtons: Bool = false + + + /// If it is horizontally too tight to show the extended layers button + private var isHorizontallyTooTight: Bool { + return width < (11.6 * controlHeight) + } + + + /// If it is vertically too tight to show the extended layers button + private var isVerticallyTooTight: Bool { + return hasZoomButtons && height < (10.7 * controlHeight) + } + + + /// If the layer options are being presented via the extended layers button + @AppStorage("IsPresentingMapLayers") private var isPresentingLayers: Bool = false + + + /// If the layers options, that might being presented via the extended layers button, should be temporarily hidden, if necessary, to not be weirdly overlapped by for example the mode options + @State private var shouldTemporarilyHideLayersIfNecessary: Bool = false + + + /// If the layers options, that might being presented via the extended layers button, should be temporarily hidden to not be weirdly overlapped by for example the mode options + private var shouldTemporarilyHideLayers: Bool { + return shouldTemporarilyHideLayersIfNecessary && ((horizontalSizeClass == .compact && verticalSizeClass != .compact) || (isVerticallyTooTight && width < (14.3 * controlHeight))) + } + + /// If the settings are being presented + @Binding var isPresentingSettings: Bool + + + /// If the app information is being presented + @Binding var isPresentingInformation: Bool + + + /// If the search is being presented externally + @AppStorage("IsSearchPresented") private var isSearchPresented: Bool = false + + + /// A necessary adjusmented need for the externally presented search + @AppStorage("SearchAdjustment") private var searchAdjustment: Double = 0 + + + /// If the keyboard is being presented externally + @State private var isKeyboardPresented: Bool = false + + + /// The publisher for receiving the updates on the user defaults + private let userDefaultsDidChangeNotificationPublisher = NotificationCenter.default.publisher(for: UserDefaults.didChangeNotification) + + + /// The publisher for receiving the updates on the keyboard being shown + private let keyboardWillShowNotificationPublisher = NotificationCenter.default.publisher(for: UIResponder.keyboardWillShowNotification) + + + /// The publisher for receiving the updates on the keyboard being hidden + private let keyboardWillHideNotificationPublisher = NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification) + + + /// The actual view + var body: some View { + GeometryReader { geometry in + VStack { + ZStack(alignment: .top) { + if hasTopControls { + HStack { + MapMoreButton() + .frame(width: controlHeight) + + Spacer(minLength: 0) + + MapLayersButton(isHorizontal: isVerticallyTooTight && !isHorizontallyTooTight, isPresentingLayers: $isPresentingLayers, shouldTemporarilyHideLayers: shouldTemporarilyHideLayers) + .frame(width: controlHeight) + } + .frame(height: controlHeight) + .fixedSize(horizontal: false, vertical: true) + + MapModePicker(controlHeight: controlHeight, shouldTemporarilyHideLayersIfNecessary: $shouldTemporarilyHideLayersIfNecessary) + .frame(height: controlHeight) + .background(alignment: .top) { + MapTrackRecordingIndicator(controlHeight: controlHeight) + .frame(height: controlHeight) + .padding(.top, controlHeight) + } + } + } + .background { + GeometryReader { topControlsGeometry in + if #available(iOS 16.0, *) { + Color.black + .hidden() + .onAppear { + topControlsHeight = topControlsGeometry.size.height + } + .onGeometryChange(for: CGRect.self) { changedTopControlsGeometry in + changedTopControlsGeometry.frame(in: .global) + } action: { _ in + topControlsHeight = topControlsGeometry.size.height + } + .onReceive(userDefaultsDidChangeNotificationPublisher) { _ in + topControlsHeight = topControlsGeometry.size.height + } + } else { + Color.black + .hidden() + .onAppear { + topControlsHeight = topControlsGeometry.size.height + } + .onReceive(userDefaultsDidChangeNotificationPublisher) { _ in + topControlsHeight = topControlsGeometry.size.height + } + } + } + } + + Spacer(minLength: 0) + + ZStack(alignment: .bottom) { + if hasBottomControls { + HStack { + MapCustomButton() + .frame(width: controlHeight) + + Spacer(minLength: 0) + + MapPositionButton() + .frame(width: controlHeight) + } + .frame(height: controlHeight) + .fixedSize(horizontal: false, vertical: true) + + if !isSearchPresented { + MapSearchButton(controlHeight: controlHeight) + .frame(height: controlHeight) + } + } + } + .background { + GeometryReader { bottomControlsGeometry in + if #available(iOS 16.0, *) { + Color.black + .hidden() + .onAppear { + bottomControlsHeight = bottomControlsGeometry.size.height + } + .onGeometryChange(for: CGRect.self) { changedBottomControlsGeometry in + changedBottomControlsGeometry.frame(in: .global) + } action: { _ in + bottomControlsHeight = bottomControlsGeometry.size.height + } + .onReceive(userDefaultsDidChangeNotificationPublisher) { _ in + bottomControlsHeight = bottomControlsGeometry.size.height + } + } else { + Color.black + .hidden() + .onAppear { + bottomControlsHeight = bottomControlsGeometry.size.height + } + .onReceive(userDefaultsDidChangeNotificationPublisher) { _ in + bottomControlsHeight = bottomControlsGeometry.size.height + } + } + } + } + } + .frame(maxWidth: .infinity) + .background(alignment: isHorizontallyTooTight && isVerticallyTooTight ? .bottomTrailing : .trailing) { + if hasZoomButtons { + MapZoomButtons(maxDragHeight: height) + .frame(width: controlHeight, height: 24 + (2 * controlHeight)) + .padding(.bottom, isHorizontallyTooTight && isVerticallyTooTight ? (bottomControlsHeight + 24) : 0) + } + } + .padding(.top, geometry.safeAreaInsets.top == 0 ? (16 + windowControlsHeight) : windowControlsHeight) + .padding(.bottom, geometry.safeAreaInsets.bottom == 0 ? 16 : (isKeyboardPresented ? 16 : 0)) + .padding(.leading, geometry.safeAreaInsets.leading == 0 ? (16 + searchAdjustment) : searchAdjustment) + .padding(.trailing, geometry.safeAreaInsets.trailing == 0 ? 16 : 0) + .animation(.spring, value: isSearchPresented) + .animation(.spring, value: searchAdjustment) + .animation(.spring.speed(7), value: isHorizontallyTooTight) + .animation(.spring.speed(7), value: isVerticallyTooTight) + .onAppear { + updateControlVisbility(with: geometry, shouldAnimate: false) + } + .onChange(of: topControlsHeight) { _ in + updatePadding(with: geometry) + } + .onChange(of: bottomControlsHeight) { _ in + updatePadding(with: geometry) + } + .onReceive(userDefaultsDidChangeNotificationPublisher) { _ in + updateControlVisbility(with: geometry) + } + .onReceive(keyboardWillShowNotificationPublisher) { _ in + isKeyboardPresented = true + } + .onReceive(keyboardWillHideNotificationPublisher) { _ in + isKeyboardPresented = false + } + .background { + if #available(iOS 16.0, *) { + Color.black + .hidden() + .onGeometryChange(for: CGRect.self) { changedGeometry in + changedGeometry.frame(in: .global) + } action: { _ in + updatePadding(with: geometry) + } + } + + Image(systemName: "circle") + .font(.title2) + .padding(13) + .hidden() + .background { + GeometryReader { controlGeometry in + if #available(iOS 16.0, *) { + Color.black + .hidden() + .onAppear { + controlHeight = controlGeometry.size.height + } + .onGeometryChange(for: CGRect.self) { changedControlGeometry in + changedControlGeometry.frame(in: .global) + } action: { _ in + controlHeight = controlGeometry.size.height + } + } else { + Color.black + .hidden() + .onAppear { + controlHeight = controlGeometry.size.height + } + } + } + } + } + } + } + + + + // MARK: Methods + + /// Update the visibility of the controls + /// - Parameter geometry: The geometry of the view + /// - Parameter shouldAnimate: If the update should be animated + func updateControlVisbility(with geometry: GeometryProxy, shouldAnimate: Bool = true) { + if shouldAnimate { + withAnimation(.spring.speed(1)) { + hasTopControls = !MapControls.areMapControlsHidden + hasBottomControls = !MapControls.areMapControlsHidden + hasZoomButtons = !MapControls.areMapZoomButtonsHidden && Settings.hasZoomButtons + + updatePadding(with: geometry) + } + } else { + hasTopControls = !MapControls.areMapControlsHidden + hasBottomControls = !MapControls.areMapControlsHidden + hasZoomButtons = !MapControls.areMapZoomButtonsHidden && Settings.hasZoomButtons + + updatePadding(with: geometry) + } + } + + + /// Update the paddings + /// - Parameter geometry: The geometry of the view + func updatePadding(with geometry: GeometryProxy) { + width = geometry.size.width + height = geometry.size.height + if #available(iOS 26.0, *) { + windowControlsHeight = geometry.containerCornerInsets.topLeading.height + } + + let top = windowControlsHeight + topControlsHeight + (geometry.safeAreaInsets.top == 0 ? 16 : geometry.safeAreaInsets.top) + 4 + let bottom = bottomControlsHeight + (geometry.safeAreaInsets.bottom == 0 ? 16 : geometry.safeAreaInsets.bottom) + let leading = (geometry.safeAreaInsets.leading == 0 ? (16 + searchAdjustment) : (geometry.safeAreaInsets.leading + searchAdjustment)) + let trailing = (geometry.safeAreaInsets.trailing == 0 ? 16 : geometry.safeAreaInsets.trailing) + + MWMMapWidgetsHelper.updatePadding(forTop: top, bottom: bottom, leading: leading, trailing: trailing) + } +} diff --git a/iphone/Maps/UI/Map/MapView.swift b/iphone/Maps/UI/Map/MapView.swift new file mode 100644 index 000000000..aa6ec7f07 --- /dev/null +++ b/iphone/Maps/UI/Map/MapView.swift @@ -0,0 +1,19 @@ +import SwiftUI + +/// The view for the map (for now only yhe controls) +struct MapView: View { + // MARK: Properties + + /// If the settings are being presented + @Binding var isPresentingSettings: Bool + + + /// If the app information is being presented + @Binding var isPresentingInformation: Bool + + + /// The actual view + var body: some View { + MapOverlayView(isPresentingSettings: $isPresentingSettings, isPresentingInformation: $isPresentingInformation) + } +} diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m index 0cef28e49..5a6a93ea6 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m @@ -22,7 +22,7 @@ case MWMActionBarButtonTypeSaveTrackRecording: return L(@"save"); case MWMActionBarButtonTypeNotSaveTrackRecording: - return L(@"delete"); + return L(@"discard"); case MWMActionBarButtonTypeRouteFrom: return L(@"p2p_from_here"); case MWMActionBarButtonTypeRouteTo: diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm index 484c99e9f..fe6bad017 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm @@ -32,6 +32,8 @@ - (BOOL)isPPShown { - (void)closePlacePage { GetFramework().DeactivateMapSelection(); } - (void)routeFrom:(PlacePageData *)data { + [self setRouterByMode]; + MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeStart intermediateIndex:0]; [MWMRouter buildFromPoint:point bestRouter:YES]; [self closePlacePage]; @@ -45,9 +47,7 @@ - (void)routeTo:(PlacePageData *)data { [MWMSearch clear]; [[[MapViewController sharedController] searchManager] close]; - if ([MWMMapOverlayManager transitEnabled]) { - [MWMRouter setType:MWMRouterTypePublicTransport]; - } + [self setRouterByMode]; MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeFinish intermediateIndex:0]; [MWMRouter buildToPoint:point bestRouter:YES]; @@ -55,12 +55,16 @@ - (void)routeTo:(PlacePageData *)data { } - (void)routeAddStop:(PlacePageData *)data { + [self setRouterByMode]; + MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeIntermediate intermediateIndex:0]; [MWMRouter addPointAndRebuild:point]; [self closePlacePage]; } - (void)routeRemoveStop:(PlacePageData *)data { + [self setRouterByMode]; + MWMRoutePoint *point = nil; auto const intermediateIndex = GetFramework().GetCurrentPlacePageInfo().GetIntermediateIndex(); switch (GetFramework().GetCurrentPlacePageInfo().GetRouteMarkType()) { @@ -145,6 +149,20 @@ - (MWMRoutePoint *)routePoint:(PlacePageData *)data intermediateIndex:intermediateIndex]; } +- (void)setRouterByMode { + if ([MWMRouter type] != MWMRouterTypeRuler) { + if ([MapControls modeRawValue] == ModePublicTransport) { + [MWMRouter setType:MWMRouterTypePublicTransport]; + } else if ([MapControls modeRawValue] == ModeDriving) { + [MWMRouter setType:MWMRouterTypeVehicle]; + } else if ([MapControls modeRawValue] == ModeCycling) { + [MWMRouter setType:MWMRouterTypeBicycle]; + } else if ([MapControls modeRawValue] == ModeWalking) { + [MWMRouter setType:MWMRouterTypePedestrian]; + } + } +} + - (void)editPlace { [self.ownerViewController openEditor]; diff --git a/iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStepsController.swift b/iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStepsController.swift index 38cd93bd1..d771ca6f3 100644 --- a/iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStepsController.swift +++ b/iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStepsController.swift @@ -53,10 +53,12 @@ final class ModalPresentationStepsController { case .began: initialTranslationY = presentedView.frame.origin.y case .changed: - let newY = max(max(initialTranslationY + translation.y, 0), maxAvailableFrame.origin.y) - currentFrame.origin.y = newY - presentedView.frame = currentFrame - didUpdateHandler?(.didUpdateFrame(currentFrame)) + if abs(translation.y) > 30 { + let newY = max(max(initialTranslationY + translation.y, 0), maxAvailableFrame.origin.y) + currentFrame.origin.y = newY + presentedView.frame = currentFrame + didUpdateHandler?(.didUpdateFrame(currentFrame)) + } case .ended: let nextStep: ModalPresentationStep if velocity.y > Constants.fastSwipeDownVelocity { diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapAreaView.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapAreaView.swift index fbe222d35..f66203620 100644 --- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapAreaView.swift +++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapAreaView.swift @@ -3,7 +3,7 @@ final class SearchOnMapAreaView: UIView { alternative(iPhone: .bottom, iPad: []) } - override var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { + override var modeButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { alternative(iPhone: .bottom, iPad: []) } } diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift index e41df79eb..e78be2e29 100644 --- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift +++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift @@ -145,6 +145,8 @@ final class SearchOnMapInteractor: NSObject { routingTooltipSearch = .none isUpdatesDisabled = true searchManager.clear() + UserDefaults.standard.set(false, forKey: "IsSearchPresented") + UserDefaults.standard.set(0, forKey: "SearchAdjustment") return .close } diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapPresenter.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapPresenter.swift index 0c3e4b092..a856e6d13 100644 --- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapPresenter.swift +++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapPresenter.swift @@ -69,6 +69,12 @@ final class SearchOnMapPresenter { viewModel.isTyping = true viewModel.contentState = .historyAndCategory viewModel.presentationStep = .fullScreen + UserDefaults.standard.set(true, forKey: "IsSearchPresented") + if UIDevice.current.userInterfaceIdiom == .pad { + UserDefaults.standard.set(360, forKey: "SearchAdjustment") + } else { + UserDefaults.standard.set(0, forKey: "SearchAdjustment") + } case .showResults(var searchResults, let isSearchCompleted): if (viewModel.skipSuggestions) { searchResults.skipSuggestions() diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift index 4a622d392..10b640bae 100644 --- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift +++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift @@ -64,7 +64,7 @@ final class SearchOnMapViewController: UIViewController { let affectedAreaViews = [ mapViewController.sideButtonsArea, - mapViewController.trafficButtonArea, + mapViewController.modeButtonArea, ] affectedAreaViews.forEach { $0?.addAffectingView(availableAreaView) } } @@ -166,7 +166,7 @@ final class SearchOnMapViewController: UIViewController { dimView.autoresizingMask = [.flexibleWidth, .flexibleHeight] } view.addSubview(availableAreaView) - availableAreaView.addSubview(contentView) + view.addSubview(contentView) contentView.addSubview(searchResultsView) contentView.addSubview(headerView) @@ -174,21 +174,39 @@ final class SearchOnMapViewController: UIViewController { headerView.translatesAutoresizingMaskIntoConstraints = false searchResultsView.translatesAutoresizingMaskIntoConstraints = false - NSLayoutConstraint.activate([ - contentView.topAnchor.constraint(equalTo: availableAreaView.safeAreaLayoutGuide.topAnchor), - contentView.leadingAnchor.constraint(equalTo: availableAreaView.leadingAnchor), - contentView.trailingAnchor.constraint(equalTo: availableAreaView.trailingAnchor), - contentView.bottomAnchor.constraint(equalTo: availableAreaView.bottomAnchor), - - headerView.topAnchor.constraint(equalTo: contentView.topAnchor), - headerView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - headerView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - - searchResultsView.topAnchor.constraint(equalTo: headerView.bottomAnchor), - searchResultsView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - searchResultsView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - searchResultsView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + if isiPad { + NSLayoutConstraint.activate([ + contentView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor), + contentView.leadingAnchor.constraint(equalTo: availableAreaView.leadingAnchor), + contentView.trailingAnchor.constraint(equalTo: availableAreaView.trailingAnchor), + contentView.bottomAnchor.constraint(equalTo: view.bottomAnchor), + + headerView.topAnchor.constraint(equalTo: contentView.topAnchor), + headerView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), + headerView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), + + searchResultsView.topAnchor.constraint(equalTo: headerView.bottomAnchor), + searchResultsView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), + searchResultsView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), + searchResultsView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), + ]) + } else { + NSLayoutConstraint.activate([ + contentView.topAnchor.constraint(equalTo: availableAreaView.topAnchor), + contentView.leadingAnchor.constraint(equalTo: availableAreaView.leadingAnchor), + contentView.trailingAnchor.constraint(equalTo: availableAreaView.trailingAnchor), + contentView.bottomAnchor.constraint(equalTo: view.bottomAnchor), + + headerView.topAnchor.constraint(equalTo: contentView.topAnchor), + headerView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), + headerView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), + + searchResultsView.topAnchor.constraint(equalTo: headerView.bottomAnchor), + searchResultsView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), + searchResultsView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), + searchResultsView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), + ]) + } layoutResultsView() layoutHistoryAndCategoryTabView() @@ -205,7 +223,7 @@ final class SearchOnMapViewController: UIViewController { resultsTableView.topAnchor.constraint(equalTo: searchResultsView.topAnchor), resultsTableView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor), resultsTableView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor), - resultsTableView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor) + resultsTableView.bottomAnchor.constraint(equalTo: searchResultsView.safeAreaLayoutGuide.bottomAnchor) ]) } @@ -217,7 +235,7 @@ final class SearchOnMapViewController: UIViewController { historyAndCategoryTabViewController.view.topAnchor.constraint(equalTo: searchResultsView.topAnchor), historyAndCategoryTabViewController.view.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor), historyAndCategoryTabViewController.view.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor), - historyAndCategoryTabViewController.view.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor) + historyAndCategoryTabViewController.view.bottomAnchor.constraint(equalTo: searchResultsView.safeAreaLayoutGuide.bottomAnchor) ]) } @@ -228,7 +246,7 @@ final class SearchOnMapViewController: UIViewController { searchNoResultsView.topAnchor.constraint(equalTo: searchResultsView.topAnchor), searchNoResultsView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor), searchNoResultsView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor), - searchNoResultsView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor) + searchNoResultsView.bottomAnchor.constraint(equalTo: searchResultsView.safeAreaLayoutGuide.bottomAnchor) ]) } @@ -239,7 +257,7 @@ final class SearchOnMapViewController: UIViewController { searchingActivityView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor), searchingActivityView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor), searchingActivityView.topAnchor.constraint(equalTo: searchResultsView.topAnchor), - searchingActivityView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor) + searchingActivityView.bottomAnchor.constraint(equalTo: searchResultsView.safeAreaLayoutGuide.bottomAnchor) ]) } diff --git a/iphone/Maps/UI/Settings/SettingsView.swift b/iphone/Maps/UI/Settings/SettingsView.swift index 5c44d2181..c24cbbeda 100644 --- a/iphone/Maps/UI/Settings/SettingsView.swift +++ b/iphone/Maps/UI/Settings/SettingsView.swift @@ -28,12 +28,12 @@ struct SettingsView: View { @State private var selectedAppearance: Settings.Appearance = .auto - /// The selected left button type - @State private var selectedLeftButtonType: Settings.LeftButtonType = .help + /// The selected custom button type + @State private var selectedCustomButtonKind: MapCustomButton.Kind = .favourites /// If zoom buttons should be displayed - @State private var hasZoomButtons: Bool = true + @State private var hasZoomButtons: Bool = false /// The selected map appearance @@ -44,10 +44,6 @@ struct SettingsView: View { @State private var hasIncreasedFontsize: Bool = false - /// If 3D buildings should be displayed - @State private var has3dBuildings: Bool = true - - /// The selected language for the map @State var selectedLanguageForMap: Settings.MapLanguage.ID? = nil @@ -147,12 +143,12 @@ struct SettingsView: View { Text("pref_appearance_title") } - Picker(selection: $selectedLeftButtonType) { - ForEach(Settings.LeftButtonType.allCases) { leftButtonType in - Text(leftButtonType.description) + Picker(selection: $selectedCustomButtonKind) { + ForEach(MapCustomButton.Kind.allCases) { customButtonKind in + Text(customButtonKind.description) } } label: { - Text("pref_left_button_type") + Text("pref_custom_button_type") } Toggle("pref_zoom_title", isOn: $hasZoomButtons) @@ -178,20 +174,6 @@ struct SettingsView: View { Toggle("big_font", isOn: $hasIncreasedFontsize) .tint(.accent) - Toggle(isOn: $has3dBuildings) { - VStack(alignment: .leading) { - Text("pref_map_3d_buildings_title") - - if selectedPowerSavingMode == .maximum { - Text("pref_map_3d_buildings_disabled_summary") - .font(.footnote) - .foregroundStyle(.secondary) - } - } - } - .tint(.accent) - .disabled(selectedPowerSavingMode == .maximum) - Picker(selection: $selectedLanguageForMap) { ForEach(Settings.availableLanguagesForMap) { languageForMap in Text(languageForMap.localizedName) @@ -251,7 +233,6 @@ struct SettingsView: View { Image(systemName: "icloud") Text("icloud_sync") - .lineLimit(1) } if !isSyncPossible { @@ -343,11 +324,10 @@ struct SettingsView: View { selectedPowerSavingMode = Settings.powerSavingMode selectedDistanceUnit = Settings.distanceUnit selectedAppearance = Settings.appearance - selectedLeftButtonType = Settings.leftButtonType + selectedCustomButtonKind = Settings.customButtonKind hasZoomButtons = Settings.hasZoomButtons selectedMapAppearance = Settings.mapAppearance hasIncreasedFontsize = Settings.hasIncreasedFontsize - has3dBuildings = Settings.has3dBuildings selectedLanguageForMap = Settings.languageForMap alternativeMapLanguageHandling = Settings.alternativeMapLanguageHandling shouldTransliterateToLatin = Settings.shouldTransliterateToLatin @@ -369,8 +349,8 @@ struct SettingsView: View { .onChange(of: selectedAppearance) { changedSelectedAppearance in Settings.appearance = changedSelectedAppearance } - .onChange(of: selectedLeftButtonType) { changedSelectedLeftButtonType in - Settings.leftButtonType = changedSelectedLeftButtonType + .onChange(of: selectedCustomButtonKind) { changedSelectedCustomButtonKind in + Settings.customButtonKind = changedSelectedCustomButtonKind } .onChange(of: hasZoomButtons) { changedHasZoomButtons in Settings.hasZoomButtons = changedHasZoomButtons @@ -381,9 +361,6 @@ struct SettingsView: View { .onChange(of: hasIncreasedFontsize) { changedHasIncreasedFontsize in Settings.hasIncreasedFontsize = changedHasIncreasedFontsize } - .onChange(of: has3dBuildings) { changedHas3dBuildings in - Settings.has3dBuildings = changedHas3dBuildings - } .onChange(of: selectedLanguageForMap) { changedSelectedLanguageForMap in if let changedSelectedLanguageForMap { Settings.languageForMap = changedSelectedLanguageForMap diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index e3c2b9a5a..1d17bfcd1 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -30,7 +30,7 @@ - - - - - @@ -110,60 +81,54 @@ + + + + + + + - - - + + - - - - - - - - + - - - - + - - @@ -171,22 +136,13 @@ - - - - - - - - - @@ -194,13 +150,10 @@ + - - - - @@ -210,8 +163,6 @@ - - @@ -221,7 +172,7 @@ - + @@ -238,7 +189,7 @@ - + @@ -311,7 +262,7 @@ - + @@ -322,7 +273,7 @@ - + @@ -360,7 +311,7 @@ - + @@ -649,7 +600,7 @@ - + @@ -660,7 +611,7 @@ - + @@ -671,7 +622,7 @@ - + @@ -720,7 +671,7 @@ - + @@ -731,7 +682,7 @@ - + @@ -742,7 +693,7 @@ - + @@ -860,13 +811,13 @@ - + - + - + - - + + - - + + - + @@ -1043,15 +994,7 @@ - - - - - - - - - + diff --git a/libs/drape/static_texture.cpp b/libs/drape/static_texture.cpp index 35a0b3055..dcd9b43a5 100644 --- a/libs/drape/static_texture.cpp +++ b/libs/drape/static_texture.cpp @@ -27,7 +27,7 @@ namespace dp { -std::string const StaticTexture::kDefaultResource = "default"; +std::string const StaticTexture::kDefaultResource = "walking"; namespace { diff --git a/libs/drape_frontend/backend_renderer.cpp b/libs/drape_frontend/backend_renderer.cpp index 910fe19c3..0db6ffc97 100644 --- a/libs/drape_frontend/backend_renderer.cpp +++ b/libs/drape_frontend/backend_renderer.cpp @@ -116,12 +116,15 @@ std::unique_ptr BackendRenderer::CreateRoutine() return std::make_unique(*this); } -void BackendRenderer::RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui) +void BackendRenderer::RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui, bool notify) { CHECK(m_context != nullptr, ()); drape_ptr layerRenderer = m_guiCacher.RecacheWidgets(m_context, initInfo, m_texMng); - drape_ptr outputMsg = make_unique_dp(std::move(layerRenderer), needResetOldGui); - m_commutator->PostMessage(ThreadsCommutator::RenderThread, std::move(outputMsg), MessagePriority::Normal); + if (notify) + { + drape_ptr outputMsg = make_unique_dp(std::move(layerRenderer), needResetOldGui); + m_commutator->PostMessage(ThreadsCommutator::RenderThread, std::move(outputMsg), MessagePriority::Normal); + } } #ifdef RENDER_DEBUG_INFO_LABELS @@ -371,7 +374,7 @@ void BackendRenderer::AcceptMessage(ref_ptr message) CHECK(m_context != nullptr, ()); m_texMng->OnSwitchMapStyle(m_context); RecacheMapShapes(); - RecacheGui(m_lastWidgetsInfo, false /* needResetOldGui */); + RecacheGui(m_lastWidgetsInfo, false /* needResetOldGui */, msg->ShouldForceMapStyleRerendering() /* notify */); #ifdef RENDER_DEBUG_INFO_LABELS RecacheDebugLabels(); #endif diff --git a/libs/drape_frontend/backend_renderer.hpp b/libs/drape_frontend/backend_renderer.hpp index d8908f35c..d2eea4bf1 100644 --- a/libs/drape_frontend/backend_renderer.hpp +++ b/libs/drape_frontend/backend_renderer.hpp @@ -91,7 +91,7 @@ class BackendRenderer : public BaseRenderer void OnContextDestroy() override; private: - void RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui); + void RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui, bool notify = true); void RecacheChoosePositionMark(); void RecacheMapShapes(); void CleanupTextures(); diff --git a/libs/drape_frontend/color_constants.cpp b/libs/drape_frontend/color_constants.cpp index 9082b6c27..03eb6bbf2 100644 --- a/libs/drape_frontend/color_constants.cpp +++ b/libs/drape_frontend/color_constants.cpp @@ -28,7 +28,7 @@ class TransitColorsHolder dp::Color GetColor(std::string const & name) const { auto const style = GetStyleReader().GetCurrentStyle(); - auto const isDarkStyle = style == MapStyle::MapStyleDefaultDark || style == MapStyle::MapStyleVehicleDark; + auto const isDarkStyle = MapStyleIsDark(style); auto const & colors = isDarkStyle ? m_nightColors : m_clearColors; auto const it = colors.find(name); if (it == colors.cend()) diff --git a/libs/drape_frontend/drape_engine.cpp b/libs/drape_frontend/drape_engine.cpp index 76190b9d2..6c55360fc 100644 --- a/libs/drape_frontend/drape_engine.cpp +++ b/libs/drape_frontend/drape_engine.cpp @@ -387,8 +387,11 @@ void DrapeEngine::InvalidateRect(m2::RectD const & rect) MessagePriority::High); } -void DrapeEngine::UpdateMapStyle() +void DrapeEngine::UpdateMapStyle(bool const forceRerendering) { + if (forceRerendering) + m_frontend->ForceMapStyleRerendering(); + m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp(), MessagePriority::High); } @@ -919,6 +922,11 @@ drape_ptr DrapeEngine::GenerateLineRenderInfo(UserLineMark return renderInfo; } +double DrapeEngine::GetVisualScale() +{ + return VisualParams::Instance().GetVisualScale(); +} + void DrapeEngine::UpdateVisualScale(double vs, bool needStopRendering) { if (needStopRendering) diff --git a/libs/drape_frontend/drape_engine.hpp b/libs/drape_frontend/drape_engine.hpp index 29be0f124..867d98f38 100644 --- a/libs/drape_frontend/drape_engine.hpp +++ b/libs/drape_frontend/drape_engine.hpp @@ -120,6 +120,7 @@ class DrapeEngine OverlaysShowStatsCallback m_overlaysShowStatsCallback; OnGraphicsContextInitialized m_onGraphicsContextInitialized; dp::RenderInjectionHandler m_renderInjectionHandler; + bool m_forceMapStyleRerendering; }; DrapeEngine(Params && params); @@ -163,7 +164,7 @@ class DrapeEngine void SetRenderingEnabled(ref_ptr contextFactory = nullptr); void SetRenderingDisabled(bool const destroySurface); void InvalidateRect(m2::RectD const & rect); - void UpdateMapStyle(); + void UpdateMapStyle(bool const forceRerendering = false); void SetCompassInfo(location::CompassInfo const & info); void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, double distToNextTurn, double speedLimit, @@ -250,6 +251,7 @@ class DrapeEngine void ShowDebugInfo(bool shown); + double GetVisualScale(); void UpdateVisualScale(double vs, bool needStopRendering); void UpdateMyPositionRoutingOffset(bool useDefault, int offsetY); diff --git a/libs/drape_frontend/frontend_renderer.cpp b/libs/drape_frontend/frontend_renderer.cpp index 2440b79d8..2f843b3fa 100644 --- a/libs/drape_frontend/frontend_renderer.cpp +++ b/libs/drape_frontend/frontend_renderer.cpp @@ -1016,14 +1016,28 @@ void FrontendRenderer::UpdateAll() { #ifdef BUILD_DESIGNER classificator::Load(); -#endif // BUILD_DESIGNER - // Clear all graphics. for (RenderLayer & layer : m_layers) { layer.m_renderGroups.clear(); layer.m_isDirty = false; } +#endif // BUILD_DESIGNER + + if (m_forceMapStyleRerendering) + { + for (RenderLayer & layer : m_layers) + { + layer.m_renderGroups.clear(); + layer.m_isDirty = false; + } + } + else + { + RemoveRenderGroupsLater([](drape_ptr const & group) { + return true; + }); + } // Must be recreated on map style changing. CHECK(m_context != nullptr, ()); @@ -1043,11 +1057,13 @@ void FrontendRenderer::UpdateAll() // Notify backend renderer and wait for completion. { BaseBlockingMessage::Blocker blocker; - m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp(blocker, std::move(f)), + m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp(blocker, std::move(f), m_forceMapStyleRerendering), MessagePriority::Normal); blocker.Wait(); } + m_forceMapStyleRerendering = false; + UpdateContextDependentResources(); } @@ -2514,6 +2530,11 @@ void FrontendRenderer::OnEnterBackground() m_myPositionController->OnEnterBackground(); } +void FrontendRenderer::ForceMapStyleRerendering() +{ + m_forceMapStyleRerendering = true; +} + ScreenBase const & FrontendRenderer::ProcessEvents(bool & modelViewChanged, bool & viewportChanged, bool & needActiveFrame) { diff --git a/libs/drape_frontend/frontend_renderer.hpp b/libs/drape_frontend/frontend_renderer.hpp index df9e2115e..95d29076c 100644 --- a/libs/drape_frontend/frontend_renderer.hpp +++ b/libs/drape_frontend/frontend_renderer.hpp @@ -169,6 +169,7 @@ class FrontendRenderer location::EMyPositionMode GetMyPositionMode() const { return m_myPositionController->GetCurrentMode(); } void OnEnterBackground(); + void ForceMapStyleRerendering(); protected: void AcceptMessage(ref_ptr message) override; @@ -434,6 +435,8 @@ class FrontendRenderer bool m_firstTilesReady = false; bool m_firstLaunchAnimationTriggered = false; bool m_firstLaunchAnimationInterrupted = false; + + bool m_forceMapStyleRerendering = false; #if defined(OMIM_OS_DESKTOP) GraphicsReadyHandler m_graphicsReadyFn; diff --git a/libs/drape_frontend/gps_track_renderer.cpp b/libs/drape_frontend/gps_track_renderer.cpp index 1d26da30f..08c079009 100644 --- a/libs/drape_frontend/gps_track_renderer.cpp +++ b/libs/drape_frontend/gps_track_renderer.cpp @@ -156,7 +156,7 @@ dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD co double startAlpha = kMinDayAlpha; double endAlpha = kMaxDayAlpha; auto const style = GetStyleReader().GetCurrentStyle(); - if (style == MapStyle::MapStyleDefaultDark) + if (MapStyleIsDark(style)) { startAlpha = kMinNightAlpha; endAlpha = kMaxNightAlpha; diff --git a/libs/drape_frontend/gui/layer_render.cpp b/libs/drape_frontend/gui/layer_render.cpp index baba636c5..2f6bec9b2 100644 --- a/libs/drape_frontend/gui/layer_render.cpp +++ b/libs/drape_frontend/gui/layer_render.cpp @@ -189,7 +189,11 @@ class ScaleFpsLabelHandle : public MutableLabelHandle m_fps = helper.GetFps(); m_isPaused = helper.IsPaused(); std::stringstream ss; +#if defined(OMIM_OS_IPHONE) + ss << "Level " << m_scale << " | " << m_fps<< " FPS"; +#else ss << m_apiLabel << ": Scale: " << m_scale << " / FPS: " << m_fps; +#endif if (m_isPaused) ss << " (PAUSED)"; SetContent(ss.str()); diff --git a/libs/drape_frontend/gui/skin.cpp b/libs/drape_frontend/gui/skin.cpp index ec01354ae..87cd6e74e 100644 --- a/libs/drape_frontend/gui/skin.cpp +++ b/libs/drape_frontend/gui/skin.cpp @@ -273,7 +273,7 @@ ReaderPtr ResolveGuiSkinFile(std::string const & deviceType) { try { - reader = pl.GetReader("symbols/default/default.ui"); + reader = pl.GetReader("symbols/walking/default.ui"); } catch (FileAbsentException & e) { diff --git a/libs/drape_frontend/message_subclasses.hpp b/libs/drape_frontend/message_subclasses.hpp index 4fd7c0ef6..8e7ede13b 100644 --- a/libs/drape_frontend/message_subclasses.hpp +++ b/libs/drape_frontend/message_subclasses.hpp @@ -772,13 +772,16 @@ class SwitchMapStyleMessage : public BaseBlockingMessage public: using FilterMessagesHandler = std::function; - SwitchMapStyleMessage(Blocker & blocker, FilterMessagesHandler && filterMessagesHandler) + SwitchMapStyleMessage(Blocker & blocker, FilterMessagesHandler && filterMessagesHandler, bool forceMapStyleRerendering) : BaseBlockingMessage(blocker) , m_filterMessagesHandler(std::move(filterMessagesHandler)) + , m_forceMapStyleRerendering(forceMapStyleRerendering) {} Type GetType() const override { return Type::SwitchMapStyle; } + bool ShouldForceMapStyleRerendering() const { return m_forceMapStyleRerendering; } + void FilterDependentMessages() { if (m_filterMessagesHandler) @@ -787,6 +790,7 @@ class SwitchMapStyleMessage : public BaseBlockingMessage private: FilterMessagesHandler m_filterMessagesHandler; + bool m_forceMapStyleRerendering; }; class VisualScaleChangedMessage : public SwitchMapStyleMessage diff --git a/libs/drape_frontend/stylist.cpp b/libs/drape_frontend/stylist.cpp index bf36c6e0a..fdefdba05 100644 --- a/libs/drape_frontend/stylist.cpp +++ b/libs/drape_frontend/stylist.cpp @@ -110,6 +110,9 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel, void Stylist::ProcessKey(FeatureType & f, drule::Key const & key) { drule::BaseRule const * const dRule = drule::rules().Find(key); + if (!dRule) + return; + #ifdef DEBUG using feature::GeomType; auto const geomType = f.GetGeomType(); diff --git a/libs/indexer/classificator.cpp b/libs/indexer/classificator.cpp index a21bfbc38..336e9188b 100644 --- a/libs/indexer/classificator.cpp +++ b/libs/indexer/classificator.cpp @@ -1,7 +1,4 @@ #include "indexer/classificator.hpp" - -#include "indexer/map_style.hpp" -#include "indexer/map_style_reader.hpp" #include "indexer/tree_structure.hpp" #include "base/assert.hpp" @@ -118,10 +115,9 @@ ClassifObject const * ClassifObject::GetObject(size_t i) const // Classificator implementation ///////////////////////////////////////////////////////////////////////////////////////// -Classificator & classif() +Classificator & classif(MapStyle const mapStyle) { static Classificator c[MapStyleCount]; - MapStyle const mapStyle = GetStyleReader().GetCurrentStyle(); return c[mapStyle]; } diff --git a/libs/indexer/classificator.hpp b/libs/indexer/classificator.hpp index ff2046df1..4905e8b74 100644 --- a/libs/indexer/classificator.hpp +++ b/libs/indexer/classificator.hpp @@ -1,6 +1,8 @@ #pragma once #include "indexer/drawing_rule_def.hpp" +#include "indexer/feature_decl.hpp" +#include "indexer/map_style_reader.hpp" #include "indexer/scales.hpp" #include "indexer/types_mapping.hpp" @@ -259,4 +261,4 @@ class Classificator DISALLOW_COPY_AND_MOVE(Classificator); }; -Classificator & classif(); +Classificator & classif(MapStyle const mapStyle = GetStyleReader().GetCurrentStyle()); diff --git a/libs/indexer/classificator_loader.cpp b/libs/indexer/classificator_loader.cpp index 1087a4029..419941660 100644 --- a/libs/indexer/classificator_loader.cpp +++ b/libs/indexer/classificator_loader.cpp @@ -18,7 +18,7 @@ namespace { void ReadCommon(std::unique_ptr classificator, std::unique_ptr types) { - Classificator & c = classif(); + Classificator & c = classif(GetStyleReader().GetLoadingStyle()); c.Clear(); { @@ -46,25 +46,27 @@ void Load() LOG(LDEBUG, ("Reading of classificator started")); Platform & p = GetPlatform(); + + ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt")); + + drule::LoadRules(); - MapStyle const originMapStyle = GetStyleReader().GetCurrentStyle(); + LOG(LDEBUG, ("Reading of classificator finished")); +} +void Cleanup() +{ + MapStyle const currentMapStyle = GetStyleReader().GetCurrentStyle(); for (size_t i = 0; i < MapStyleCount; ++i) { auto const mapStyle = static_cast(i); - // Read the merged style only if it was requested. - if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged) - { - GetStyleReader().SetCurrentStyle(mapStyle); - ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt")); - - drule::LoadRules(); + if (currentMapStyle != mapStyle) { + Classificator & c = classif(mapStyle); + c.Clear(); } } - - GetStyleReader().SetCurrentStyle(originMapStyle); - - LOG(LDEBUG, ("Reading of classificator finished")); + + drule::CleanupRules(); } void LoadTypes(std::string const & classificatorFileStr, std::string const & typesFileStr) diff --git a/libs/indexer/classificator_loader.hpp b/libs/indexer/classificator_loader.hpp index 85bb19592..eabc1a728 100644 --- a/libs/indexer/classificator_loader.hpp +++ b/libs/indexer/classificator_loader.hpp @@ -6,6 +6,8 @@ namespace classificator { void Load(); +void Cleanup(); + // This method loads only classificator and types. It does not load and apply // style rules. It can be used only in separate modules (like pybindings) to // operate with number-string representations of types. diff --git a/libs/indexer/drawing_rules.cpp b/libs/indexer/drawing_rules.cpp index cbbc99c4e..24474330b 100644 --- a/libs/indexer/drawing_rules.cpp +++ b/libs/indexer/drawing_rules.cpp @@ -404,7 +404,7 @@ void RulesHolder::LoadFromBinaryProto(string const & s) CHECK(doSet.m_cont.ParseFromString(s), ("Error in proto loading!")); - classif().GetMutableRoot()->ForEachObject(ref(doSet)); + classif(GetStyleReader().GetLoadingStyle()).GetMutableRoot()->ForEachObject(ref(doSet)); InitBackgroundColors(doSet.m_cont); InitColors(doSet.m_cont); @@ -414,7 +414,18 @@ void LoadRules() { string buffer; GetStyleReader().GetDrawingRulesReader().ReadAsString(buffer); - rules().LoadFromBinaryProto(buffer); + rules(GetStyleReader().GetLoadingStyle()).LoadFromBinaryProto(buffer); +} + +void CleanupRules() +{ + MapStyle const currentMapStyle = GetStyleReader().GetCurrentStyle(); + for (size_t i = 0; i < MapStyleCount; ++i) + { + auto const mapStyle = static_cast(i); + if (currentMapStyle != mapStyle) + rules(mapStyle).Clean(); + } } } // namespace drule diff --git a/libs/indexer/drawing_rules.hpp b/libs/indexer/drawing_rules.hpp index 8009f0571..3a5647c1c 100644 --- a/libs/indexer/drawing_rules.hpp +++ b/libs/indexer/drawing_rules.hpp @@ -2,8 +2,10 @@ #include "indexer/drawing_rule_def.hpp" #include "indexer/drules_selector.hpp" +#include "indexer/map_style_reader.hpp" #include "base/base.hpp" +#include "base/buffer_vector.hpp" #include "std/target_os.hpp" @@ -76,11 +78,11 @@ class RulesHolder for (auto const dRule : m_dRules) toDo(dRule); } + void Clean(); private: void InitBackgroundColors(ContainerProto const & cp); void InitColors(ContainerProto const & cp); - void Clean(); /// background color for scales in range [0...scales::UPPER_STYLE_SCALE] std::vector m_bgColors; @@ -91,4 +93,5 @@ class RulesHolder RulesHolder & rules(); void LoadRules(); +void CleanupRules(); } // namespace drule diff --git a/libs/indexer/map_style.cpp b/libs/indexer/map_style.cpp index b64e8cf32..315130034 100644 --- a/libs/indexer/map_style.cpp +++ b/libs/indexer/map_style.cpp @@ -2,23 +2,47 @@ #include "base/assert.hpp" -MapStyle const kDefaultMapStyle = MapStyleDefaultLight; +MapStyle const kDefaultMapStyle = MapStyleWalkingLight; MapStyle MapStyleFromSettings(std::string const & str) { // MapStyleMerged is service style. It's unavailable for users. - if (str == "MapStyleDefaultLight") - return MapStyleDefaultLight; - else if (str == "MapStyleDefaultDark") - return MapStyleDefaultDark; + if (str == "MapStyleWalkingLight") + return MapStyleWalkingLight; + else if (str == "MapStyleWalkingOutdoorLight") + return MapStyleWalkingOutdoorLight; + else if (str == "MapStyleWalkingDark") + return MapStyleWalkingDark; + else if (str == "MapStyleWalkingOutdoorDark") + return MapStyleWalkingOutdoorDark; + else if (str == "MapStyleCyclingLight") + return MapStyleCyclingLight; + else if (str == "MapStyleCyclingOutdoorLight") + return MapStyleCyclingOutdoorLight; + else if (str == "MapStyleCyclingDark") + return MapStyleCyclingDark; + else if (str == "MapStyleCyclingOutdoorDark") + return MapStyleCyclingOutdoorDark; + else if (str == "MapStyleDrivingLight") + return MapStyleDrivingLight; + else if (str == "MapStyleDrivingOutdoorLight") + return MapStyleDrivingOutdoorLight; + else if (str == "MapStyleDrivingDark") + return MapStyleDrivingDark; + else if (str == "MapStyleDrivingOutdoorDark") + return MapStyleDrivingOutdoorDark; + else if (str == "MapStylePublicTransportLight") + return MapStylePublicTransportLight; + else if (str == "MapStylePublicTransportOutdoorLight") + return MapStylePublicTransportOutdoorLight; + else if (str == "MapStylePublicTransportDark") + return MapStylePublicTransportDark; + else if (str == "MapStylePublicTransportOutdoorDark") + return MapStylePublicTransportOutdoorDark; else if (str == "MapStyleVehicleLight") return MapStyleVehicleLight; else if (str == "MapStyleVehicleDark") return MapStyleVehicleDark; - else if (str == "MapStyleOutdoorsLight") - return MapStyleOutdoorsLight; - else if (str == "MapStyleOutdoorsDark") - return MapStyleOutdoorsDark; return kDefaultMapStyle; } @@ -27,13 +51,25 @@ std::string MapStyleToString(MapStyle mapStyle) { switch (mapStyle) { - case MapStyleDefaultDark: return "MapStyleDefaultDark"; - case MapStyleDefaultLight: return "MapStyleDefaultLight"; + case MapStyleWalkingLight: return "MapStyleWalkingLight"; + case MapStyleWalkingOutdoorLight: return "MapStyleWalkingOutdoorLight"; + case MapStyleWalkingDark: return "MapStyleWalkingDark"; + case MapStyleWalkingOutdoorDark: return "MapStyleWalkingOutdoorDark"; + case MapStyleCyclingLight: return "MapStyleCyclingLight"; + case MapStyleCyclingOutdoorLight: return "MapStyleCyclingOutdoorLight"; + case MapStyleCyclingDark: return "MapStyleCyclingDark"; + case MapStyleCyclingOutdoorDark: return "MapStyleCyclingOutdoorDark"; + case MapStyleDrivingLight: return "MapStyleDrivingLight"; + case MapStyleDrivingOutdoorLight: return "MapStyleDrivingOutdoorLight"; + case MapStyleDrivingDark: return "MapStyleDrivingDark"; + case MapStyleDrivingOutdoorDark: return "MapStyleDrivingOutdoorDark"; + case MapStylePublicTransportLight: return "MapStylePublicTransportLight"; + case MapStylePublicTransportOutdoorLight: return "MapStylePublicTransportOutdoorLight"; + case MapStylePublicTransportDark: return "MapStylePublicTransportDark"; + case MapStylePublicTransportOutdoorDark: return "MapStylePublicTransportOutdoorDark"; case MapStyleMerged: return "MapStyleMerged"; - case MapStyleVehicleDark: return "MapStyleVehicleDark"; case MapStyleVehicleLight: return "MapStyleVehicleLight"; - case MapStyleOutdoorsDark: return "MapStyleOutdoorsDark"; - case MapStyleOutdoorsLight: return "MapStyleOutdoorsLight"; + case MapStyleVehicleDark: return "MapStyleVehicleDark"; case MapStyleCount: break; } @@ -46,12 +82,24 @@ std::string DebugPrint(MapStyle mapStyle) return MapStyleToString(mapStyle); } -bool MapStyleIsDark(MapStyle mapStyle) +MapStyle GetLightMapStyleVariant(MapStyle mapStyle) { - for (auto const darkStyle : {MapStyleDefaultDark, MapStyleVehicleDark, MapStyleOutdoorsDark}) - if (mapStyle == darkStyle) - return true; - return false; + if (!MapStyleIsDark(mapStyle)) + return mapStyle; + + switch (mapStyle) + { + case MapStyleWalkingDark: return MapStyleWalkingLight; + case MapStyleWalkingOutdoorDark: return MapStyleWalkingOutdoorLight; + case MapStyleCyclingDark: return MapStyleCyclingLight; + case MapStyleCyclingOutdoorDark: return MapStyleCyclingOutdoorLight; + case MapStyleDrivingDark: return MapStyleDrivingLight; + case MapStyleDrivingOutdoorDark: return MapStyleDrivingOutdoorLight; + case MapStylePublicTransportDark: return MapStylePublicTransportLight; + case MapStylePublicTransportOutdoorDark: return MapStylePublicTransportOutdoorLight; + case MapStyleVehicleDark: return MapStyleVehicleLight; + default: CHECK(false, ()); return MapStyleWalkingLight; + } } MapStyle GetDarkMapStyleVariant(MapStyle mapStyle) @@ -61,23 +109,73 @@ MapStyle GetDarkMapStyleVariant(MapStyle mapStyle) switch (mapStyle) { - case MapStyleDefaultLight: return MapStyleDefaultDark; + case MapStyleWalkingLight: return MapStyleWalkingDark; + case MapStyleWalkingOutdoorLight: return MapStyleWalkingOutdoorDark; + case MapStyleCyclingLight: return MapStyleCyclingDark; + case MapStyleCyclingOutdoorLight: return MapStyleCyclingOutdoorDark; + case MapStyleDrivingLight: return MapStyleDrivingDark; + case MapStyleDrivingOutdoorLight: return MapStyleDrivingOutdoorDark; + case MapStylePublicTransportLight: return MapStylePublicTransportDark; + case MapStylePublicTransportOutdoorLight: return MapStylePublicTransportOutdoorDark; case MapStyleVehicleLight: return MapStyleVehicleDark; - case MapStyleOutdoorsLight: return MapStyleOutdoorsDark; - default: CHECK(false, ()); return MapStyleDefaultDark; + default: CHECK(false, ()); return MapStyleWalkingDark; } } -MapStyle GetLightMapStyleVariant(MapStyle mapStyle) +bool MapStyleIsDark(MapStyle mapStyle) { - if (!MapStyleIsDark(mapStyle)) + for (auto const darkStyle : {MapStyleWalkingDark, MapStyleWalkingOutdoorDark, MapStyleCyclingDark, MapStyleCyclingOutdoorDark, MapStyleDrivingDark, MapStyleDrivingOutdoorDark, MapStylePublicTransportDark, MapStylePublicTransportOutdoorDark, MapStyleVehicleDark}) + if (mapStyle == darkStyle) + return true; + return false; +} + +MapStyle GetRegularMapStyleVariant(MapStyle mapStyle) +{ + if (!MapStyleIsOutdoor(mapStyle)) return mapStyle; switch (mapStyle) { - case MapStyleDefaultDark: return MapStyleDefaultLight; + case MapStyleWalkingOutdoorLight: return MapStyleWalkingLight; + case MapStyleWalkingOutdoorDark: return MapStyleWalkingDark; + case MapStyleCyclingOutdoorLight: return MapStyleCyclingLight; + case MapStyleCyclingOutdoorDark: return MapStyleCyclingDark; + case MapStyleDrivingOutdoorLight: return MapStyleDrivingLight; + case MapStyleDrivingOutdoorDark: return MapStyleDrivingDark; + case MapStylePublicTransportOutdoorLight: return MapStylePublicTransportLight; + case MapStylePublicTransportOutdoorDark: return MapStylePublicTransportDark; + case MapStyleVehicleLight: return MapStyleVehicleLight; case MapStyleVehicleDark: return MapStyleVehicleLight; - case MapStyleOutdoorsDark: return MapStyleOutdoorsLight; - default: CHECK(false, ()); return MapStyleDefaultLight; + default: CHECK(false, ()); return MapStyleWalkingLight; + } +} + +MapStyle GetOutdoorMapStyleVariant(MapStyle mapStyle) +{ + if (MapStyleIsOutdoor(mapStyle) || mapStyle == MapStyleMerged) + return mapStyle; + + switch (mapStyle) + { + case MapStyleWalkingLight: return MapStyleWalkingOutdoorLight; + case MapStyleWalkingDark: return MapStyleWalkingOutdoorDark; + case MapStyleCyclingLight: return MapStyleCyclingOutdoorLight; + case MapStyleCyclingDark: return MapStyleCyclingOutdoorDark; + case MapStyleDrivingLight: return MapStyleDrivingOutdoorLight; + case MapStyleDrivingDark: return MapStyleDrivingOutdoorDark; + case MapStylePublicTransportLight: return MapStylePublicTransportOutdoorLight; + case MapStylePublicTransportDark: return MapStylePublicTransportOutdoorDark; + case MapStyleVehicleLight: return MapStyleVehicleLight; + case MapStyleVehicleDark: return MapStyleVehicleDark; + default: CHECK(false, ()); return MapStyleWalkingOutdoorLight; } } + +bool MapStyleIsOutdoor(MapStyle mapStyle) +{ + for (auto const outdoorStyle : {MapStyleWalkingOutdoorLight, MapStyleWalkingOutdoorDark, MapStyleCyclingOutdoorLight, MapStyleCyclingOutdoorDark, MapStyleDrivingOutdoorLight, MapStyleDrivingOutdoorDark, MapStylePublicTransportOutdoorLight, MapStylePublicTransportOutdoorDark}) + if (mapStyle == outdoorStyle) + return true; + return false; +} diff --git a/libs/indexer/map_style.hpp b/libs/indexer/map_style.hpp index 7971a2e8d..ffc787007 100644 --- a/libs/indexer/map_style.hpp +++ b/libs/indexer/map_style.hpp @@ -4,13 +4,25 @@ enum MapStyle { - MapStyleDefaultLight = 0, - MapStyleDefaultDark = 1, - MapStyleMerged = 2, - MapStyleVehicleLight = 3, - MapStyleVehicleDark = 4, - MapStyleOutdoorsLight = 5, - MapStyleOutdoorsDark = 6, + MapStyleWalkingLight = 0, + MapStyleWalkingOutdoorLight = 1, + MapStyleWalkingDark = 2, + MapStyleWalkingOutdoorDark = 3, + MapStyleCyclingLight = 4, + MapStyleCyclingOutdoorLight = 5, + MapStyleCyclingDark = 6, + MapStyleCyclingOutdoorDark = 7, + MapStyleDrivingLight = 8, + MapStyleDrivingOutdoorLight = 9, + MapStyleDrivingDark = 10, + MapStyleDrivingOutdoorDark = 11, + MapStylePublicTransportLight = 12, + MapStylePublicTransportOutdoorLight = 13, + MapStylePublicTransportDark = 14, + MapStylePublicTransportOutdoorDark = 15, + MapStyleVehicleLight = 16, + MapStyleVehicleDark = 17, + MapStyleMerged = 18, // Add new map style here // Specifies number of MapStyle enum values, must be last @@ -22,6 +34,9 @@ extern MapStyle const kDefaultMapStyle; extern MapStyle MapStyleFromSettings(std::string const & str); extern std::string MapStyleToString(MapStyle mapStyle); extern std::string DebugPrint(MapStyle mapStyle); -extern bool MapStyleIsDark(MapStyle mapStyle); -extern MapStyle GetDarkMapStyleVariant(MapStyle mapStyle); extern MapStyle GetLightMapStyleVariant(MapStyle mapStyle); +extern MapStyle GetDarkMapStyleVariant(MapStyle mapStyle); +extern bool MapStyleIsDark(MapStyle mapStyle); +extern MapStyle GetRegularMapStyleVariant(MapStyle mapStyle); +extern MapStyle GetOutdoorMapStyleVariant(MapStyle mapStyle); +extern bool MapStyleIsOutdoor(MapStyle mapStyle); diff --git a/libs/indexer/map_style_reader.cpp b/libs/indexer/map_style_reader.cpp index fed0a1920..2010fe69d 100644 --- a/libs/indexer/map_style_reader.cpp +++ b/libs/indexer/map_style_reader.cpp @@ -7,16 +7,30 @@ #include "base/file_name_utils.hpp" #include "base/logging.hpp" +#include "indexer/classificator_loader.hpp" + namespace { -std::string const kSuffixDark = "dark"; std::string const kSuffixLight = "light"; -std::string const kSuffixDefaultDark = "_default_dark"; -std::string const kSuffixDefaultLight = "_default_light"; -std::string const kSuffixVehicleDark = "_vehicle_dark"; +std::string const kSuffixDark = "dark"; +std::string const kSuffixWalkingLight = "_walking_light"; +std::string const kSuffixWalkingOutdoorLight = "_walking_outdoor_light"; +std::string const kSuffixWalkingDark = "_walking_dark"; +std::string const kSuffixWalkingOutdoorDark = "_walking_outdoor_dark"; +std::string const kSuffixCyclingLight = "_cycling_light"; +std::string const kSuffixCyclingOutdoorLight = "_cycling_outdoor_light"; +std::string const kSuffixCyclingDark = "_cycling_dark"; +std::string const kSuffixCyclingOutdoorDark = "_cycling_outdoor_dark"; +std::string const kSuffixDrivingLight = "_driving_light"; +std::string const kSuffixDrivingOutdoorLight = "_driving_outdoor_light"; +std::string const kSuffixDrivingDark = "_driving_dark"; +std::string const kSuffixDrivingOutdoorDark = "_driving_outdoor_dark"; +std::string const kSuffixPublicTransportLight = "_public-transport_light"; +std::string const kSuffixPublicTransportOutdoorLight = "_public-transport_outdoor_light"; +std::string const kSuffixPublicTransportDark = "_public-transport_dark"; +std::string const kSuffixPublicTransportOutdoorDark = "_public-transport_outdoor_dark"; std::string const kSuffixVehicleLight = "_vehicle_light"; -std::string const kSuffixOutdoorsLight = "_outdoors_light"; -std::string const kSuffixOutdoorsDark = "_outdoors_dark"; +std::string const kSuffixVehicleDark = "_vehicle_dark"; std::string const kStylesOverrideDir = "styles"; @@ -31,18 +45,30 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle) #else switch (mapStyle) { - case MapStyleDefaultDark: return kSuffixDefaultDark; - case MapStyleDefaultLight: return kSuffixDefaultLight; - case MapStyleVehicleDark: return kSuffixVehicleDark; + case MapStyleWalkingLight: return kSuffixWalkingLight; + case MapStyleWalkingOutdoorLight: return kSuffixWalkingOutdoorLight; + case MapStyleWalkingDark: return kSuffixWalkingDark; + case MapStyleWalkingOutdoorDark: return kSuffixWalkingOutdoorDark; + case MapStyleCyclingLight: return kSuffixCyclingLight; + case MapStyleCyclingOutdoorLight: return kSuffixCyclingOutdoorLight; + case MapStyleCyclingDark: return kSuffixCyclingDark; + case MapStyleCyclingOutdoorDark: return kSuffixCyclingOutdoorDark; + case MapStyleDrivingLight: return kSuffixDrivingLight; + case MapStyleDrivingOutdoorLight: return kSuffixDrivingOutdoorLight; + case MapStyleDrivingDark: return kSuffixDrivingDark; + case MapStyleDrivingOutdoorDark: return kSuffixDrivingOutdoorDark; + case MapStylePublicTransportLight: return kSuffixPublicTransportLight; + case MapStylePublicTransportOutdoorLight: return kSuffixPublicTransportOutdoorLight; + case MapStylePublicTransportDark: return kSuffixPublicTransportDark; + case MapStylePublicTransportOutdoorDark: return kSuffixPublicTransportOutdoorDark; case MapStyleVehicleLight: return kSuffixVehicleLight; - case MapStyleOutdoorsLight: return kSuffixOutdoorsLight; - case MapStyleOutdoorsDark: return kSuffixOutdoorsDark; + case MapStyleVehicleDark: return kSuffixVehicleDark; case MapStyleMerged: return {}; case MapStyleCount: break; } LOG(LWARNING, ("Unknown map style", mapStyle)); - return kSuffixDefaultLight; + return kSuffixWalkingLight; #endif // BUILD_DESIGNER } @@ -55,12 +81,24 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle) // to avoid textures duplication and package size increasing. switch (mapStyle) { - case MapStyleDefaultDark: - case MapStyleVehicleDark: - case MapStyleOutdoorsDark: return kSuffixDark; - case MapStyleDefaultLight: - case MapStyleVehicleLight: - case MapStyleOutdoorsLight: return kSuffixLight; + case MapStyleWalkingLight: + case MapStyleWalkingOutdoorLight: + case MapStyleCyclingLight: + case MapStyleCyclingOutdoorLight: + case MapStyleDrivingLight: + case MapStyleDrivingOutdoorLight: + case MapStylePublicTransportLight: + case MapStylePublicTransportOutdoorLight: + case MapStyleVehicleLight: return kSuffixLight; + case MapStyleWalkingDark: + case MapStyleWalkingOutdoorDark: + case MapStyleCyclingDark: + case MapStyleCyclingOutdoorDark: + case MapStyleDrivingDark: + case MapStyleDrivingOutdoorDark: + case MapStylePublicTransportDark: + case MapStylePublicTransportOutdoorDark: + case MapStyleVehicleDark: return kSuffixDark; case MapStyleMerged: return {}; case MapStyleCount: break; @@ -75,7 +113,10 @@ StyleReader::StyleReader() : m_mapStyle(kDefaultMapStyle) {} void StyleReader::SetCurrentStyle(MapStyle mapStyle) { + m_loadingMapStyle = mapStyle; + classificator::Load(); m_mapStyle = mapStyle; + classificator::Cleanup(); } MapStyle StyleReader::GetCurrentStyle() const @@ -83,6 +124,11 @@ MapStyle StyleReader::GetCurrentStyle() const return m_mapStyle; } +MapStyle StyleReader::GetLoadingStyle() const +{ + return m_loadingMapStyle; +} + bool StyleReader::IsCarNavigationStyle() const { return m_mapStyle == MapStyle::MapStyleVehicleLight || m_mapStyle == MapStyle::MapStyleVehicleDark; @@ -90,7 +136,7 @@ bool StyleReader::IsCarNavigationStyle() const ReaderPtr StyleReader::GetDrawingRulesReader() const { - std::string rulesFile = std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin"; + std::string rulesFile = std::string("drules_proto") + GetStyleRulesSuffix(GetLoadingStyle()) + ".bin"; auto overriddenRulesFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile); if (Platform::IsFileExistsByFullPath(overriddenRulesFile)) @@ -123,7 +169,7 @@ ReaderPtr StyleReader::GetResourceReader(std::string const & file, std:: ReaderPtr StyleReader::GetDefaultResourceReader(std::string const & file) const { - return GetPlatform().GetReader(base::JoinPath("symbols/default", file)); + return GetPlatform().GetReader(base::JoinPath("symbols/walking", file)); } StyleReader & GetStyleReader() diff --git a/libs/indexer/map_style_reader.hpp b/libs/indexer/map_style_reader.hpp index 4dddc48da..7c46a21a2 100644 --- a/libs/indexer/map_style_reader.hpp +++ b/libs/indexer/map_style_reader.hpp @@ -14,6 +14,7 @@ class StyleReader void SetCurrentStyle(MapStyle mapStyle); MapStyle GetCurrentStyle() const; + MapStyle GetLoadingStyle() const; bool IsCarNavigationStyle() const; ReaderPtr GetDrawingRulesReader() const; @@ -23,6 +24,7 @@ class StyleReader private: std::atomic m_mapStyle; + std::atomic m_loadingMapStyle; }; extern StyleReader & GetStyleReader(); diff --git a/libs/indexer/types_mapping.cpp b/libs/indexer/types_mapping.cpp index 6f5f6df7c..1b73de886 100644 --- a/libs/indexer/types_mapping.cpp +++ b/libs/indexer/types_mapping.cpp @@ -14,7 +14,7 @@ void IndexAndTypeMapping::Clear() void IndexAndTypeMapping::Load(istream & s) { - Classificator const & c = classif(); + Classificator const & c = classif(GetStyleReader().GetLoadingStyle()); string line; vector path; diff --git a/libs/map/chart_generator.cpp b/libs/map/chart_generator.cpp index d0af10a0e..89dd9a9c3 100644 --- a/libs/map/chart_generator.cpp +++ b/libs/map/chart_generator.cpp @@ -52,36 +52,19 @@ struct BlendAdaptor agg::rgba8 GetLineColor(MapStyle mapStyle) { - switch (mapStyle) - { - case MapStyleCount: LOG(LERROR, ("Wrong map style param.")); // fallthrough - case MapStyleDefaultDark: - case MapStyleVehicleDark: - case MapStyleOutdoorsDark: return agg::rgba8(255, 230, 140, 255); - case MapStyleDefaultLight: - case MapStyleVehicleLight: - case MapStyleOutdoorsLight: - case MapStyleMerged: return agg::rgba8(30, 150, 240, 255); - } + if (MapStyleIsDark(mapStyle)) + return agg::rgba8(255, 230, 140, 255); + else + return agg::rgba8(30, 150, 240, 255); UNREACHABLE(); } agg::rgba8 GetCurveColor(MapStyle mapStyle) { - switch (mapStyle) - { - case MapStyleCount: - LOG(LERROR, ("Wrong map style param.")); - [[fallthrough]]; - // No need break or return here. - case MapStyleDefaultDark: - case MapStyleVehicleDark: - case MapStyleOutdoorsDark: return agg::rgba8(255, 230, 140, 20); - case MapStyleDefaultLight: - case MapStyleVehicleLight: - case MapStyleOutdoorsLight: - case MapStyleMerged: return agg::rgba8(30, 150, 240, 20); - } + if (MapStyleIsDark(mapStyle)) + return agg::rgba8(255, 230, 140, 20); + else + return agg::rgba8(30, 150, 240, 20); UNREACHABLE(); } } // namespace diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp index a8a62d4e9..11033d848 100644 --- a/libs/map/framework.cpp +++ b/libs/map/framework.cpp @@ -122,10 +122,11 @@ std::string_view constexpr kMapStyleKey = "MapStyleKeyV1"; std::string_view constexpr kAllow3dKey = "Allow3d"; std::string_view constexpr kAllow3dBuildingsKey = "Buildings3d"; std::string_view constexpr kAllowAutoZoom = "AutoZoom"; -std::string_view constexpr kTrafficEnabledKey = "TrafficEnabled"; -std::string_view constexpr kTransitSchemeEnabledKey = "TransitSchemeEnabled"; -std::string_view constexpr kIsolinesEnabledKey = "IsolinesEnabled"; -std::string_view constexpr kOutdoorsEnabledKey = "OutdoorsEnabled"; +std::string_view constexpr kMapModeKey = "MapMode"; +std::string_view constexpr kMapModeDrivingTrafficKey = "DrivingModeHasTraffic"; +std::string_view constexpr kMapModePublicTransportTransitLinesKey = "PublicTransportModeHasTransitLines"; +std::string_view constexpr kContourLinesKey = "HasContourLinesLayer"; +std::string_view constexpr kOutdoorKey = "HasOutdoorLayer"; std::string_view constexpr kTrafficSimplifiedColorsKey = "TrafficSimplifiedColors"; std::string_view constexpr kLargeFontsSize = "LargeFontsSize"; std::string_view constexpr kPreferredGraphicsAPI = "PreferredGraphicsAPI"; @@ -251,21 +252,25 @@ EMyPositionMode Framework::GetMyPositionMode() const return m_drapeEngine ? m_drapeEngine->GetMyPositionMode() : PendingPosition; } +// Direct access to managers only for legacy Android listener support. So please dont use directly anymore! TrafficManager & Framework::GetTrafficManager() { return m_trafficManager; } +// Direct access to managers only for legacy Android listener support. So please dont use directly anymore! TransitReadManager & Framework::GetTransitManager() { return m_transitManager; } +// Direct access to managers only for legacy Android listener support. So please dont use directly anymore! IsolinesManager & Framework::GetIsolinesManager() { return m_isolinesManager; } +// Direct access to managers only for legacy Android listener support. So please dont use directly anymore! IsolinesManager const & Framework::GetIsolinesManager() const { return m_isolinesManager; @@ -396,10 +401,10 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps) /// @todo Uncomment when we will integrate a traffic provider. // m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion()); // m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors()); - // m_trafficManager.SetEnabled(LoadTrafficEnabled()); - - m_isolinesManager.SetEnabled(LoadIsolinesEnabled()); + // m_trafficManager.SetEnabled(MapModeHasTraffic()); + m_isolinesManager.SetEnabled(HasContourLinesLayer()); + InitTransliteration(); LOG(LDEBUG, ("Transliterators initialized")); @@ -1535,8 +1540,8 @@ void Framework::CreateDrapeEngine(ref_ptr contextFac auto const isAutozoomEnabled = LoadAutoZoom(); - auto const trafficEnabled = m_trafficManager.IsEnabled(); - auto const isolinesEnabled = m_isolinesManager.IsEnabled(); + auto const hasTraffic = CurrentMapModeHasTraffic(); + auto const hasContourLines = HasContourLinesLayer(); auto const simplifiedTrafficColors = m_trafficManager.HasSimplifiedColorScheme(); auto const fontsScaleFactor = LoadLargeFontsSize() ? kLargeFontsScaleFactor : 1.0; @@ -1546,7 +1551,7 @@ void Framework::CreateDrapeEngine(ref_ptr contextFac df::MapDataProvider(std::move(idReadFn), std::move(featureReadFn), std::move(isCountryLoadedByNameFn), std::move(updateCurrentCountryFn)), params.m_hints, params.m_visualScale, fontsScaleFactor, std::move(params.m_widgetsInitInfo), - std::move(myPositionModeChangedFn), allow3dBuildings, trafficEnabled, isolinesEnabled, + std::move(myPositionModeChangedFn), allow3dBuildings, hasTraffic, hasContourLines, params.m_isChoosePositionMode, params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), m_routingManager.IsRoutingActive() && m_routingManager.IsRoutingFollowing(), isAutozoomEnabled, simplifiedTrafficColors, std::nullopt /* arrow3dCustomDecl */, std::move(overlaysShowStatsFn), @@ -1584,9 +1589,8 @@ void Framework::CreateDrapeEngine(ref_ptr contextFac InvalidateUserMarks(); - auto const transitSchemeEnabled = LoadTransitSchemeEnabled(); - m_transitManager.EnableTransitSchemeMode(transitSchemeEnabled); - + m_transitManager.EnableTransitSchemeMode(CurrentMapModeHasTransitLines()); + // Show debug info if it's enabled in the config. bool showDebugInfo; if (!settings::Get(kShowDebugInfo, showDebugInfo)) @@ -1618,6 +1622,13 @@ void Framework::OnDestroySurface() m_trafficManager.OnDestroySurface(); } +double Framework::GetVisualScale() +{ + if (m_drapeEngine != nullptr) + return m_drapeEngine->GetVisualScale(); + return 0; +} + void Framework::UpdateVisualScale(double vs) { if (m_drapeEngine != nullptr) @@ -1806,11 +1817,11 @@ void Framework::MarkMapStyle(MapStyle mapStyle) GetStyleReader().SetCurrentStyle(mapStyle); } -void Framework::SetMapStyle(MapStyle mapStyle) +void Framework::SetMapStyle(MapStyle mapStyle, bool const forceRerendering) { MarkMapStyle(mapStyle); if (m_drapeEngine != nullptr) - m_drapeEngine->UpdateMapStyle(); + m_drapeEngine->UpdateMapStyle(forceRerendering); InvalidateUserMarks(); UpdateMinBuildingsTapZoom(); } @@ -2516,19 +2527,6 @@ void Framework::SetLargeFontsSize(bool isLargeSize) InvalidateRect(GetCurrentViewport()); } -bool Framework::LoadTrafficEnabled() -{ - bool enabled; - if (!settings::Get(kTrafficEnabledKey, enabled)) - enabled = false; - return enabled; -} - -void Framework::SaveTrafficEnabled(bool trafficEnabled) -{ - settings::Set(kTrafficEnabledKey, trafficEnabled); -} - bool Framework::LoadTrafficSimplifiedColors() { bool simplified; @@ -2542,6 +2540,11 @@ void Framework::SaveTrafficSimplifiedColors(bool simplified) settings::Set(kTrafficSimplifiedColorsKey, simplified); } +void Framework::SetTrafficSimplifiedColors(bool simplified) +{ + m_trafficManager.SetSimplifiedColorScheme(simplified); +} + bool Framework::LoadAutoZoom() { bool allowAutoZoom; @@ -2564,43 +2567,282 @@ void Framework::SaveAutoZoom(bool allowAutoZoom) settings::Set(kAllowAutoZoom, allowAutoZoom); } -bool Framework::LoadTransitSchemeEnabled() +void Framework::SwitchToMapAppearance(MapAppearance const mapAppearance) +{ + if (mapAppearance == CurrentMapAppearance()) + return; + + MapStyle mapStyle = GetMapStyle(); + if (mapAppearance == MapAppearance::Dark) + mapStyle = GetDarkMapStyleVariant(mapStyle); + else + mapStyle = GetLightMapStyleVariant(mapStyle); + + SetMapStyle(mapStyle, true); +} + +MapAppearance Framework::CurrentMapAppearance() +{ + if (MapStyleIsDark(GetMapStyle())) + return MapAppearance::Dark; + + return MapAppearance::Light; +} + +void Framework::SwitchToMapMode(MapMode const mapMode, bool const shouldAlwaysRefresh) +{ + if (!shouldAlwaysRefresh && mapMode == CurrentMapMode()) + return; + + MapStyle mapStyle = GetMapStyle(); + + string mapModeValue = "Default"; + switch (mapMode) + { + case MapMode::Cycling: + mapModeValue = "Cycling"; + if (MapStyleIsDark(mapStyle)) + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleCyclingOutdoorDark; + else + mapStyle = MapStyleCyclingDark; + } + else + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleCyclingOutdoorLight; + else + mapStyle = MapStyleCyclingLight; + } + break; + case MapMode::Driving: + mapModeValue = "Driving"; + if (MapStyleIsDark(mapStyle)) + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleDrivingOutdoorDark; + else + mapStyle = MapStyleDrivingDark; + } + else + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleDrivingOutdoorLight; + else + mapStyle = MapStyleDrivingLight; + } + break; + case MapMode::PublicTransport: + mapModeValue = "PublicTransport"; + if (MapStyleIsDark(mapStyle)) + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStylePublicTransportOutdoorDark; + else + mapStyle = MapStylePublicTransportDark; + } + else + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStylePublicTransportOutdoorLight; + else + mapStyle = MapStylePublicTransportLight; + } + break; + default: + mapModeValue = "Walking"; + if (MapStyleIsDark(mapStyle)) + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleWalkingOutdoorDark; + else + mapStyle = MapStyleWalkingDark; + } + else + { + if (MapStyleIsOutdoor(mapStyle)) + mapStyle = MapStyleWalkingOutdoorLight; + else + mapStyle = MapStyleWalkingLight; + } + break; + } + + settings::Set(kMapModeKey, mapModeValue); + + SetMapStyle(mapStyle); + + RefreshForMapMode(); +} + +MapMode Framework::CurrentMapMode() +{ + string mapModeValue = "Default"; + UNUSED_VALUE(settings::Get(kMapModeKey, mapModeValue)); + + MapMode mapMode = MapMode::Walking; + if (mapModeValue == "Cycling") + mapMode = MapMode::Cycling; + else if (mapModeValue == "Driving") + mapMode = MapMode::Driving; + else if (mapModeValue == "PublicTransport") + mapMode = MapMode::PublicTransport; + + return mapMode; +} + +bool Framework::CurrentMapModeHasTraffic() +{ + return CurrentMapMode() == MapMode::Driving && DrivingMapModeHasTraffic(); +} + +bool Framework::CurrentMapModeHasTransitLines() +{ + return CurrentMapMode() == MapMode::PublicTransport && PublicTransportMapModeHasTransitLines(); +} + +bool Framework::DrivingMapModeHasTraffic() +{ + bool hasTraffic; + if (!settings::Get(kMapModeDrivingTrafficKey, hasTraffic)) + hasTraffic = false; + return hasTraffic; +} + +void Framework::DrivingMapModeSetTraffic(bool const hasTraffic) +{ + if (hasTraffic == DrivingMapModeHasTraffic()) + return; + + settings::Set(kMapModeDrivingTrafficKey, hasTraffic); + RefreshForMapMode(); +} + +bool Framework::PublicTransportMapModeHasTransitLines() { - bool enabled; - if (!settings::Get(kTransitSchemeEnabledKey, enabled)) - enabled = false; - return enabled; + bool hasTransitLines; + if (!settings::Get(kMapModePublicTransportTransitLinesKey, hasTransitLines)) + hasTransitLines = true; + return hasTransitLines; } -void Framework::SaveTransitSchemeEnabled(bool enabled) +void Framework::PublicTransportMapModeSetTransitLines(bool const hasTransitLines) { - settings::Set(kTransitSchemeEnabledKey, enabled); + if (hasTransitLines == PublicTransportMapModeHasTransitLines()) + return; + + settings::Set(kMapModePublicTransportTransitLinesKey, hasTransitLines); + RefreshForMapMode(); } -bool Framework::LoadIsolinesEnabled() +void Framework::RefreshForMapMode() { - bool enabled; - if (!settings::Get(kIsolinesEnabledKey, enabled)) - enabled = false; - return enabled; + bool const hasContourLines = HasContourLinesLayer(); + if (m_isolinesManager.IsEnabled() != hasContourLines) + m_isolinesManager.SetEnabled(hasContourLines); + + bool const hasTraffic = CurrentMapModeHasTraffic(); + if (m_trafficManager.IsEnabled() != hasTraffic) + m_trafficManager.SetEnabled(hasTraffic); + + bool const hasTransitLines = CurrentMapModeHasTransitLines(); + if (m_transitManager.IsTransitSchemeModeEnabled() != hasTransitLines) + m_transitManager.EnableTransitSchemeMode(hasTransitLines); } -void Framework::SaveIsolinesEnabled(bool enabled) +bool Framework::HasOutdoorLayer() { - settings::Set(kIsolinesEnabledKey, enabled); + bool hasOutdoorLayer; + if (!settings::Get(kOutdoorKey, hasOutdoorLayer)) + hasOutdoorLayer = false; + return hasOutdoorLayer; } -bool Framework::LoadOutdoorsEnabled() +void Framework::SetOutdoorLayer(bool const hasOutdoorLayer) { - bool enabled; - if (!settings::Get(kOutdoorsEnabledKey, enabled)) - enabled = false; - return enabled; + if (hasOutdoorLayer == HasOutdoorLayer()) + return; + + settings::Set(kOutdoorKey, hasOutdoorLayer); + + MapStyle mapStyle = GetMapStyle(); + if (hasOutdoorLayer) + mapStyle = GetOutdoorMapStyleVariant(mapStyle); + else + mapStyle = GetRegularMapStyleVariant(mapStyle); + + SetMapStyle(mapStyle); + + RefreshForMapMode(); } -void Framework::SaveOutdoorsEnabled(bool enabled) +bool Framework::HasContourLinesLayer() { - settings::Set(kOutdoorsEnabledKey, enabled); + bool hasContourLines; + if (!settings::Get(kContourLinesKey, hasContourLines)) + hasContourLines = false; + return hasContourLines; +} + +void Framework::SetContourLinesLayer(bool const hasContourLines) +{ + if (hasContourLines == HasContourLinesLayer()) + return; + + settings::Set(kContourLinesKey, hasContourLines); + RefreshForMapMode(); +} + +bool Framework::HasBuildings3d() +{ + bool allow3d = false; + bool allow3dBuildings = true; + + Load3dMode(allow3d, allow3dBuildings); + if (!GetPowerManager().IsFacilityEnabled(power_management::Facility::Buildings3d)) { + return false; + } else { + return allow3dBuildings; + } +} + +void Framework::SetBuildings3d(bool const hasBuildings3d) +{ + if (hasBuildings3d == HasBuildings3d()) + return; + + bool allow3d = false; + bool allow3dBuildings = true; + + Load3dMode(allow3d, allow3dBuildings); + allow3dBuildings = static_cast(hasBuildings3d); + Save3dMode(allow3d, allow3dBuildings); + Allow3dMode(allow3d, allow3dBuildings); +} + +bool Framework::IsUsingVehicleStyle() +{ + MapStyle const mapStyle = GetMapStyle(); + return mapStyle == MapStyleVehicleLight || mapStyle == MapStyleVehicleDark; +} + +void Framework::SwitchToUsingVehicleStyle(bool const shouldUseVehicleStyle) +{ + if (shouldUseVehicleStyle == IsUsingVehicleStyle()) + return; + + if (shouldUseVehicleStyle) + { + if (CurrentMapAppearance() == MapAppearance::Dark) + SetMapStyle(MapStyleVehicleDark); + else + SetMapStyle(MapStyleVehicleLight); + } + else + { + SwitchToMapMode(CurrentMapMode(), true); + } } void Framework::EnableChoosePositionMode(bool enable, bool enableBounds, m2::PointD const * optionalPosition) @@ -2641,36 +2883,32 @@ void Framework::BlockTapEvents(bool block) bool Framework::ParseDrapeDebugCommand(string const & query) { - MapStyle desiredStyle = MapStyleCount; - if (query == "?dark" || query == "mapstyle:dark") - desiredStyle = MapStyleDefaultDark; - else if (query == "?light" || query == "mapstyle:light") - desiredStyle = MapStyleDefaultLight; + MapAppearance mapAppearance = CurrentMapAppearance(); + bool isUsingVehicleStyle = IsUsingVehicleStyle(); + if (query == "?light" || query == "mapstyle:light") + { + mapAppearance = MapAppearance::Light; + isUsingVehicleStyle = false; + } + else if (query == "?dark" || query == "mapstyle:dark") + { + mapAppearance = MapAppearance::Dark; + isUsingVehicleStyle = false; + } else if (query == "?vlight" || query == "mapstyle:vehicle_light") - desiredStyle = MapStyleVehicleLight; + { + mapAppearance = MapAppearance::Light; + isUsingVehicleStyle = true; + } else if (query == "?vdark" || query == "mapstyle:vehicle_dark") - desiredStyle = MapStyleVehicleDark; - else if (query == "?olight" || query == "mapstyle:outdoors_light") - desiredStyle = MapStyleOutdoorsLight; - else if (query == "?odark" || query == "mapstyle:outdoors_dark") - desiredStyle = MapStyleOutdoorsDark; - - if (desiredStyle != MapStyleCount) { -#if defined(OMIM_OS_ANDROID) - if (m_drapeEngine->GetApiVersion() == dp::ApiVersion::Vulkan) - { - // See comment in android/jni/app/organicmaps/Framework.cpp Framework::MarkMapStyle(). - SetMapStyle(desiredStyle); - } - else - MarkMapStyle(desiredStyle); -#else - SetMapStyle(desiredStyle); -#endif - return true; + mapAppearance = MapAppearance::Dark; + isUsingVehicleStyle = true; } + SwitchToMapAppearance(mapAppearance); + SwitchToUsingVehicleStyle(isUsingVehicleStyle); + if (query == "?aa" || query == "effect:antialiasing") { m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing, true /* enabled */); @@ -2681,26 +2919,6 @@ bool Framework::ParseDrapeDebugCommand(string const & query) m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing, false /* enabled */); return true; } - if (query == "?scheme") - { - m_transitManager.EnableTransitSchemeMode(true /* enable */); - return true; - } - if (query == "?no-scheme") - { - m_transitManager.EnableTransitSchemeMode(false /* enable */); - return true; - } - if (query == "?isolines") - { - m_isolinesManager.SetEnabled(true /* enable */); - return true; - } - if (query == "?no-isolines") - { - m_isolinesManager.SetEnabled(false /* enable */); - return true; - } if (query == "?debug-info") { m_drapeEngine->ShowDebugInfo(true /* shown */); @@ -3279,10 +3497,9 @@ void Framework::OnRouteFollow(routing::RouterType type) ++scale3d; bool const isBicycleRoute = type == RouterType::Bicycle; - if ((isPedestrianRoute || isBicycleRoute) && LoadTrafficEnabled()) + if ((isPedestrianRoute || isBicycleRoute) && CurrentMapModeHasTraffic()) { m_trafficManager.SetEnabled(false /* enabled */); - SaveTrafficEnabled(false /* enabled */); } // TODO. We need to sync two enums VehicleType and RouterType to be able to pass // GetRoutingSettings(type).m_matchRoute to the FollowRoute() instead of |isPedestrianRoute|. @@ -3334,6 +3551,11 @@ void Framework::FillDescriptions(FeatureType & ft, place_page::Info & info) cons info.SetOSMDescription(std::string(translatedOsmDescription.value())); } +void Framework::RunOnPowerManagerChanges(function fn) +{ + m_runOnPowerManagerChangesFn = fn; +} + void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) { if (facility == power_management::Facility::PerspectiveView || facility == power_management::Facility::Buildings3d) @@ -3350,18 +3572,24 @@ void Framework::OnPowerFacilityChanged(power_management::Facility const facility } else if (facility == power_management::Facility::TrafficJams) { - auto trafficState = enabled && LoadTrafficEnabled(); - if (trafficState == GetTrafficManager().IsEnabled()) + auto trafficState = enabled && CurrentMapModeHasTraffic(); + if (trafficState == m_trafficManager.IsEnabled()) return; - GetTrafficManager().SetEnabled(trafficState); + m_trafficManager.SetEnabled(trafficState); } + + if (m_runOnPowerManagerChangesFn) + m_runOnPowerManagerChangesFn(); } void Framework::OnPowerSchemeChanged(power_management::Scheme const actualScheme) { - if (actualScheme == power_management::Scheme::EconomyMaximum && GetTrafficManager().IsEnabled()) - GetTrafficManager().SetEnabled(false); + if (actualScheme == power_management::Scheme::EconomyMaximum && m_trafficManager.IsEnabled()) + m_trafficManager.SetEnabled(false); + + if (m_runOnPowerManagerChangesFn) + m_runOnPowerManagerChangesFn(); } void Framework::SetCarScreenMode(bool enabled) diff --git a/libs/map/framework.hpp b/libs/map/framework.hpp index fc5dc6cae..d2d96c1eb 100644 --- a/libs/map/framework.hpp +++ b/libs/map/framework.hpp @@ -121,6 +121,20 @@ struct FrameworkParams FrameworkParams(bool enableDiffs) : m_enableDiffs(enableDiffs) {} }; +enum MapAppearance : int8_t +{ + Light = 0, + Dark = 1, +}; + +enum MapMode : int8_t +{ + Walking = 0, + Cycling = 1, + Driving = 2, + PublicTransport = 3, +}; + class Framework : public PositionProvider , public SearchAPI::Delegate @@ -236,6 +250,67 @@ class Framework explicit Framework(FrameworkParams const & params = {}, bool loadMaps = true); virtual ~Framework() override; + /// Switch the map appearance to the given one + void SwitchToMapAppearance(MapAppearance const mapAppearance); + + /// Get the current map appearance + MapAppearance CurrentMapAppearance(); + + /// Switch the map mode to the given one + void SwitchToMapMode(MapMode const mapMode, bool const shouldAlwaysRefresh = false); + + /// Get the current map mode + MapMode CurrentMapMode(); + +private: + /// If the current map mode has traffic + bool CurrentMapModeHasTraffic(); + + /// If the current map mode has transit lines + bool CurrentMapModeHasTransitLines(); + +public: + /// If the driving map mode has traffic + bool DrivingMapModeHasTraffic(); + + /// If the driving map mode has traffic + void DrivingMapModeSetTraffic(bool const hasTraffic); + + /// If the public transport map mode has transit lines + bool PublicTransportMapModeHasTransitLines(); + + /// Set if the public transport map mode has transit lines + void PublicTransportMapModeSetTransitLines(bool const hasTransitLines); + +private: + /// Refresh after a possible map mode change + void RefreshForMapMode(); + +public: + /// If the map is optimised for outdoors + bool HasOutdoorLayer(); + + /// Set if the map is optimised for outdoors + void SetOutdoorLayer(bool const hasOutdoorLayer); + + /// If the map has contour lines + bool HasContourLinesLayer(); + + /// Set if the map has contour lines + void SetContourLinesLayer(bool const hasContourLinesLayer); + + /// Set if the map has 3D buildings + bool HasBuildings3d(); + + /// Set if the map has 3D buildings + void SetBuildings3d(bool const hasBuildings3d); + + /// If the vehicle style is being used + bool IsUsingVehicleStyle(); + + /// Set i the vehicle style is being used + void SwitchToUsingVehicleStyle(bool const shouldUseVehicleStyle); + df::DrapeApi & GetDrapeApi() { return m_drapeApi; } /// \returns true if there're unsaved changes in map with |countryId| and false otherwise. @@ -435,6 +510,7 @@ class Framework void OnRecoverSurface(int width, int height, bool recreateContextDependentResources); void OnDestroySurface(); + double GetVisualScale(); void UpdateVisualScale(double vs); /// Sets the distance between the bottom edge of the arrow and the bottom edge of the visible viewport @@ -467,10 +543,6 @@ class Framework /// callback from the `SetTrackRecordingUpdateHandler`. static ElevationInfo const & GetTrackRecordingElevationInfo(); - void SetMapStyle(MapStyle mapStyle); - void MarkMapStyle(MapStyle mapStyle); - MapStyle GetMapStyle() const; - void SetupMeasurementSystem(); void SetWidgetLayout(gui::TWidgetsLayoutInfo && layout); @@ -480,6 +552,10 @@ class Framework private: void InitCountryInfoGetter(); void InitSearchAPI(size_t numThreads); + + void SetMapStyle(MapStyle mapStyle, bool const forceRerendering = false); + void MarkMapStyle(MapStyle mapStyle); + MapStyle GetMapStyle() const; bool m_connectToGpsTrack; // need to connect to tracker when Drape is being constructed @@ -726,28 +802,16 @@ class Framework bool LoadAutoZoom(); void AllowAutoZoom(bool allowAutoZoom); void SaveAutoZoom(bool allowAutoZoom); - + + // Direct access to managers only for legacy Android listener support. So please dont use directly anymore! TrafficManager & GetTrafficManager(); - TransitReadManager & GetTransitManager(); - IsolinesManager & GetIsolinesManager(); IsolinesManager const & GetIsolinesManager() const; - bool LoadTrafficEnabled(); - void SaveTrafficEnabled(bool trafficEnabled); - bool LoadTrafficSimplifiedColors(); void SaveTrafficSimplifiedColors(bool simplified); - - bool LoadTransitSchemeEnabled(); - void SaveTransitSchemeEnabled(bool enabled); - - bool LoadIsolinesEnabled(); - void SaveIsolinesEnabled(bool enabled); - - bool LoadOutdoorsEnabled(); - void SaveOutdoorsEnabled(bool enabled); + void SetTrafficSimplifiedColors(bool simplified); dp::ApiVersion LoadPreferredGraphicsAPI(); void SavePreferredGraphicsAPI(dp::ApiVersion apiVersion); @@ -782,6 +846,9 @@ class Framework public: power_management::PowerManager & GetPowerManager() { return m_powerManager; } + std::function m_runOnPowerManagerChangesFn; + void RunOnPowerManagerChanges(std::function fn); + // PowerManager::Subscriber override. void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override; void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override; diff --git a/libs/map/transit/transit_reader.cpp b/libs/map/transit/transit_reader.cpp index c1d541541..2d95125eb 100644 --- a/libs/map/transit/transit_reader.cpp +++ b/libs/map/transit/transit_reader.cpp @@ -268,6 +268,11 @@ void TransitReadManager::SetDrapeEngine(ref_ptr engine) m_drapeEngine.Set(engine); } +bool TransitReadManager::IsTransitSchemeModeEnabled() +{ + return m_isSchemeMode; +} + void TransitReadManager::EnableTransitSchemeMode(bool enable) { ChangeState(enable ? TransitSchemeState::Enabled : TransitSchemeState::Disabled); diff --git a/libs/map/transit/transit_reader.hpp b/libs/map/transit/transit_reader.hpp index 84d266425..c876de1cd 100644 --- a/libs/map/transit/transit_reader.hpp +++ b/libs/map/transit/transit_reader.hpp @@ -123,6 +123,7 @@ class TransitReadManager bool GetTransitDisplayInfo(TransitDisplayInfos & transitDisplayInfos); + bool IsTransitSchemeModeEnabled(); void EnableTransitSchemeMode(bool enable); void BlockTransitSchemeMode(bool isBlocked); void UpdateViewport(ScreenBase const & screen); diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 3adfbafdd..a9b4d2739 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -135,10 +135,22 @@ set(DATA_FILES copyright.html countries.txt countries_meta.txt - drules_proto_default_light.bin - drules_proto_default_dark.bin - drules_proto_outdoors_light.bin - drules_proto_outdoors_dark.bin + drules_proto_walking_light.bin + drules_proto_walking_outdoor_light.bin + drules_proto_walking_dark.bin + drules_proto_walking_outdoor_dark.bin + drules_proto_cycling_light.bin + drules_proto_cycling_outdoor_light.bin + drules_proto_cycling_dark.bin + drules_proto_cycling_outdoor_dark.bin + drules_proto_driving_light.bin + drules_proto_driving_outdoor_light.bin + drules_proto_driving_dark.bin + drules_proto_driving_outdoor_dark.bin + drules_proto_public-transport_light.bin + drules_proto_public-transport_outdoor_light.bin + drules_proto_public-transport_dark.bin + drules_proto_public-transport_outdoor_dark.bin drules_proto_vehicle_light.bin drules_proto_vehicle_dark.bin editor.config @@ -232,14 +244,14 @@ if (BUILD_DESIGNER) COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxhdpi/design/ COMMAND cp -rf ${OMIM_ROOT}/data/symbols/6plus/light/ ${OMIM_ROOT}/data/symbols/6plus/design/ COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxxhdpi/design/ - COMMAND cp -f ${OMIM_ROOT}/data/drules_proto_default_light.bin ${OMIM_ROOT}/data/drules_proto_default_design.bin + COMMAND cp -f ${OMIM_ROOT}/data/drules_proto_walking_light.bin ${OMIM_ROOT}/data/drules_proto_walking_design.bin COMMAND cp -f ${OMIM_ROOT}/data/colors.txt ${OMIM_ROOT}/data/colors_design.txt COMMAND cp -f ${OMIM_ROOT}/data/patterns.txt ${OMIM_ROOT}/data/patterns_design.txt ) copy_resources( colors_design.txt - drules_proto_default_design.bin + drules_proto_walking_design.bin mapcss-dynamic.txt mapcss-mapping.csv patterns_design.txt diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index a59712d16..1b8fe4765 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -156,9 +156,6 @@ void DrawWidget::PrepareShutdown() if (routingManager.IsRoutingActive() && routingManager.IsRoutingFollowing()) { routingManager.SaveRoutePoints(); - - auto style = m_framework.GetMapStyle(); - m_framework.MarkMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleDefaultDark : MapStyle::MapStyleDefaultLight); } } @@ -507,11 +504,6 @@ void DrawWidget::OnLocationUpdate(location::GpsInfo const & info) m_framework.OnLocationUpdate(info); } -void DrawWidget::SetMapStyle(MapStyle mapStyle) -{ - m_framework.SetMapStyle(mapStyle); -} - void DrawWidget::SubmitFakeLocationPoint(m2::PointD const & pt) { m_emulatingLocation = true; @@ -625,7 +617,7 @@ void DrawWidget::FollowRoute() if (routingManager.IsRoutingActive() && !routingManager.IsRoutingFollowing()) { routingManager.FollowRoute(); - SetMapStyleToVehicle(); + m_framework.SwitchToUsingVehicleStyle(true); } } @@ -637,7 +629,7 @@ void DrawWidget::ClearRoute() routingManager.CloseRouting(true /* remove route points */); if (wasActive) - SetMapStyleToDefault(); + m_framework.SwitchToUsingVehicleStyle(false); m_turnsVisualizer.ClearTurns(m_framework.GetDrapeApi()); } @@ -737,25 +729,12 @@ void DrawWidget::SetRuler(bool enabled) // static void DrawWidget::RefreshDrawingRules() { - SetMapStyle(MapStyleDefaultLight); + m_framework.SwitchToMapMode(m_framework.CurrentMapMode()); } void DrawWidget::SetMapStyleToDefault() { - auto const style = m_framework.GetMapStyle(); - SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleDefaultDark : MapStyle::MapStyleDefaultLight); -} - -void DrawWidget::SetMapStyleToVehicle() -{ - auto const style = m_framework.GetMapStyle(); - SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleVehicleDark : MapStyle::MapStyleVehicleLight); -} - -void DrawWidget::SetMapStyleToOutdoors() -{ - auto const style = m_framework.GetMapStyle(); - SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleOutdoorsDark : MapStyle::MapStyleOutdoorsLight); + m_framework.SwitchToMapMode(MapMode::Walking); } m2::PointD DrawWidget::P2G(m2::PointD const & pt) const diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 900a6dbcd..2a37ed851 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -57,8 +57,6 @@ public Q_SLOTS: Framework & GetFramework() { return m_framework; } - void SetMapStyle(MapStyle mapStyle); - void SetRuler(bool enabled); RouteMarkType GetRoutePointAddMode() const { return m_routePointAddMode; } @@ -70,7 +68,6 @@ public Q_SLOTS: void RefreshDrawingRules(); void SetMapStyleToDefault(); void SetMapStyleToVehicle(); - void SetMapStyleToOutdoors(); protected: /// @name Overriden from MapWidget. diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index e20e80ac7..743423bbb 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -216,6 +216,10 @@ MainWindow::MainWindow(Framework & framework, std::unique_ptr m_pDrawWidget->UpdateAfterSettingsChanged(); RoutingSettings::LoadSession(m_pDrawWidget->GetFramework()); + +#ifndef BUILD_DESIGNER + SetMapMode(m_pDrawWidget->GetFramework().CurrentMapMode()); +#endif // BUILD_DESIGNER } #if defined(OMIM_OS_WINDOWS) @@ -277,31 +281,47 @@ void MainWindow::CreateNavigationBar() } { - using namespace std::placeholders; - - m_layers = new PopupMenuHolder(this); - - /// @todo Uncomment when we will integrate a traffic provider. - // m_layers->addAction(QIcon(":/navig64/traffic.png"), tr("Traffic"), - // std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRAFFIC), true); - // m_layers->setChecked(LayerType::TRAFFIC, m_pDrawWidget->GetFramework().LoadTrafficEnabled()); - - m_layers->addAction(QIcon(":/navig64/subway.png"), tr("Public transport"), - std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRANSIT), true); - m_layers->setChecked(LayerType::TRANSIT, m_pDrawWidget->GetFramework().LoadTransitSchemeEnabled()); - - m_layers->addAction(QIcon(":/navig64/isolines.png"), tr("Isolines"), - std::bind(&MainWindow::OnLayerEnabled, this, LayerType::ISOLINES), true); - m_layers->setChecked(LayerType::ISOLINES, m_pDrawWidget->GetFramework().LoadIsolinesEnabled()); - - m_layers->addAction(QIcon(":/navig64/isolines.png"), tr("Outdoors"), - std::bind(&MainWindow::OnLayerEnabled, this, LayerType::OUTDOORS), true); - m_layers->setChecked(LayerType::OUTDOORS, m_pDrawWidget->GetFramework().LoadOutdoorsEnabled()); - - pToolBar->addWidget(m_layers->create()); - m_layers->setMainIcon(QIcon(":/navig64/layers.png")); - - pToolBar->addSeparator(); +#ifndef BUILD_DESIGNER + m_walkingMapMode = new PopupMenuHolder(this); + m_walkingMapMode->setDefaultAction(QIcon(":/navig64/mode_walking.png"), tr("Walking"), std::bind(&MainWindow::OnMapModeChange, this, MapMode::Walking)); + pToolBar->addWidget(m_walkingMapMode->create()); + m_walkingMapMode->setMainIcon(QIcon(":/navig64/mode_walking.png")); + + m_cyclingMapMode = new PopupMenuHolder(this); + m_cyclingMapMode->setDefaultAction(QIcon(":/navig64/mode_cycling.png"), tr("Cycling"), std::bind(&MainWindow::OnMapModeChange, this, MapMode::Cycling)); + pToolBar->addWidget(m_cyclingMapMode->create()); + m_cyclingMapMode->setMainIcon(QIcon(":/navig64/mode_cycling.png")); + + m_drivingMapMode = new PopupMenuHolder(this); + m_drivingMapMode->setDefaultAction(QIcon(":/navig64/mode_driving.png"), tr("Driving"), std::bind(&MainWindow::OnMapModeChange, this, MapMode::Driving)); + pToolBar->addWidget(m_drivingMapMode->create()); + m_drivingMapMode->setMainIcon(QIcon(":/navig64/mode_driving.png")); + + m_publicTransportMapMode = new PopupMenuHolder(this); + m_publicTransportMapMode->setDefaultAction(QIcon(":/navig64/mode_public-transport.png"), tr("Public Transport"), std::bind(&MainWindow::OnMapModeChange, this, MapMode::PublicTransport)); + m_publicTransportMapMode->addAction(QIcon(":/navig64/mode_options_transitlines.png"), tr("Show Transit Lines"), std::bind(&MainWindow::OnPublicTransportMapModeOptionChange, this, 0), true); + m_publicTransportMapMode->setChecked(0, m_pDrawWidget->GetFramework().PublicTransportMapModeHasTransitLines()); + pToolBar->addWidget(m_publicTransportMapMode->create()); + m_publicTransportMapMode->setMainIcon(QIcon(":/navig64/mode_public-transport.png")); + + pToolBar->addSeparator(); + + m_layers = new PopupMenuHolder(this); + + m_layers->addAction(QIcon(":/navig64/layers.png"), tr("Outdoor"), std::bind(&MainWindow::OnLayersOutdoorChange, this, 0), true); + m_layers->setChecked(0, m_pDrawWidget->GetFramework().HasOutdoorLayer()); + + m_layers->addAction(QIcon(":/navig64/layers.png"), tr("ContourLines"), std::bind(&MainWindow::OnLayersContourLinesChange, this, 0), true); + m_layers->setChecked(1, m_pDrawWidget->GetFramework().HasContourLinesLayer()); + + m_layers->addAction(QIcon(":/navig64/layers.png"), tr("3D buildings"), std::bind(&MainWindow::OnLayers3dBuildingsChange, this, 0), true); + m_layers->setChecked(2, m_pDrawWidget->GetFramework().HasBuildings3d()); + + pToolBar->addWidget(m_layers->create()); + m_layers->setMainIcon(QIcon(":/navig64/layers.png")); + + pToolBar->addSeparator(); +#endif // NOT BUILD_DESIGNER pToolBar->addAction(QIcon(":/navig64/bookmark.png"), tr("Show bookmarks and tracks; use ALT + RMB to add a bookmark"), this, @@ -862,37 +882,76 @@ void MainWindow::OnCancelDownloadClicked() GetFramework().GetStorage().CancelDownloadNode(m_lastCountry); } -void MainWindow::SetLayerEnabled(LayerType type, bool enable) +void MainWindow::SetMapMode(MapMode const mapMode) { auto & frm = m_pDrawWidget->GetFramework(); - switch (type) - { - // @todo Uncomment when we will integrate a traffic provider. - // case LayerType::TRAFFIC: - // frm.GetTrafficManager().SetEnabled(enable); - // frm.SaveTrafficEnabled(enable); - // break; - case LayerType::TRANSIT: - frm.GetTransitManager().EnableTransitSchemeMode(enable); - frm.SaveTransitSchemeEnabled(enable); - break; - case LayerType::ISOLINES: - frm.GetIsolinesManager().SetEnabled(enable); - frm.SaveIsolinesEnabled(enable); - break; - case LayerType::OUTDOORS: - frm.SaveOutdoorsEnabled(enable); - if (enable) - m_pDrawWidget->SetMapStyleToOutdoors(); - else - m_pDrawWidget->SetMapStyleToDefault(); - break; - } + frm.SwitchToMapMode(mapMode); + +#ifndef BUILD_DESIGNER + if (MapMode::Walking == mapMode) + m_walkingMapMode->setMainIcon(QIcon(":/navig64/mode_walking_selected.png")); + else + m_walkingMapMode->setMainIcon(QIcon(":/navig64/mode_walking.png")); + + if (MapMode::Cycling == mapMode) + m_cyclingMapMode->setMainIcon(QIcon(":/navig64/mode_cycling_selected.png")); + else + m_cyclingMapMode->setMainIcon(QIcon(":/navig64/mode_cycling.png")); + + if (MapMode::Driving == mapMode) + m_drivingMapMode->setMainIcon(QIcon(":/navig64/mode_driving_selected.png")); + else + m_drivingMapMode->setMainIcon(QIcon(":/navig64/mode_driving.png")); + + if (MapMode::PublicTransport == mapMode) + m_publicTransportMapMode->setMainIcon(QIcon(":/navig64/mode_public-transport_selected.png")); + else + m_publicTransportMapMode->setMainIcon(QIcon(":/navig64/mode_public-transport.png")); +#endif // BUILD_DESIGNER +} + +void MainWindow::OnMapModeChange(MapMode const mapMode) +{ + SetMapMode(mapMode); +} + +void MainWindow::OnWalkingMapModeOptionChange(int8_t const index) +{ + // Do nothing (yet) +} + +void MainWindow::OnCyclingMapModeOptionChange(int8_t const index) +{ + // Do nothing (yet) +} + +void MainWindow::OnDrivingMapModeOptionChange(int8_t const index) +{ + // Do nothing (yet) +} + +void MainWindow::OnPublicTransportMapModeOptionChange(int8_t const index) +{ + auto & frm = m_pDrawWidget->GetFramework(); + frm.PublicTransportMapModeSetTransitLines(m_publicTransportMapMode->isChecked(0)); +} + +void MainWindow::OnLayersOutdoorChange(int8_t const index) +{ + auto & frm = m_pDrawWidget->GetFramework(); + frm.SetOutdoorLayer(m_layers->isChecked(0)); +} + +void MainWindow::OnLayersContourLinesChange(int8_t const index) +{ + auto & frm = m_pDrawWidget->GetFramework(); + frm.SetContourLinesLayer(m_layers->isChecked(1)); } -void MainWindow::OnLayerEnabled(LayerType layer) +void MainWindow::OnLayers3dBuildingsChange(int8_t const index) { - SetLayerEnabled(layer, m_layers->isChecked(layer)); + auto & frm = m_pDrawWidget->GetFramework(); + frm.SetBuildings3d(m_layers->isChecked(2)); } void MainWindow::OnRulerEnabled() diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp index 0445e2a13..0aae592ee 100644 --- a/qt/mainwindow.hpp +++ b/qt/mainwindow.hpp @@ -1,6 +1,7 @@ #pragma once #include "qt/selection.hpp" +#include "map/framework.hpp" #include "map/routing_mark.hpp" #include "storage/storage_defines.hpp" @@ -53,14 +54,10 @@ class MainWindow QAction * m_pSearchAction = nullptr; QAction * m_rulerAction = nullptr; - enum LayerType : uint8_t - { - /// @todo Uncomment when we will integrate a traffic provider. - // TRAFFIC = 0, - TRANSIT = 0, // Metro scheme - ISOLINES, - OUTDOORS, - }; + PopupMenuHolder * m_walkingMapMode = nullptr; + PopupMenuHolder * m_cyclingMapMode = nullptr; + PopupMenuHolder * m_drivingMapMode = nullptr; + PopupMenuHolder * m_publicTransportMapMode = nullptr; PopupMenuHolder * m_layers = nullptr; PopupMenuHolder * m_routing = nullptr; PopupMenuHolder * m_selection = nullptr; @@ -98,7 +95,7 @@ class MainWindow void CreateSearchBarAndPanel(); void CreateCountryStatusControls(); - void SetLayerEnabled(LayerType type, bool enable); + void SetMapMode(MapMode mapMode); #if defined(OMIM_OS_WINDOWS) /// to handle menu messages @@ -130,7 +127,15 @@ protected Q_SLOTS: void OnSwitchMwmsBordersSelectionMode(); void OnClearSelection(); - void OnLayerEnabled(LayerType layer); + void OnMapModeChange(MapMode const mapMode); + void OnWalkingMapModeOptionChange(int8_t const index); + void OnCyclingMapModeOptionChange(int8_t const index); + void OnDrivingMapModeOptionChange(int8_t const index); + void OnPublicTransportMapModeOptionChange(int8_t const index); + + void OnLayersOutdoorChange(int8_t const index); + void OnLayersContourLinesChange(int8_t const index); + void OnLayers3dBuildingsChange(int8_t const index); void OnRulerEnabled(); diff --git a/qt/popup_menu_holder.cpp b/qt/popup_menu_holder.cpp index a19ffc32d..ff297abc4 100644 --- a/qt/popup_menu_holder.cpp +++ b/qt/popup_menu_holder.cpp @@ -26,6 +26,8 @@ QToolButton * PopupMenuHolder::create() m_toolButton = new QToolButton(); m_toolButton->setPopupMode(QToolButton::MenuButtonPopup); m_toolButton->setMenu(menu); + if (m_defaultAction) + m_toolButton->setDefaultAction(m_defaultAction); return m_toolButton; } diff --git a/qt/popup_menu_holder.hpp b/qt/popup_menu_holder.hpp index bde088f22..33f81efd0 100644 --- a/qt/popup_menu_holder.hpp +++ b/qt/popup_menu_holder.hpp @@ -15,6 +15,8 @@ class PopupMenuHolder : public QObject QToolButton * m_toolButton; + QAction * m_defaultAction = nullptr; + std::vector m_actions; QAction * addActionImpl(QIcon const & icon, QString const & text, bool checkable); @@ -48,6 +50,14 @@ class PopupMenuHolder : public QObject setCurrent(static_cast(idx)); } + template + void setDefaultAction(QIcon const & icon, QString const & text, SlotT slot) + { + QAction * p = new QAction(icon, text, this); + connect(p, &QAction::triggered, std::move(slot)); + m_defaultAction = p; + } + void setChecked(size_t idx, bool checked); bool isChecked(size_t idx); diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp index 14c193486..81500275a 100644 --- a/qt/preferences_dialog.cpp +++ b/qt/preferences_dialog.cpp @@ -181,30 +181,29 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework) }); } - QButtonGroup * nightModeGroup = new QButtonGroup(this); - QGroupBox * nightModeRadioBox = new QGroupBox("Night Mode"); + QButtonGroup * mapAppearanceGroup = new QButtonGroup(this); + QGroupBox * mapAppearanceRadioBox = new QGroupBox("Map Appearance"); { using namespace style_utils; QHBoxLayout * layout = new QHBoxLayout(); - QRadioButton * radioButton = new QRadioButton("Off"); + QRadioButton * radioButton = new QRadioButton("Light"); layout->addWidget(radioButton); - nightModeGroup->addButton(radioButton, static_cast(NightMode::Off)); + mapAppearanceGroup->addButton(radioButton, static_cast(MapAppearance::Light)); - radioButton = new QRadioButton("On"); + radioButton = new QRadioButton("Dark"); layout->addWidget(radioButton); - nightModeGroup->addButton(radioButton, static_cast(NightMode::On)); + mapAppearanceGroup->addButton(radioButton, static_cast(MapAppearance::Dark)); - nightModeRadioBox->setLayout(layout); + mapAppearanceRadioBox->setLayout(layout); - int const btn = MapStyleIsDark(framework.GetMapStyle()) ? 1 : 0; - nightModeGroup->button(btn)->setChecked(true); + int const btn = framework.CurrentMapAppearance() == MapAppearance::Light ? 0 : 1; + mapAppearanceGroup->button(btn)->setChecked(true); void (QButtonGroup::*buttonClicked)(int) = &QButtonGroup::idClicked; - connect(nightModeGroup, buttonClicked, [&framework](int i) + connect(mapAppearanceGroup, buttonClicked, [&framework](int i) { - auto const currStyle = framework.GetMapStyle(); - framework.SetMapStyle((i == 0) ? GetLightMapStyleVariant(currStyle) : GetDarkMapStyleVariant(currStyle)); + framework.SwitchToMapAppearance(i == 0 ? MapAppearance::Light : MapAppearance::Dark); }); } @@ -241,7 +240,7 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework) finalLayout->addWidget(mapLanguageComboBox); finalLayout->addWidget(alternativeMapLanguageHandlingLabel); finalLayout->addWidget(alternativeMapLanguageHandlingComboBox); - finalLayout->addWidget(nightModeRadioBox); + finalLayout->addWidget(mapAppearanceRadioBox); #ifdef BUILD_DESIGNER finalLayout->addWidget(indexRegenCheckBox); #endif diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp index 9288356f9..10fa35720 100644 --- a/qt/qt_common/map_widget.cpp +++ b/qt/qt_common/map_widget.cpp @@ -116,7 +116,7 @@ void MapWidget::CreateEngine() p.m_visualScale = static_cast(m_ratio); p.m_hints.m_screenshotMode = m_screenshotMode; - m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("default"), m_ratio)); + m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("walking"), m_ratio)); m_skin->Resize(p.m_surfaceWidth, p.m_surfaceHeight); m_skin->ForEach([&p](gui::EWidget widget, gui::Position const & pos) { p.m_widgetsInitInfo[widget] = pos; }); diff --git a/qt/res/isolines.png b/qt/res/isolines.png deleted file mode 100644 index 4cc58cfd5..000000000 Binary files a/qt/res/isolines.png and /dev/null differ diff --git a/qt/res/mode_cycling.png b/qt/res/mode_cycling.png new file mode 100644 index 000000000..88c8911de Binary files /dev/null and b/qt/res/mode_cycling.png differ diff --git a/qt/res/mode_cycling_selected.png b/qt/res/mode_cycling_selected.png new file mode 100644 index 000000000..feada7312 Binary files /dev/null and b/qt/res/mode_cycling_selected.png differ diff --git a/qt/res/mode_driving.png b/qt/res/mode_driving.png new file mode 100644 index 000000000..118148c24 Binary files /dev/null and b/qt/res/mode_driving.png differ diff --git a/qt/res/mode_driving_selected.png b/qt/res/mode_driving_selected.png new file mode 100644 index 000000000..61d5f4990 Binary files /dev/null and b/qt/res/mode_driving_selected.png differ diff --git a/qt/res/subway.png b/qt/res/mode_options_transitlines.png similarity index 100% rename from qt/res/subway.png rename to qt/res/mode_options_transitlines.png diff --git a/qt/res/mode_public-transport.png b/qt/res/mode_public-transport.png new file mode 100644 index 000000000..0e8e7c7d1 Binary files /dev/null and b/qt/res/mode_public-transport.png differ diff --git a/qt/res/mode_public-transport_selected.png b/qt/res/mode_public-transport_selected.png new file mode 100644 index 000000000..54ade4d32 Binary files /dev/null and b/qt/res/mode_public-transport_selected.png differ diff --git a/qt/res/mode_walking.png b/qt/res/mode_walking.png new file mode 100644 index 000000000..f0672b861 Binary files /dev/null and b/qt/res/mode_walking.png differ diff --git a/qt/res/mode_walking_selected.png b/qt/res/mode_walking_selected.png new file mode 100644 index 000000000..d73c89583 Binary files /dev/null and b/qt/res/mode_walking_selected.png differ diff --git a/qt/res/resources.qrc b/qt/res/resources.qrc index 0d7bda5d6..34fa57b7b 100644 --- a/qt/res/resources.qrc +++ b/qt/res/resources.qrc @@ -28,9 +28,16 @@ phonepack.png bookmark.png ruler.png + mode_walking.png + mode_walking_selected.png + mode_cycling.png + mode_cycling_selected.png + mode_driving.png + mode_driving_selected.png + mode_public-transport.png + mode_public-transport_selected.png + mode_options_transitlines.png layers.png - subway.png - isolines.png guides.png settings-routing.png borders_selection.png diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index b0e360d59..092995d31 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -201,7 +201,7 @@ bool SearchPanel::TryTrafficSimplifiedColorsCmd(std::string const & str) return false; bool const isSimplified = simplifiedMode; - GetFramework().GetTrafficManager().SetSimplifiedColorScheme(isSimplified); + GetFramework().SetTrafficSimplifiedColors(isSimplified); GetFramework().SaveTrafficSimplifiedColors(isSimplified); return true; diff --git a/tools/kothic b/tools/kothic index 6e1746357..fd3261197 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 6e1746357549ca4b09ee1560e9bf25e3fcce20ea +Subproject commit fd326119780b2bb3dfc9048ed602f9a0026876d4 diff --git a/tools/python/data/styles/setup.py b/tools/python/data/styles/setup.py index 9c3f3161a..f5fbff1b9 100755 --- a/tools/python/data/styles/setup.py +++ b/tools/python/data/styles/setup.py @@ -13,10 +13,38 @@ "styles", [ "drules_proto.bin", - "drules_proto_default_light.bin", - "drules_proto_default_light.txt", - "drules_proto_default_dark.bin", - "drules_proto_default_dark.txt", + "drules_proto_walking_light.bin", + "drules_proto_walking_outdoor_light.bin", + "drules_proto_walking_light.txt", + "drules_proto_walking_outdoor_light.txt", + "drules_proto_walking_dark.bin", + "drules_proto_walking_outdoor_dark.bin", + "drules_proto_walking_dark.txt", + "drules_proto_walking_outdoor_dark.txt", + "drules_proto_cycling_light.bin", + "drules_proto_cycling_outdoor_light.bin", + "drules_proto_cycling_light.txt", + "drules_proto_cycling_outdoor_light.txt", + "drules_proto_cycling_dark.bin", + "drules_proto_cycling_outdoor_dark.bin", + "drules_proto_cycling_dark.txt", + "drules_proto_cycling_outdoor_dark.txt", + "drules_proto_driving_light.bin", + "drules_proto_driving_outdoor_light.bin", + "drules_proto_driving_light.txt", + "drules_proto_driving_outdoor_light.txt", + "drules_proto_driving_dark.bin", + "drules_proto_driving_outdoor_dark.bin", + "drules_proto_driving_dark.txt", + "drules_proto_driving_outdoor_dark.txt", + "drules_proto_public-transport_light.bin", + "drules_proto_public-transport_outdoor_light.bin", + "drules_proto_public-transport_light.txt", + "drules_proto_public-transport_outdoor_light.txt", + "drules_proto_public-transport_dark.bin", + "drules_proto_public-transport_outdoor_dark.bin", + "drules_proto_public-transport_dark.txt", + "drules_proto_public-transport_outdoor_dark.txt", "drules_proto_vehicle_light.bin", "drules_proto_vehicle_light.txt", "drules_proto_vehicle_dark.bin", diff --git a/tools/python/generate_styles_override.py b/tools/python/generate_styles_override.py index 66a850eed..03e979350 100755 --- a/tools/python/generate_styles_override.py +++ b/tools/python/generate_styles_override.py @@ -36,8 +36,8 @@ def copy_style_file(style_path, drules_suffix, target_path): shutil.rmtree(output_name) os.makedirs(output_name) -paths = ['default/light', 'default/dark', 'vehicle/light', 'vehicle/dark'] -suffixes = ['_default_light', '_default_dark', '_vehicle_light', '_vehicle_dark'] +paths = ['walking/light', 'walking/dark', 'vehicle/light', 'vehicle/dark'] +suffixes = ['_walking_light', '_walking_dark', '_vehicle_light', '_vehicle_dark'] for i in range(0, len(paths)): copy_style_file(os.path.join(path_to_styles, paths[i], 'out'), suffixes[i], output_name) diff --git a/tools/python/stylesheet/cat_stat.py b/tools/python/stylesheet/cat_stat.py index 23c773189..dc748aa46 100755 --- a/tools/python/stylesheet/cat_stat.py +++ b/tools/python/stylesheet/cat_stat.py @@ -116,7 +116,7 @@ def b2t(b, text='yes'): if __name__ == '__main__': - DRULES_FILE_NAME = 'drules_proto_default_light.bin' + DRULES_FILE_NAME = 'drules_proto_walking_light.bin' if len(sys.argv) < 2: print('Calculates tag usage and categories stats, suggesting new types.') diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh index 6f7709c2b..c5d69f036 100755 --- a/tools/unix/generate_drules.sh +++ b/tools/unix/generate_drules.sh @@ -24,6 +24,14 @@ function BuildDrawingRules() { fi } +function FormatPriorities() { + styleType=$1 + echo "Format priorities for style $styleType" + # Run script to build style + python3 "$OMIM_PATH/tools/kothic/src/libkomwm.py" --format-priorities-only \ + -p "$DATA_PATH/styles/$styleType/include/" +} + outputs=(classificator.txt types.txt visibility.txt colors.txt patterns.txt drules_proto.txt) # Store old versions for diffs for item in ${outputs[*]} @@ -34,17 +42,30 @@ do done # Building drawing rules -BuildDrawingRules default light _default_light -BuildDrawingRules default dark _default_dark -BuildDrawingRules outdoors light _outdoors_light -BuildDrawingRules outdoors dark _outdoors_dark +FormatPriorities outdoor +BuildDrawingRules walking light _walking_light +BuildDrawingRules walking_outdoor light _walking_outdoor_light +BuildDrawingRules walking dark _walking_dark +BuildDrawingRules walking_outdoor dark _walking_outdoor_dark +BuildDrawingRules cycling light _cycling_light +BuildDrawingRules cycling_outdoor light _cycling_outdoor_light +BuildDrawingRules cycling dark _cycling_dark +BuildDrawingRules cycling_outdoor dark _cycling_outdoor_dark +BuildDrawingRules driving light _driving_light +BuildDrawingRules driving_outdoor light _driving_outdoor_light +BuildDrawingRules driving dark _driving_dark +BuildDrawingRules driving_outdoor dark _driving_outdoor_dark +BuildDrawingRules public-transport light _public-transport_light +BuildDrawingRules public-transport_outdoor light _public-transport_outdoor_light +BuildDrawingRules public-transport dark _public-transport_dark +BuildDrawingRules public-transport_outdoor dark _public-transport_outdoor_dark # Keep vehicle style last to produce same visibility.txt & classificator.txt BuildDrawingRules vehicle light _vehicle_light BuildDrawingRules vehicle dark _vehicle_dark # TODO: the designer is not used at the moment. # In designer mode we use drules_proto_design file instead of standard ones -# cp $OMIM_PATH/data/drules_proto_default_light.bin $OMIM_PATH/data/drules_proto_default_design.bin +# cp $OMIM_PATH/data/drules_proto_walking_light.bin $OMIM_PATH/data/drules_proto_walking_design.bin echo "Exporting transit colors..." python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ @@ -54,9 +75,15 @@ python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ # It contains max visibilities (min visible zoom) for features across all styles. echo "Merging styles..." python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \ - "$DATA_PATH/drules_proto_default_light.bin" \ + "$DATA_PATH/drules_proto_walking_light.bin" \ + "$DATA_PATH/drules_proto_walking_outdoor_light.bin" \ + "$DATA_PATH/drules_proto_cycling_light.bin" \ + "$DATA_PATH/drules_proto_cycling_outdoor_light.bin" \ + "$DATA_PATH/drules_proto_driving_light.bin" \ + "$DATA_PATH/drules_proto_driving_outdoor_light.bin" \ + "$DATA_PATH/drules_proto_public-transport_light.bin" \ + "$DATA_PATH/drules_proto_public-transport_outdoor_light.bin" \ "$DATA_PATH/drules_proto_vehicle_light.bin" \ - "$DATA_PATH/drules_proto_outdoors_light.bin" \ "$DATA_PATH/drules_proto.bin" \ "$DATA_PATH/drules_proto.txt" \ > /dev/null diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index 5f580a812..60fd66ee8 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -29,7 +29,7 @@ cmake --build "$BUILD_DIR" --target "$BINARY_NAME" # Helper function to build skin -# Parameter $1 - style type (default) +# Parameter $1 - style type (walking) # Parameter $2 - style name (light, dark, ...) # Parameter $3 - resource name (mdpi, hdpi, ...) # Parameter $4 - symbol size @@ -65,19 +65,19 @@ rm -rf "$DATA_PATH"/symbols/*/*/symbols.* # Build styles -BuildSkin default dark mdpi 18 dark symbols -BuildSkin default dark hdpi 27 dark symbols -BuildSkin default dark xhdpi 36 dark symbols -BuildSkin default dark 6plus 43 dark symbols -BuildSkin default dark xxhdpi 54 dark symbols -BuildSkin default dark xxxhdpi 64 dark symbols +BuildSkin walking dark mdpi 18 dark symbols +BuildSkin walking dark hdpi 27 dark symbols +BuildSkin walking dark xhdpi 36 dark symbols +BuildSkin walking dark 6plus 43 dark symbols +BuildSkin walking dark xxhdpi 54 dark symbols +BuildSkin walking dark xxxhdpi 64 dark symbols -BuildSkin default light mdpi 18 light symbols -BuildSkin default light hdpi 27 light symbols -BuildSkin default light xhdpi 36 light symbols -BuildSkin default light 6plus 43 light symbols -BuildSkin default light xxhdpi 54 light symbols -BuildSkin default light xxxhdpi 64 light symbols +BuildSkin walking light mdpi 18 light symbols +BuildSkin walking light hdpi 27 light symbols +BuildSkin walking light xhdpi 36 light symbols +BuildSkin walking light 6plus 43 light symbols +BuildSkin walking light xxhdpi 54 light symbols +BuildSkin walking light xxxhdpi 64 light symbols for i in ${symbols_name[*]}; do optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/light/symbols.png diff --git a/xcode/agg/agg.xcodeproj/project.pbxproj b/xcode/agg/agg.xcodeproj/project.pbxproj index 2deedd074..f061aca5d 100644 --- a/xcode/agg/agg.xcodeproj/project.pbxproj +++ b/xcode/agg/agg.xcodeproj/project.pbxproj @@ -607,7 +607,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 67E8DB831BBC19810053C5BA = { CreatedOnToolsVersion = 7.0; diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index fbda15d71..5f582c547 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -634,7 +634,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 39FD27061CC65A7100AFF551 = { CreatedOnToolsVersion = 7.2.1; diff --git a/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj index 6cdd7a113..171a07cd6 100644 --- a/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj +++ b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj @@ -119,7 +119,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 4586D0A01F480FE600DF9CE5 = { CreatedOnToolsVersion = 8.3.3; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 3e2934e18..d15982f7f 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -647,7 +647,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 3949168E1BAC3A5F002A8C4F = { CreatedOnToolsVersion = 7.0; diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj index ec1a725c6..0bf1de881 100644 --- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj +++ b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj @@ -117,7 +117,7 @@ BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastSwiftUpdateCheck = 1330; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 71407E78294CB3E800FBD9A4 = { CreatedOnToolsVersion = 13.3; diff --git a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj index 888844750..801a8ce9a 100644 --- a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj +++ b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj @@ -107,7 +107,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { BBD4571121A6BD0300B0A79C = { CreatedOnToolsVersion = 10.0; diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index e04887ab4..8dfdd3f3d 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -609,7 +609,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 6729A4F01A691F6A007D5872 = { CreatedOnToolsVersion = 6.1.1; diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 21abb7c2b..d8933289b 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -831,7 +831,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 670947391BDF9B82005014C0 = { CreatedOnToolsVersion = 7.1; diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 200acf6db..1d591c6e7 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 3411386A1C15AD97002E3B3E = { CreatedOnToolsVersion = 7.1.1; diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj index 585887902..02385ecca 100644 --- a/xcode/expat/expat.xcodeproj/project.pbxproj +++ b/xcode/expat/expat.xcodeproj/project.pbxproj @@ -165,7 +165,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 670D04F71B0BAEE50013A7AC = { CreatedOnToolsVersion = 6.3.2; diff --git a/xcode/freetype/freetype.xcodeproj/project.pbxproj b/xcode/freetype/freetype.xcodeproj/project.pbxproj index a852cefbc..37f1bfca9 100644 --- a/xcode/freetype/freetype.xcodeproj/project.pbxproj +++ b/xcode/freetype/freetype.xcodeproj/project.pbxproj @@ -1385,7 +1385,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 675348511A408D9300A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj index b272c4600..a0dffe79d 100644 --- a/xcode/ge0/ge0.xcodeproj/project.pbxproj +++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj @@ -188,7 +188,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 3496AB751DC1F6CD00C5DDBA = { CreatedOnToolsVersion = 8.0; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index da51ab0c3..10949a178 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -1160,7 +1160,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 6753401A1A3F2A1B00A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 42d3e188c..f7a7824d1 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -522,7 +522,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 670F295B1BA9D39A00F2ABF4 = { CreatedOnToolsVersion = 6.4; diff --git a/xcode/gflags/gflags.xcodeproj/project.pbxproj b/xcode/gflags/gflags.xcodeproj/project.pbxproj index 954cd631d..6b9068a60 100644 --- a/xcode/gflags/gflags.xcodeproj/project.pbxproj +++ b/xcode/gflags/gflags.xcodeproj/project.pbxproj @@ -102,7 +102,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 6753442C1A3F64E400A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/harfbuzz/harfbuzz.xcodeproj/project.pbxproj b/xcode/harfbuzz/harfbuzz.xcodeproj/project.pbxproj index e76523657..169b86213 100644 --- a/xcode/harfbuzz/harfbuzz.xcodeproj/project.pbxproj +++ b/xcode/harfbuzz/harfbuzz.xcodeproj/project.pbxproj @@ -94,7 +94,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { FAF9DD902A86D6D1000D7037 = { CreatedOnToolsVersion = 14.3.1; diff --git a/xcode/i18n/i18n.xcodeproj/project.pbxproj b/xcode/i18n/i18n.xcodeproj/project.pbxproj index 3f9338e5d..63a733f84 100644 --- a/xcode/i18n/i18n.xcodeproj/project.pbxproj +++ b/xcode/i18n/i18n.xcodeproj/project.pbxproj @@ -181,7 +181,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 39FD27061CC65A7100AFF551 = { CreatedOnToolsVersion = 7.2.1; diff --git a/xcode/icu/icu.xcodeproj/project.pbxproj b/xcode/icu/icu.xcodeproj/project.pbxproj index ff5ca0fde..f18357cc9 100644 --- a/xcode/icu/icu.xcodeproj/project.pbxproj +++ b/xcode/icu/icu.xcodeproj/project.pbxproj @@ -1516,7 +1516,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { BBB165D61E8275120058BF1E = { CreatedOnToolsVersion = 8.2.1; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 5e386ba40..dbb7ceef1 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -917,7 +917,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 670C61241AB0661100C38A8C = { CreatedOnToolsVersion = 6.1.1; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index cab93709f..31480c839 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -173,7 +173,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 6753444C1A3F664300A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index fde36cba1..f5953dec8 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -240,7 +240,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 45E4557C205849A600D9F45E = { CreatedOnToolsVersion = 9.2; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index d8ffac499..8a8a4b5e1 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -593,7 +593,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 3DA571D720C1921D007BDE27 = { CreatedOnToolsVersion = 9.3.1; diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index 573af8831..724de871d 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -135,7 +135,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 474017F523F5B2CE00A93C81 = { CreatedOnToolsVersion = 11.3; diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj index 306180586..8c71208ad 100644 --- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj +++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj @@ -99,7 +99,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 4586D0D11F48130600DF9CE5 = { CreatedOnToolsVersion = 8.3.3; diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj index 5f6a8ff12..ead2239d7 100644 --- a/xcode/openlr/openlr.xcodeproj/project.pbxproj +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -206,7 +206,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 671E78F21E6A4FE400B2859B = { CreatedOnToolsVersion = 8.2.1; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 4a8821e58..0db879f88 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -628,7 +628,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 675340E81C58C496002CF0D9 = { CreatedOnToolsVersion = 7.2; diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index 4d958240d..03a4f2e09 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -189,7 +189,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 671E78711E6A3BE200B2859B = { CreatedOnToolsVersion = 8.2.1; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index a0c943d07..32fe375f0 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -1099,7 +1099,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 671C620B1AE9225100076BD0 = { CreatedOnToolsVersion = 6.3.1; diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index 276628585..0fe9bdafa 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -469,7 +469,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 4566606D20E254060085E8C1 = { CreatedOnToolsVersion = 9.4; diff --git a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj index e41e761fa..9048c4205 100644 --- a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj +++ b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj @@ -101,7 +101,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 675D21B91BFB8DBA00717E4F = { CreatedOnToolsVersion = 7.1.1; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 10de49676..c6c08f7be 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -521,7 +521,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 675342DF1A3F59EF00A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index 531de08f0..77c2c755e 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -241,7 +241,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 675E884F1DB7AC0300F8EBDA = { CreatedOnToolsVersion = 8.0; diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index a255f9596..e7d5fade5 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -219,7 +219,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 67BECB491DDA43AF00FC4E99 = { CreatedOnToolsVersion = 8.1; diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj index 1e8e19c2f..522aa4974 100644 --- a/xcode/transit/transit.xcodeproj/project.pbxproj +++ b/xcode/transit/transit.xcodeproj/project.pbxproj @@ -154,7 +154,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 2620; + LastUpgradeCheck = 2700; TargetAttributes = { 56D7F2F31FE7F0F200D99E62 = { CreatedOnToolsVersion = 9.2;